Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -444,10 +444,12 @@ public class MQTask implements InitializingBean {
 		NumberBacklogDto numberBacklogDto = adminOrderService.selectNumberBacklog();
 		Integer num = (numberBacklogDto.getExchange()+numberBacklogDto.getReturnGoods()+numberBacklogDto.getReturnRefund()+numberBacklogDto.getSendTheGoods());
 		String text = MessageFormat.format(ImberryConfig.PENDING_ORDER_REMINDER, num);
-		codeService.informShipping("15814645335", text);
-		codeService.informShipping("13472545449", text);
-		codeService.informShipping("18271840547", text);
-		codeService.informShipping("13922874118", text);
+		if(num > 0){
+			codeService.informShipping("15814645335", text);
+			codeService.informShipping("13472545449", text);
+			codeService.informShipping("18271840547", text);
+			codeService.informShipping("13922874118", text);
+		}
 	}
 
 }

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -215,9 +215,9 @@
 						<th width="50">备注图标</th>
 						<th width="150">用户备注</th>
 						<th width="150">物流单号</th>
-						<th width="100">所属门店</th>
+						<%--<th width="100">所属门店</th>
 						<th width="100">所属VIP会员</th>
-						<th width="100">用户来源</th>
+						<th width="100">用户来源</th>--%>
 						<th width="150">操作</th>
 					</tr>
 				</thead>
@@ -302,9 +302,9 @@
 								<%--<td width="150"><a href="http://m.kuaidi100.com/index_all.html?type=${order.salesPostFirm }&postid=${order.salesPostNum }&callbackurl=http://w.iamberry.com/tooth/admin/order/selectShopOrder?orderStatus=${orderStatusStr}">${order.salesPostNum }</a></td>--%>
 								<td width="150"><a href="#" onclick="openLogistics('物流信息','/tooth/view/view_logistics.html?billCode=${order.salesPostNum}&billName=${order.salesPostFirm  }',375,500);">${order.salesPostNum }</a></td>
 
-								<td width="100">${order.storesName }</td>
+								<%--<td width="100">${order.storesName }</td>
 								<td width="100">${order.vipName }</td>
-								<td class="text-c" width="100">${order.userResource }</td>
+								<td class="text-c" width="100">${order.userResource }</td>--%>
 								<!-- 遍历操作 -->
 							<td class="td-manage text-c">
 								<div class="dropDown dropDown_hover">