Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -194,6 +194,7 @@ public class OrderBaseLogic {
         if(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())){
             orderStatusList.add(orderStatus);
             orderStatusList.add(OrderBaseStatusEnum.YJS.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.GCSZX.getKey());
         }else if(StringUtils.equals(orderStatus,OrderBaseStatusEnum.YCD.getKey())){
             //异常单，不能通过工单状态字段去查，所以这里留空
             orderStatusList.clear();

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -8,9 +8,9 @@
             count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG'),a.id,null)) 'fwz',
             count(DISTINCT if(a.is_exception=1,a.id,null)) 'ycd',
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',
-            count(DISTINCT if(a.order_status in ('YWG','YJS'),a.id,null)) 'ywg',
+            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX'),a.id,null)) 'ywg',
             count(DISTINCT if(a.over_time between date(now()) and now(),a.id,null)) 'jrwg',
-            count(DISTINCT if(a.order_status in ('YWG','YJS'),a.id,null)) 'jbnwg',
+            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX'),a.id,null)) 'jbnwg',
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id