修改订单数量查询条件

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -455,8 +455,6 @@ public interface SalesOrderService {
      */
     Integer updateOrderItemReturnNum(SalesOrderItem salesOrderItem);
 
-
-
     /**
      * 查询售后短信签名
      */

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -428,27 +428,33 @@
         LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
         LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         <where>
+            <if test="isSelectCustomer !=null and isSelectCustomer !='' and isSelectCustomer == 2 ">
+                sales_batch_id != 'KS00000000000001'
+            </if>
             <if test="salesIsDownload !=null and salesIsDownload !=''">
                 AND sales_is_download = #{salesIsDownload}
             </if>
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>
-            <if test="salesDeliver !=null">
-                AND sales_deliver = #{salesDeliver}
-            </if>
             <if test="salesStatus !=null">
                 AND sales_status = #{salesStatus}
             </if>
             <if test="salesOrderStatus !=null">
                 AND sales_order_status = #{salesOrderStatus}
             </if>
+            <if test="salesDeliver !=null">
+                AND sales_deliver = #{salesDeliver}
+            </if>
             <if test="salesStoreId !=null and salesStoreId !=''">
                 AND sales_store_id = #{salesStoreId}
             </if>
             <if test="salesPostFirm !=null and salesPostFirm !=''">
                 AND sales_post_firm = #{salesPostFirm}
             </if>
+            <if test="salesPostNum !=null and salesPostNum !=''">
+                AND sales_post_num like CONCAT('%',#{salesPostNum},'%')
+            </if>
             <if test="salesCompanyId !=null and salesCompanyId !=''">
                 AND sales_company_id = #{salesCompanyId}
             </if>
@@ -473,9 +479,6 @@
             <if test="salesAddressInfo !=null and salesAddressInfo !=''">
                 AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
             </if>
-            <if test="itemProductName !=null and itemProductName !=''">
-                AND (oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%'))
-            </if>
             <if test="startDate != null and startDate != ''">
                 AND sales_create_time <![CDATA[>=]]> #{startDate}
             </if>
@@ -488,11 +491,27 @@
             <if test="salesAddType != null ">
                 AND sales_add_type = #{salesAddType}
             </if>
+            <if test="itemProductName !=null and itemProductName !=''">
+                AND (oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%'))
+            </if>
+            <if test="colorId !=null and colorId !=''">
+                AND oi.item_color_id = #{colorId}
+            </if>
             <if test="salesIds != null and salesIds != ''">
                 AND sales_id IN
                 <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
                     #{node}
                 </foreach >
+                or sales_belong_orderId IN
+                <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                    #{node}
+                </foreach >
+            </if>
+            <if test="salesWarehouseId != null ">
+                AND sales_warehouse_id = #{salesWarehouseId}
+            </if>
+            <if test="salesIsSublist != null  and salesIsSublist !=''">
+                AND sales_is_sublist = #{salesIsSublist}
             </if>
             <if test="procTypeId != null  and procTypeId !=''">
                 AND pt.proc_type_id = #{procTypeId}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -593,6 +593,7 @@ public class MQTask implements InitializingBean {
 	public void orderCaseDate(){
 		logger.info("------------查询订单揽件时间 start-----------");
 		List<SalesOrder> salesOrderList = salesOrderService.orderAfterCaseDate();
+		Integer num = 0;
 		if(salesOrderList != null && salesOrderList.size()>0){
 			logger.info("------------查询订单揽件时间 - 需要查询揽件订单数量："+ salesOrderList.size() +"-----------");
 			for (SalesOrder salesOrder:salesOrderList) {
@@ -608,10 +609,11 @@ public class MQTask implements InitializingBean {
 					if(flag < 1){
 						logger.info("修改揽件时间异常，订单号："+salesOrder.getSalesOrderId());
 					}
+					num ++;
 				}
 			}
 		}
-		logger.info("------------查询订单揽件时间 end-----------");
+		logger.info("------------查询订单揽件时，本次处理揽件事件数量"+ num +" end-----------");
 	}
 
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -110,11 +110,13 @@ public class AdminSalesOrderController {
             salesOrder.setSalesAdminId(admin.getAdminId());
         }
         salesOrder.setIsSelectCustomer(2);//不查询客诉添加的订单
+
         //分页获取订单信息
         PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
         }
+
         StoreInfo storeInfo = new StoreInfo();
         ProductColor productColor = new ProductColor();
         if(salesOrder.getSalesCompanyId() != null){