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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/workorder/CountOrderStatusBean.java

@@ -24,7 +24,7 @@ public class CountOrderStatusBean {
     @ApiModelProperty("已完工")
     private Integer ywg = 0;
 
-    @ApiModelProperty("未完工")
+    @ApiModelProperty("待处理")
     private Integer wwg = 0;
 
     @ApiModelProperty("配件申请中")

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

@@ -217,9 +217,11 @@ public class OrderBaseLogic {
             orderStatusList.add(OrderBaseStatusEnum.GCSZX.getKey());
             orderStatusList.add(OrderBaseStatusEnum.WDWG.getKey());
             orderStatusList.add(OrderBaseStatusEnum.YWGO.getKey());
-        }else if(StringUtils.equals(orderStatus,OrderBaseStatusEnum.YCD.getKey())){
+        }else if(StringUtils.equals(orderStatus,OrderBaseStatusEnum.YCD.getKey())) {
             //异常单，不能通过工单状态字段去查，所以这里留空
             orderStatusList.clear();
+        }else if (StringUtils.equals(orderStatus, OrderBaseStatusEnum.DCL.getKey())){
+            orderStatusList.clear();
         } else if(orderStatus != null){
             orderStatusList.add(orderStatus);
         }
@@ -243,6 +245,10 @@ public class OrderBaseLogic {
                 .notIn(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.FWZT.getKey(),OrderBaseStatusEnum.FL.getKey(),
                         OrderBaseStatusEnum.YCGB.getKey() ,OrderBaseStatusEnum.FWQX.getKey()
                         )
+                .notIn(orderStatus != null && orderStatus.equals(OrderBaseStatusEnum.DCL.getKey()),PgOrderBase::getOrderStatus,
+                        OrderBaseStatusEnum.YWG.getKey(),OrderBaseStatusEnum.YWGO.getKey(),OrderBaseStatusEnum.GCSZX.getKey(),
+                        OrderBaseStatusEnum.WDWG.getKey() ,OrderBaseStatusEnum.DQD.getKey()
+                        )
                 .ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
                 .ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")
                 .eq(StringUtils.isNotBlank(pgIncreOrderId),PgOrderBase::getPgIncreOrderId,pgIncreOrderId)
@@ -262,7 +268,7 @@ public class OrderBaseLogic {
                 )
 
                 )
-                .eq(CollectionUtils.isNotEmpty(orderStatusList) && !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
+                .eq(CollectionUtils.isNotEmpty(orderStatusList) && (!orderStatusList.contains("DJD") || !orderStatusList.contains("DCL")),PgOrderBase::getIsMeet,true)
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
                 .between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())
                         && StringUtils.isNoneBlank(startTime, endTime) && (byDay == null || byDay != 3), PgOrderBase::getDispatchTime, startTime, endTime)