增加对订单的签收监控

pom.xml

@@ -578,12 +578,12 @@
 			<id>jdk-1.7</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
-				<jdk>1.7</jdk>
+				<jdk>1.8</jdk>
 			</activation>
 			<properties>
-				<maven.compiler.source>1.7</maven.compiler.source>
-				<maven.compiler.target>1.7</maven.compiler.target>
-				<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
 			</properties>
 		</profile>
 		<profile>

watero-common-core/pom.xml

@@ -27,8 +27,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -37,15 +37,15 @@
 	<!-- 配置 -->
 	<profiles>
 		<profile>
-			<id>jdk-1.7</id>
+			<id>jdk-1.8</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
-				<jdk>1.7</jdk>
+				<jdk>1.8</jdk>
 			</activation>
 			<properties>
-				<maven.compiler.source>1.7</maven.compiler.source>
-				<maven.compiler.target>1.7</maven.compiler.target>
-				<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
 			</properties>
 		</profile>
 	</profiles>

watero-common-tool/pom.xml

@@ -41,8 +41,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

watero-common-web/pom.xml

@@ -31,8 +31,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 		</plugins>

watero-rst-core/pom.xml

@@ -34,8 +34,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.3</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -132,6 +132,7 @@ public class SalesOrder implements Serializable {
     private Integer takeToBe;               //待揽件数量
     private Integer tookTimeout;            //揽件超时数量
     private Integer tookAbnormal;           //揽件异常数量
+    private Integer signErrorNum;           // 签收异常数量
     private Integer haveOutbound;           //已出库数量
     private String salesPostFirmName;       //快递公司名称
     private Integer dealerId;               //客户id
@@ -150,12 +151,20 @@ public class SalesOrder implements Serializable {
     private Integer trackingAdminId;        //跟踪信息 操作人id
     private Integer feeCharges;             //维修收费
     private Date salesSignTime;             // 签收时间
-    private Integer salesIsErrorSign;            // 是否签收，1：异常签收
+    private Integer salesIsErrorSign;       // 是否签收，1：异常签收
 
     private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<SalesOrderItem> suSalesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<ComplaintDetectInfo> complaintDetectInfoList;
 
+    public Integer getSignErrorNum() {
+        return signErrorNum;
+    }
+
+    public void setSignErrorNum(Integer signErrorNum) {
+        this.signErrorNum = signErrorNum;
+    }
+
     public Integer getSalesIsErrorSign() {
         return salesIsErrorSign;
     }

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

@@ -393,8 +393,8 @@
                 <if test="statisticalType != null  and statisticalType == 8">
                     AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24
                 </if>
-                <if test="salesIsErrorSign != null  and salesIsErrorSign == 1">
-                    sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NOT NULL AND sales_send_time != order_case_date AND sales_sign_time is NULL AND sales_create_time >= '2020.05.01' AND TIMESTAMPDIFF(HOUR,order_case_date,NOW()) >= 168
+                <if test="salesIsErrorSign != null and salesIsErrorSign == 1">
+                    AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NOT NULL AND sales_send_time != order_case_date AND sales_sign_time is NULL AND sales_create_time >= '2020.05.01' AND TIMESTAMPDIFF(HOUR,order_case_date,NOW()) >= 168
                 </if>
             </where>
             GROUP BY
@@ -881,6 +881,9 @@
             <if test="statisticalType != null  and statisticalType == 8">
                 AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24
             </if>
+            <if test="salesIsErrorSign != null and salesIsErrorSign == 1">
+                AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NOT NULL AND sales_send_time != order_case_date AND sales_sign_time is NULL AND sales_create_time >= '2020.05.01' AND TIMESTAMPDIFF(HOUR,order_case_date,NOW()) >= 168
+            </if>
         </where>
         GROUP BY
         soi.sales_id
@@ -2375,7 +2378,8 @@
         sum(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL) then 1 else 0 end) AS takeToBe,
         sum(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 3 AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &lt;= 24) then 1 else 0 end) AS tookTimeout,
         sum(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24) then 1 else 0 end) AS tookAbnormal,
-        sum(CASE WHEN (TO_DAYS(sales_deliver_time) = TO_DAYS(NOW())  ) then 1 else 0 end) AS haveOutbound
+        sum(CASE WHEN (TO_DAYS(sales_deliver_time) = TO_DAYS(NOW())  ) then 1 else 0 end) AS haveOutbound,
+        SUM(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NOT NULL AND sales_send_time != order_case_date AND sales_sign_time is NULL AND sales_create_time >= '2020.05.01' AND TIMESTAMPDIFF(HOUR,order_case_date,NOW()) >= 168) then 1 else 0 end) AS signErrorNum
         FROM
         tb_rst_sales_order_info
         WHERE

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

@@ -128,7 +128,7 @@ public class AdminSalesOrderController {
         if(storeIds.length > 0){
             salesOrder.setStoreIds(storeIds);
             storeInfo.setStoreIds(storeIds);
-            pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
+            pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,true);
         }
 
         // 搜索店铺
@@ -138,9 +138,9 @@ public class AdminSalesOrderController {
         // 查询产品颜色
         List<ProductColor> productColorList = productService.listproductAndColor(productColor);
 
-        if (totalNum != 0) {
+        /*if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
-        }
+        }*/
         ModelAndView mv = new ModelAndView("order/salesOrder/sales_order_list");
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")

watero-rst-web/src/main/resources/log4j.properties

@@ -41,7 +41,7 @@ log4j.logger.org.apache=DEBUG
 # 工作流日志级别
 log4j.logger.org.activiti=INFO
 # 整个项目代码的日志级别
-log4j.logger.com.iamberry=DEBUG
+log4j.logger.com.iamberry=INFO
 # mybatis日志配置,为了方便定位问题，将日志级别设置为DEBUG，方便打印SQL语句
 log4j.logger.com.apache.ibatis=DEBUG
 log4j.logger.com.mybatis=DEBUG