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

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

@@ -192,11 +192,19 @@ public class OrderBaseLogic {
         if(!StringUtils.equals(currentCompanyWechat.getUser().getType(),UserTypeEnum.WORKER.getKey())){
             return new Page<>(pageNum,pageSize);
         }
-        List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
+        List<String> orderBaseIdvs = pgOrderWorkerService.lambdaQuery()
                     .and(item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
                     .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
                     .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
 
+        List<String> orderBaseIds = pgOrderBaseService.lambdaQuery()
+                .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
+                .in(PgOrderBase::getId,orderBaseIdvs)
+                .notIn(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.FWZT.getKey(),OrderBaseStatusEnum.FL.getKey(),
+                        OrderBaseStatusEnum.YCGB.getKey() ,OrderBaseStatusEnum.FWQX.getKey()
+                ).select(PgOrderBase::getId)
+                .list().stream().map(PgOrderBase::getId).distinct().collect(Collectors.toList());
+
         if(byDay != null){
             if(byDay == 1) {
                 startTime = DateUtil.formatDateTime(DateUtil.beginOfDay(new Date()));
@@ -242,12 +250,9 @@ public class OrderBaseLogic {
 
         Page page = pgOrderBaseService.lambdaQuery()
                 .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-                .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()
+                        OrderBaseStatusEnum.WDWG.getKey() ,OrderBaseStatusEnum.DQD.getKey(),OrderBaseStatusEnum.YJS.getKey()
                         )
                 .ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
                 .ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")