Merge remote-tracking branch 'origin/master'

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -328,21 +328,31 @@ public class OrderController extends BaseController {
                 "COUNT( DISTINCT `id_card`,`now_package`,`business_package`AND CASE WHEN user_type = 2 THEN 1 END ) AS oldContinueNum," +
                 "COUNT( DISTINCT CASE WHEN user_type IN (0, 3, 5) AND order_status IN ('已发货', '已完成') THEN 1 END ) AS finishNewNum," +
                 "COUNT( CASE WHEN user_type IN (1,2) AND order_status IN ('已发货', '已完成') THEN 1 END ) AS finishOldNum," +
-                "COUNT( CASE WHEN user_type = 0 THEN 1 END ) +" +
-                " COUNT( CASE WHEN user_type = 5 THEN 1 END ) +" +
-                " COUNT( CASE WHEN user_type = 3 THEN 1 END ) +" +
-                " COUNT( CASE WHEN user_type = 1 THEN 1 END ) +" +
-                " COUNT( CASE WHEN user_type = 2 THEN 1 END ) AS sum";
+                "COUNT( DISTINCT `id_card` AND CASE WHEN user_type = 0 THEN 1 END ) +" +
+                " COUNT( DISTINCT `id_card` AND CASE WHEN user_type = 5 THEN 1 END ) +" +
+                " COUNT( DISTINCT `id_card` AND CASE WHEN user_type = 3 THEN 1 END ) +" +
+                " COUNT( DISTINCT `id_card`,`now_package`,`business_package`AND CASE WHEN user_type = 1 THEN 1 END ) +" +
+                " COUNT( DISTINCT `id_card`,`now_package`,`business_package`AND CASE WHEN user_type = 2 THEN 1 END ) AS sum";
         commonWrapper.setSqlSelect(selectSql);
         commonWrapper.ne("order_status", "异常单");
         commonWrapper.isNotNull("hehuoren_area");
         commonWrapper.groupBy("hehuoren_area");
 
         //周
-        Wrapper<Order> weekWrapper = commonWrapper.clone().ge("DATE(success_time)", "DATE_SUB(CURDATE(), INTERVAL 7 DAY)");
+        Wrapper<Order> weekWrapper = commonWrapper.clone();
+        if (StringUtils.isNotBlank(endTime)) {
+            weekWrapper.addFilter("DATE(success_time) >= DATE_SUB(DATE('"+endTime+"'), INTERVAL 7 DAY)");
+        } else {
+            weekWrapper.addFilter("DATE(success_time) >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)");
+        }
         List<Map<String, Object>> weekNumList = orderMapper.selectMaps(weekWrapper);
         //月
-        Wrapper<Order> monthWrapper = commonWrapper.clone().ge("DATE(success_time)", "DATE_SUB(CURDATE(), INTERVAL 30 DAY)");
+        Wrapper<Order> monthWrapper = commonWrapper.clone();
+        if (StringUtils.isNotBlank(endTime)) {
+            monthWrapper.addFilter("DATE(success_time) >= DATE_SUB(DATE('"+endTime+"'), INTERVAL 30 DAY)");
+        } else {
+            monthWrapper.addFilter("DATE(success_time) >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)");
+        }
         List<Map<String, Object>> monthNumList = orderMapper.selectMaps(monthWrapper);
         //累计
         Wrapper<Order> allWrapper = commonWrapper.clone();