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

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

@@ -5,7 +5,7 @@
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
             count(DISTINCT if(a.order_status='DJD',a.id,null)) 'djd',
-            count(DISTINCT if(a.order_status='FWZ',a.id,null)) 'fwz',
+            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',

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/AdminWebsitList.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.workorder;
+
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Data
+public class AdminWebsitList extends AdminWebsit {
+
+    @ApiModelProperty(value = "是否派工 true false")
+    private Boolean ifDispatch = false;
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.controller.admin;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminWebsitNewBean;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
+import com.gree.mall.manager.bean.workorder.AdminWebsitList;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.admin.AdminWebsitLogic;
@@ -59,7 +60,7 @@ public class AdminWebsitController {
 
     @GetMapping("/websitList")
     @ApiOperation("网点列表")
-    public ResponseHelper<List<AdminWebsit>> websitList(
+    public ResponseHelper<List<AdminWebsitList>> websitList(
             @ApiParam(value = "A=平台 B=商户网点 C=普通网点") @RequestParam(required = false) String type,
             @ApiParam(value = "当前权限网点") @RequestParam(required = false) Boolean isAll,
             @ApiParam(value = "状态") @RequestParam(required = false) Boolean status,
@@ -70,7 +71,7 @@ public class AdminWebsitController {
             @ApiParam(value = "工单来源") @RequestParam(required = false) String orderSource,
             @ApiParam(value = "工单类型") @RequestParam(required = false) String orderSmallId
     ) {
-        List<AdminWebsit> list = adminWebsitLogic.websitList(type, isAll, isIncre, status,streetCode,channelId,categoryId,orderSmallId,orderSource);
+        List<AdminWebsitList> list = adminWebsitLogic.websitList(type, isAll, isIncre, status,streetCode,channelId,categoryId,orderSmallId,orderSource);
         return ResponseHelper.success(list);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/OrderBaseStatusEnum.java

@@ -81,7 +81,7 @@ public enum OrderBaseStatusEnum implements BaseEnum {
     public static List<String> notDispatchWorker(){
         return Lists.newArrayList(DYY.key,DSHPG.key,DWDPG.key,DQD.key,
                 CJ.key,YPD.key,DXSPD.key,DZBPG.key,DXSSPGP.key,DTJXSSPGP.key,DZBSPGP.key,DFZXSPGP.key,XSBH.key,
-                TJXSBH.key,ZBBH.key,FZXBH.key,FL.key,DWDSPGP.key);
+                TJXSBH.key,ZBBH.key,FZXBH.key,FL.key,DWDSPGP.key,WDBH.key,DFZXPD.getKey());
     }
 
     public static List<String> isOver(){

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -1,5 +1,6 @@
 package com.gree.mall.manager.logic.admin;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -7,6 +8,7 @@ import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.AdminWebsitNewBean;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
+import com.gree.mall.manager.bean.workorder.AdminWebsitList;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
 import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
@@ -825,8 +827,8 @@ public class AdminWebsitLogic {
         return excelData;
     }
 
-    public List<AdminWebsit> websitList(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
-                                        String orderSmallId, String orderSourceId) {
+    public List<AdminWebsitList> websitList(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
+                                            String orderSmallId, String orderSourceId) {
 
             AdminUserCom adminUser = commonLogic.getAdminUser();
 
@@ -846,12 +848,25 @@ public class AdminWebsitLogic {
 
             List<AdminWebsit> list = adminWebsitService.lambdaQuery()
                     .eq(StringUtils.isNotBlank(type), AdminWebsit::getType, type)
-                    .in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
+                  //  .in(StringUtils.isNotBlank(streetCode) && !CollectionUtils.isEmpty(websitIds), AdminWebsit::getWebsitId, websitIds)
                     .eq(isIncre != null, AdminWebsit::getIsIncre, isIncre)
                     .eq(status != null, AdminWebsit::getStatus, status)
                     .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && (isAll == null || !isAll), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
                     .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatIds())
                     .list();
-            return list;
+
+
+        List<AdminWebsitList> adminWebsitLists = BeanUtil.copyToList(list, AdminWebsitList.class);
+
+        if (!CollectionUtils.isEmpty(websitIds)) {
+
+            for (AdminWebsitList adminWebsitList : adminWebsitLists) {
+                if (websitIds.contains(adminWebsitList.getWebsitId())) {
+                    adminWebsitList.setIfDispatch(true);
+                }
+            }
+        }
+
+        return adminWebsitLists;
     }
 }

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

@@ -117,7 +117,7 @@ public class OrderBaseExcelLogic {
         int index = 0;
         for (Object o : rows) {
             ++index;
-            String errPrefix = "第" + (index) + "行 ";
+            String errPrefix = "第" + (index) + "行,工单号："+ rows.get(1)+":";
             OrderBaseStatusEnum orderBaseStatusEnum = OrderBaseStatusEnum.DSHPG;
             List<String> row = (List<String>) o;
             CommonUtils.initList(row, 100);
@@ -479,7 +479,7 @@ public class OrderBaseExcelLogic {
         int index = 0;
         for (Object o : rows) {
             ++index;
-            String errPrefix = "第" + (index) + "行 ";
+            String errPrefix = "第" + (index) + "行,工单号："+ rows.get(1)+":";
             OrderBaseStatusEnum orderBaseStatusEnum = OrderBaseStatusEnum.DSHPG;
             List<String> row = (List<String>) o;
             CommonUtils.initList(row, 100);
@@ -853,10 +853,11 @@ public class OrderBaseExcelLogic {
         int index = 1;
         for (Object o : rows) {
             ++index;
-            String errPrefix = "第" + (index) + "行 ";
 
             List<String> row = (List<String>) o;
 
+            String errPrefix = "第" + (index) + "行,工单号："+ row.get(1)+":";
+
             String pgOrderId = row.get(0);
             String status = row.get(1);
             String serviceStatus = row.get(2);
@@ -1200,7 +1201,7 @@ public class OrderBaseExcelLogic {
                             if (sort >= pgOrderProduct.getNum())
                                 break;
                             pgOrderProductDetail.setSort(sort + 1);
-                            pgOrderProductDetail.setOrderProductId(pgOrderProduct.getProductId());
+                            pgOrderProductDetail.setOrderProductId(pgOrderProduct.getId());
 
                             pgOrderProductDetail.insert();
                             sort++;
@@ -1213,7 +1214,7 @@ public class OrderBaseExcelLogic {
                             if (sort >= pgOrderProduct.getNum())
                                 break;
                             pgOrderProductDetail.setSort(sort + 1);
-                            pgOrderProductDetail.setOrderProductId(pgOrderProduct.getProductId());
+                            pgOrderProductDetail.setOrderProductId(pgOrderProduct.getId());
 
                             pgOrderProductDetail.insert();
                             sort++;

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

@@ -1114,7 +1114,10 @@ public class OrderBaseLogic {
                     orderBaseStatusEnum == OrderBaseStatusEnum.XSBH ||
                     orderBaseStatusEnum == OrderBaseStatusEnum.TJXSBH ||
                     orderBaseStatusEnum == OrderBaseStatusEnum.ZBBH ||
-                    orderBaseStatusEnum == OrderBaseStatusEnum.FZXBH
+                    orderBaseStatusEnum == OrderBaseStatusEnum.FZXBH ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.WDBH ||
+                    orderBaseStatusEnum == OrderBaseStatusEnum.DFZXPD
+
 
             )
                 orderBaseStatusEnum = OrderBaseStatusEnum.DJD;