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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/OrderCount.java

@@ -6,15 +6,15 @@ import lombok.Data;
 @Data
 public class OrderCount {
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("全部")
     private Integer qb;
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("待支付")
     private Integer dzf;
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("已支付")
     private Integer yzf;
 
-    @ApiModelProperty("结算状态")
+    @ApiModelProperty("已取消")
     private Integer yqx;
 }

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

@@ -24,6 +24,9 @@ public class CountOrderStatusBean {
     @ApiModelProperty("已完工")
     private Integer ywg = 0;
 
+    @ApiModelProperty("未完工")
+    private Integer wwg = 0;
+
     @ApiModelProperty("配件申请中")
     private Integer ping = 0;
     @ApiModelProperty("配件已到货")

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/OrderBaseController.java

@@ -46,7 +46,7 @@ public class OrderBaseController {
             @ApiParam(value = "延保订单id",required = false) @RequestParam(required = false) String pgIncreOrderId,
             @ApiParam(value = "是否延保单 true=是 false=否",required = false) @RequestParam(required = false) Boolean isYb,
             @ApiParam(value = "是否维保 true=是 false=否",required = false) @RequestParam(required = false) Boolean isWb,
-            @ApiParam(value = "DJD=待接单，FWZ=服务中，YCD=异常待处理 YWG=已完工",required = false)@RequestParam(required = false) OrderBaseStatusEnum orderBaseStatus,
+            @ApiParam(value = "DJD=待接单，FWZ=服务中，YCD=异常待处理 YWG=已完工 DCL=待处理",required = false)@RequestParam(required = false) OrderBaseStatusEnum orderBaseStatus,
             @ApiParam(value = "1=今天 2=明天 3=其他",required = false) @RequestParam(required = false) Integer byDay,
             @ApiParam(value = "开始时间",required = false) @RequestParam(required = false) String startTime,
             @ApiParam(value = "结束时间",required = false) @RequestParam(required = false) String endTime,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/workorder/OrderBaseStatusEnum.java

@@ -57,6 +57,7 @@ public enum OrderBaseStatusEnum implements BaseEnum {
     FWQX("FWQX","服务取消"),
     FL("FL","分流3.0"),
     YWGO("YWGO","已完工"),
+    DCL("DCL","待处理"),
     ;
 
     @EnumValue

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

@@ -228,11 +228,15 @@ public class OrderBaseLogic {
             orderStatusList.add(OrderBaseStatusEnum.FWZ.getKey());
             orderStatusList.add(OrderBaseStatusEnum.GCSZT.getKey());
             orderStatusList.add(OrderBaseStatusEnum.BFWG.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.YZP.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.DSM.getKey());
         }
 
         Page page = pgOrderBaseService.lambdaQuery()
                 .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-                .ne(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey())
+                .notIn(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.XSBH.getKey(),OrderBaseStatusEnum.FWQX.getKey(),OrderBaseStatusEnum.FL.getKey(),
+                        OrderBaseStatusEnum.TJXSBH.getKey() ,OrderBaseStatusEnum.ZBBH.getKey(),OrderBaseStatusEnum.FZXBH.getKey(),OrderBaseStatusEnum.LRCD.getKey()
+                        )
                 .ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
                 .ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")
                 .eq(StringUtils.isNotBlank(pgIncreOrderId),PgOrderBase::getPgIncreOrderId,pgIncreOrderId)
@@ -245,8 +249,12 @@ public class OrderBaseLogic {
                                 .like(PgOrderBase::getUserMobile,keyword).or()
                                 .like(PgOrderBase::getAddress,keyword))
                 .and(CollectionUtils.isNotEmpty(orderStatusList),item -> item.in(CollectionUtils.isNotEmpty(orderStatusList), PgOrderBase::getOrderStatus, orderStatusList)
-                .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"))
-                                .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
+                        .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsImportExcel,false)
+                .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),item1 -> item1
+                        .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
+                        .eq(PgOrderBase::getIsImportExcel,true)
+                )
+
                 )
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
                 .between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())

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

@@ -4,17 +4,18 @@
 
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
-            count(DISTINCT if(a.order_status='DJD' or a.is_meet = false ,a.id,null)) 'djd',
-            count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG'),a.id,null)) 'fwz',
+            count(DISTINCT if((is_import_excel = false and a.order_status='DJD') or (is_import_excel = true and a.is_meet = false) ,a.id,null)) 'djd',
+            count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG','DSM','YZP'),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','GCSZX','YWGO','WDWG'),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','GCSZX'),a.id,null)) 'jbnwg',
+            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'jbnwg',
+            count(DISTINCT if(a.order_status not in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'WWG',
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id
-    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status!='YQX'
+    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','XSBH','FWQX','FL','TJXSBH','ZBBH','FZXBH','LRCD')
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -192,6 +192,18 @@ public class ChangeOrderLogic {
                 .set(PgOrderBase::getIsQd,false)
                 .update();
 
+        List<PgOrderBase> list = pgOrderBaseService.lambdaQuery()
+                .in(PgOrderBase::getId, ids).list();
+
+        for (PgOrderBase pgOrderBase : list) {
+            if (pgOrderBase.getIsImportExcel()){
+                PgOrderBase pgOrderBase1 = new PgOrderBase();
+                pgOrderBase1.setId(pgOrderBase.getId());
+                pgOrderBase1.setIsMeet(false);
+                pgOrderBase1.updateById();
+            }
+        }
+
 
         pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId,ids).remove();
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -276,6 +276,8 @@ public class OrderBaseLogic {
         //如果变更了师傅，则需要将“抢单”标识剔除
         if (changeWorker || (addFlag && CollectionUtils.isNotEmpty(orderAddBeanDTO.getOrderWorkers()))) {
             orderBase.setIsQd(false);
+            if (orderBase.getIsImportExcel())
+                orderBase.setIsMeet(false);
         }
 
         String orderTitle = getOrderTitle(orderAddBeanDTO.getOrderProducts());