需求

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

@@ -48,16 +48,6 @@ public class DispatchVO {
     private String streetName;
 
 
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "工单渠道")
-    private String dictValue;
-
-
-    @ZfireField(tbName = "b",hide = true)
-    @ApiModelProperty(value = "工单渠道id")
-    private String dictCode;
-
-
     @ZfireField(tbName = "c")
     @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
@@ -76,12 +66,12 @@ public class DispatchVO {
 
 
     @ZfireField(tbName = "e",colName = "dict_value")
-    @ApiModelProperty(value = "工单来源")
-    private String orderSource;
+    @ApiModelProperty(value = "承接渠道")
+    private String saleTypeName;
 
-    @ZfireField(tbName = "e",hide = true)
-    @ApiModelProperty(value = "工单来源id")
-    private String orderSourceId;
+    @ZfireField(tbName = "e",hide = true,colName = "dict_code")
+    @ApiModelProperty(value = "承接渠道")
+    private String saleTypeId;
 
 
 

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

@@ -17,8 +17,8 @@ public class WebsitDispatchAdd {
     @ApiModelProperty(value = "街道id")
     private String streetCode;
 
-    @ApiModelProperty(value = "工单渠道")
-    private List<String> orderChannelIds;
+    @ApiModelProperty(value = "承接渠道ids")
+    private List<String> salesTypeIds;
 
     @ApiModelProperty(value = "工单类型")
     private List<String> orderSmallIds;
@@ -26,8 +26,6 @@ public class WebsitDispatchAdd {
     @ApiModelProperty(value = "产品大类")
     private List<String> categoryIds;
 
-    @ApiModelProperty(value = "工单来源")
-    private List<String> orderSourceIds;
 
 
 

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

@@ -44,12 +44,6 @@ public class WebsitDispatchVO    {
     @ApiModelProperty(value = "街道id")
     private String streetCode;
 
-    @ApiModelProperty(value = "工单渠道")
-    private String dictValue;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单渠道id")
-    private String dictCode;
-
     @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
     @ZfireField(hide = true)
@@ -62,11 +56,11 @@ public class WebsitDispatchVO    {
     @ApiModelProperty(value = "产品大类id")
     private String categoryId;
 
-    @ApiModelProperty(value = "工单来源")
-    private String orderSource;
+    @ApiModelProperty(value = "承接渠道")
+    private String saleTypeName;
     @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单来源id")
-    private String orderSourceId;
+    @ApiModelProperty(value = "承接渠道id")
+    private String saleTypeId;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/constant/SysDictConstant.java

@@ -9,6 +9,7 @@ public class SysDictConstant {
     public final static String BRAND="BRAND";
     //工单渠道
     public final static String ORDER_CHANNEL = "ORDER_CHANNEL";
+    public final static String SALES_TYPE = "SALES_TYPE";
 
     //工单来源
     public final static String ORDER_SOURCE = "WORKER_ORDER_SOURCE";

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

@@ -50,15 +50,14 @@ public class AdminWebsitController {
             @RequestParam(required = false) Boolean status,
             @RequestParam(required = false) Boolean isIncre,
             @RequestParam(required = false) String streetCode,
-            @RequestParam(required = false) String channelId,
             @RequestParam(required = false) String categoryId,
-            @RequestParam(required = false) String orderSourceId,
+            @RequestParam(required = false) String saleTypeId,
             @RequestParam(required = false) String orderSmallId,
             @RequestParam(required = false) Boolean queryPartsWebsit,
             @RequestParam(required = false)   @ApiParam(value = "网点属性 SELF=自建网点 MAJOR=第三方专业网点 MERCHANT=第三方经销商家网点")String attr,
             @RequestParam(required = false) Integer level
     ) {
-        List<AdminWebsit> list = adminWebsitLogic.list(attr,websitId,websitName,type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit, level);
+        List<AdminWebsit> list = adminWebsitLogic.list(attr,websitId,websitName,type, isAll, isIncre, status, streetCode, saleTypeId, categoryId, orderSmallId, queryPartsWebsit, level);
         return ResponseHelper.success(list);
     }
 
@@ -71,12 +70,11 @@ public class AdminWebsitController {
             @ApiParam(value = "状态") @RequestParam(required = false) Boolean status,
             @ApiParam(value = "是否增值网点") @RequestParam(required = false) Boolean isIncre,
             @ApiParam(value = "街道id") @RequestParam(required = false) String streetCode,
-            @ApiParam(value = "渠道") @RequestParam(required = false) String channelId,
+            @ApiParam(value = "承接渠道") @RequestParam(required = false) String saleTypeId,
             @ApiParam(value = "产品大类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "工单来源") @RequestParam(required = false) String orderSource,
             @ApiParam(value = "工单类型") @RequestParam(required = false) String orderSmallId
     ) {
-        List<AdminWebsitList> list = adminWebsitLogic.websitList(type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSource);
+        List<AdminWebsitList> list = adminWebsitLogic.websitList(type, isAll, isIncre, status, streetCode, saleTypeId, categoryId, orderSmallId);
         return ResponseHelper.success(list);
     }
 

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

@@ -133,8 +133,8 @@ public class AdminWebsitLogic {
         return parentList;
     }
 
-    public List<AdminWebsit> list(String attr,String websitId,String websitName,String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
-                                  String orderSmallId, String orderSourceId, Boolean queryPartsWebsit, Integer level) {
+    public List<AdminWebsit> list(String attr,String websitId,String websitName,String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String saleTypeId, String categoryId,
+                                  String orderSmallId , Boolean queryPartsWebsit, Integer level) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
 
@@ -143,10 +143,9 @@ public class AdminWebsitLogic {
             websitIds = websitDispatchService.lambdaQuery()
                     .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
-                    .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
+                    .eq(!StringUtil.isEmpty(saleTypeId), WebsitDispatch::getSaleTypeId, saleTypeId)
                     .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
                     .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
-                    .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
                     .like(!StringUtil.isEmpty(websitId), WebsitDispatch::getWebsitId, websitId)
                     .like(!StringUtil.isEmpty(websitName), WebsitDispatch::getWebsitName, websitName)
                     .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
@@ -1192,8 +1191,8 @@ public class AdminWebsitLogic {
         return excelData;
     }
 
-    public List<AdminWebsitList> 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 saleTypeId, String categoryId,
+                                            String orderSmallId) {
 
             AdminUserCom adminUser = commonLogic.getAdminUser();
 
@@ -1203,10 +1202,9 @@ public class AdminWebsitLogic {
                 websitIds = websitDispatchService.lambdaQuery()
                         .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
                         .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
-                        .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
+                        .eq(!StringUtil.isEmpty(saleTypeId), WebsitDispatch::getSaleTypeId, saleTypeId)
                         .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
                         .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
-                        .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
                         .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
             }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -333,7 +333,8 @@ public class PolicyOrderLogic {
                     .eq(PolicyOrder::getType, "EM")
                     .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
                             PolicyOrderEmStutasEnum.DSX.getKey(),
-                            PolicyOrderEmStutasEnum.KTH.getKey()
+                            PolicyOrderEmStutasEnum.KTH.getKey(),
+                            PolicyOrderEmStutasEnum.DTH.getKey()
 
                     ).remove();
 

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

@@ -108,14 +108,14 @@ public class ChangeOrderLogic {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime,String remark,String imgSrc) {
+    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime, String remark, String imgSrc) {
         pgOrderBaseService.lambdaUpdate()
-                .eq(PgOrderBase::getId,id)
-                .set(!StringUtils.isEmpty(remark),PgOrderBase::getChangeRemark,remark)
-                .set(!StringUtils.isEmpty(remark),PgOrderBase::getAppointmentRemark,remark)
-                .set(PgOrderBase::getAppointmentTime,appointmentTime)
-                .set(PgOrderBase::getAppointmentEndTime,appointmentEndTime)
-                .set(PgOrderBase::getLastOperatorAppointmentTime,new Date())
+                .eq(PgOrderBase::getId, id)
+                .set(!StringUtils.isEmpty(remark), PgOrderBase::getChangeRemark, remark)
+                .set(!StringUtils.isEmpty(remark), PgOrderBase::getAppointmentRemark, remark)
+                .set(PgOrderBase::getAppointmentTime, appointmentTime)
+                .set(PgOrderBase::getAppointmentEndTime, appointmentEndTime)
+                .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
                 .update();
 
 //        pgOrderBaseService.lambdaUpdate()
@@ -123,10 +123,10 @@ public class ChangeOrderLogic {
 //                .eq(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DYY.getKey())
 //                .set(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DSHPG).update();
 
-        this.addLog(id,imgSrc);
+        this.addLog(id, imgSrc);
     }
 
-    private void addLog(String id,String imgSrc) {
+    private void addLog(String id, String imgSrc) {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
         PgOrderOperatorLog pgOrderOperatorLog = new PgOrderOperatorLog();
@@ -151,7 +151,6 @@ public class ChangeOrderLogic {
         List<PgOrderWorker> pgOrderWorkers = new ArrayList<>();
 
 
-
         boolean isDa = true;
 
         User userOne = userService.getById(workerIds.get(0));
@@ -179,26 +178,26 @@ public class ChangeOrderLogic {
 
 
         pgOrderBaseService.lambdaUpdate()
-                .in(PgOrderBase::getId,ids)
-                .set(PgOrderBase::getWorkerName,userOne.getNickName())
-                .set(PgOrderBase::getWebsitId,websitId)
-                .set(PgOrderBase::getWebsitName,adminWebsit.getName())
-                .set(PgOrderBase::getWebsitPhone,adminWebsit.getWebsitPhone())
-                .set(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DJD.getKey())
-                .set(PgOrderBase::getOrderStatusText,OrderBaseStatusEnum.DJD.getRemark())
-                .set(PgOrderBase::getWorkerIdcard,userOne.getIdCard())
-                .set(PgOrderBase::getWorkerId,userOne.getUserId())
-                .set(PgOrderBase::getWorkerNumber,userOne.getWorkerNumber())
-                .set(PgOrderBase::getWorkerMobile,userOne.getMobile())
-                .set(PgOrderBase::getDispatchTime,new Date())
-                .set(PgOrderBase::getIsQd,false)
+                .in(PgOrderBase::getId, ids)
+                .set(PgOrderBase::getWorkerName, userOne.getNickName())
+                .set(PgOrderBase::getWebsitId, websitId)
+                .set(PgOrderBase::getWebsitName, adminWebsit.getName())
+                .set(PgOrderBase::getWebsitPhone, adminWebsit.getWebsitPhone())
+                .set(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.DJD.getKey())
+                .set(PgOrderBase::getOrderStatusText, OrderBaseStatusEnum.DJD.getRemark())
+                .set(PgOrderBase::getWorkerIdcard, userOne.getIdCard())
+                .set(PgOrderBase::getWorkerId, userOne.getUserId())
+                .set(PgOrderBase::getWorkerNumber, userOne.getWorkerNumber())
+                .set(PgOrderBase::getWorkerMobile, userOne.getMobile())
+                .set(PgOrderBase::getDispatchTime, new Date())
+                .set(PgOrderBase::getIsQd, false)
                 .update();
 
         List<PgOrderBase> list = pgOrderBaseService.lambdaQuery()
                 .in(PgOrderBase::getId, ids).list();
 
         for (PgOrderBase pgOrderBase : list) {
-            if (pgOrderBase.getIsImportExcel()){
+            if (pgOrderBase.getIsImportExcel()) {
                 PgOrderBase pgOrderBase1 = new PgOrderBase();
                 pgOrderBase1.setId(pgOrderBase.getId());
                 pgOrderBase1.setIsMeet(false);
@@ -213,7 +212,7 @@ public class ChangeOrderLogic {
         }
 
 
-        pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId,ids).remove();
+        pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId, ids).remove();
 
         pgOrderWorkerService.saveBatch(pgOrderWorkers);
 
@@ -229,15 +228,15 @@ public class ChangeOrderLogic {
         pgOrderOperatorLog.setOrderBaseId(id);
         pgOrderOperatorLog.setType(OrderOperatorLogTypeEnum.GP.getKey());
         pgOrderOperatorLog.setTypeText(OrderOperatorLogTypeEnum.GP.getRemark());
-        pgOrderOperatorLog.setContent("派工主要工程师："+pgOrderBase.getWorkerName());
+        pgOrderOperatorLog.setContent("派工主要工程师：" + pgOrderBase.getWorkerName());
         orderLogLogic.addLog(pgOrderOperatorLog);
     }
 
 
     public List<PgOrderProductDetail> getOrderProduct(String id, List<String> status) {
 
-        return pgOrderProductDetailService.lambdaQuery().eq(PgOrderProductDetail::getOrderBaseId,id)
-                .in(!CollectionUtils.isEmpty(status),PgOrderProductDetail::getStatus,status).list();
+        return pgOrderProductDetailService.lambdaQuery().eq(PgOrderProductDetail::getOrderBaseId, id)
+                .in(!CollectionUtils.isEmpty(status), PgOrderProductDetail::getStatus, status).list();
     }
 
     public PgOrderProductDetailVO productDetail(String id) {
@@ -263,7 +262,7 @@ public class ChangeOrderLogic {
     public List<WorkerOrderDetail> getOrderList(String workerOrderId) {
 
         List<WorkerOrder> list = workerOrderService.lambdaQuery().eq(WorkerOrder::getWorkerOrderId, workerOrderId)
-                .in(WorkerOrder::getPayStatus,PayStatusEnum.WAIT.getKey(),PayStatusEnum.PAID.getKey()).list();
+                .in(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey(), PayStatusEnum.PAID.getKey()).list();
         if (CollectionUtils.isEmpty(list))
             return new ArrayList<>();
 
@@ -271,7 +270,7 @@ public class ChangeOrderLogic {
         for (WorkerOrderDetail workerOrder : workerOrderDetails1) {
 
             workerOrder.setWorkerOrderItems(workerOrderItemService.lambdaQuery()
-                    .eq(WorkerOrderItem::getOrderId,workerOrder.getOrderId()).list());
+                    .eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list());
 
             PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrderId);
             workerOrder.setPgOrderBase(pgOrderBase);
@@ -280,8 +279,6 @@ public class ChangeOrderLogic {
         }
 
 
-
-
         return workerOrderDetails1;
 
     }
@@ -296,17 +293,17 @@ public class ChangeOrderLogic {
         zfireParam = FieldUtils.supplyParam(zfireParam, DispatchVO.class);
 
         List<WebsitDispatch> websitDispatches = websitDispatchService.lambdaQuery().eq(WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .select(WebsitDispatch::getStreetCode, WebsitDispatch::getDictCode, WebsitDispatch::getOrderSmallId,
-                        WebsitDispatch::getCategoryId, WebsitDispatch::getOrderSourceId)
+                .select(WebsitDispatch::getStreetCode, WebsitDispatch::getSaleTypeId, WebsitDispatch::getOrderSmallId,
+                        WebsitDispatch::getCategoryId)
                 .list();
 
         List<String> codeList = new ArrayList<>();
         for (WebsitDispatch websitDispatch : websitDispatches) {
-            codeList.add(websitDispatch.getStreetCode()+websitDispatch.getDictCode()+websitDispatch.getOrderSmallId()
-            +websitDispatch.getCategoryId()+websitDispatch.getOrderSourceId());
+            codeList.add(websitDispatch.getStreetCode() + websitDispatch.getSaleTypeId() + websitDispatch.getOrderSmallId()
+                    + websitDispatch.getCategoryId());
         }
 
-        IPage<DispatchVO> dispatchVOIPage = increMapper.listDispatch(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam,adminCompanyIds,codeList);
+        IPage<DispatchVO> dispatchVOIPage = increMapper.listDispatch(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds, codeList);
 
         return dispatchVOIPage;
 
@@ -331,7 +328,7 @@ public class ChangeOrderLogic {
         //1.组装查询条件
         zfireParamBean = FieldUtils.supplyParam(zfireParamBean, WebsitDispatchVO.class);
 
-        IPage<WebsitDispatchVO> websitDispatchVOIPage = increMapper.listDispatchWebsit(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean,adminCompanyIds);
+        IPage<WebsitDispatchVO> websitDispatchVOIPage = increMapper.listDispatchWebsit(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminCompanyIds);
 
         return websitDispatchVOIPage;
     }
@@ -341,56 +338,56 @@ public class ChangeOrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.pList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.pList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
-    public List<DispatchCherVO> cList(String pId, String cityCode, String areaCode, String streetCode,List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
+    public List<DispatchCherVO> cList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.cList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.cList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> aList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.aList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.aList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> sList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.sList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.sList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> channel(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.channel(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.channel(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> smallList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.smallList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.smallList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> categoryList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.categoryList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.categoryList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> sourceList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.sourceList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.sourceList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -409,54 +406,47 @@ public class ChangeOrderLogic {
 
                 GoodsCategory goodsCategory = goodsCategoryService.getById(categoryId);
 
-                for (String orderChannel : websitDispatchAdd.getOrderChannelIds()) {
-
-                    SysDictCompany orderChanne = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, orderChannel).last("limit 1").one();
+                for (String salesId : websitDispatchAdd.getCategoryIds()) {
 
-                    for (String orderSourceId : websitDispatchAdd.getOrderSourceIds()) {
+                    SysDictCompany sales = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, salesId).last("limit 1").one();
 
 
-                        SysDictCompany orderSource = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, orderSourceId).last("limit 1").one();
+                    WebsitDispatch websitDispatch = new WebsitDispatch();
+                    websitDispatch.setWebsitId(adminWebsit.getWebsitId());
+                    websitDispatch.setWebsitName(adminWebsit.getName());
+                    websitDispatch.setProvinceCode(region.getProvinceCode());
+                    websitDispatch.setProvinceName(region.getProvinceName());
+                    websitDispatch.setCityCode(region.getCityCode());
+                    websitDispatch.setCityName(region.getCityName());
+                    websitDispatch.setAreaCode(region.getAreaCode());
+                    websitDispatch.setAreaName(region.getAreaName());
+                    websitDispatch.setStreetCode(region.getId());
+                    websitDispatch.setStreetName(region.getName());
+                    websitDispatch.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+                    websitDispatch.setCompanyWechatName(adminWebsit.getCompanyWechatName());
 
-                        WebsitDispatch websitDispatch = new WebsitDispatch();
-                        websitDispatch.setWebsitId(adminWebsit.getWebsitId());
-                        websitDispatch.setWebsitName(adminWebsit.getName());
-                        websitDispatch.setProvinceCode(region.getProvinceCode());
-                        websitDispatch.setProvinceName(region.getProvinceName());
-                        websitDispatch.setCityCode(region.getCityCode());
-                        websitDispatch.setCityName(region.getCityName());
-                        websitDispatch.setAreaCode(region.getAreaCode());
-                        websitDispatch.setAreaName(region.getAreaName());
-                        websitDispatch.setStreetCode(region.getId());
-                        websitDispatch.setStreetName(region.getName());
-                        websitDispatch.setCompanyWechatId(adminWebsit.getCompanyWechatId());
-                        websitDispatch.setCompanyWechatName(adminWebsit.getCompanyWechatName());
 
+                    websitDispatch.setOrderSmallTypeText(orderSmallType.getOrderSmallTypeText());
+                    websitDispatch.setOrderSmallId(orderSmallType.getId());
 
-                        websitDispatch.setOrderSmallTypeText(orderSmallType.getOrderSmallTypeText());
-                        websitDispatch.setOrderSmallId(orderSmallType.getId());
+                    websitDispatch.setCategoryId(goodsCategory.getCategoryId());
+                    websitDispatch.setCategoryName(goodsCategory.getName());
+                    websitDispatch.setSaleTypeId(sales.getDictCode());
+                    websitDispatch.setSaleTypeName(sales.getDictValue());
 
-                        websitDispatch.setCategoryId(goodsCategory.getCategoryId());
-                        websitDispatch.setCategoryName(goodsCategory.getName());
 
-                        websitDispatch.setDictCode(orderChanne.getDictCode());
-                        websitDispatch.setDictValue(orderChanne.getDictValue());
-
-                        websitDispatch.setOrderSource(orderSource.getDictValue());
-                        websitDispatch.setOrderSourceId(orderSource.getDictCode());
+                    if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, region.getId())
+                            .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                            .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                            .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
+                            .count() > 0) {
+                        throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
+                                "，承接渠道：" + websitDispatch.getSaleTypeName() + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
+                    }
 
-                        if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode,region.getId())
-                                .eq(WebsitDispatch::getOrderSmallId,websitDispatch.getOrderSmallId())
-                                .eq(WebsitDispatch::getCategoryId,websitDispatch.getCategoryId())
-                                .eq(WebsitDispatch::getDictCode,websitDispatch.getDictCode())
-                                .eq(WebsitDispatch::getOrderSourceId,websitDispatch.getOrderSourceId()).count() > 0) {
-                            throw new RemoteServiceException("存在街道："+websitDispatch.getStreetName()+"，产品大类："+websitDispatch.getCategoryName()+
-                                    "，工单渠道："+websitDispatch.getDictValue()+"，工单来源："+websitDispatch.getOrderSource()+"，工单类型："+websitDispatch.getOrderSmallTypeText());
-                        }
+                    websitDispatches.add(websitDispatch);
 
-                        websitDispatches.add(websitDispatch);
 
-                    }
                 }
             }
         }
@@ -469,14 +459,13 @@ public class ChangeOrderLogic {
     }
 
 
-
     @Transactional(rollbackFor = Exception.class)
     public void importData(MultipartFile file) throws IOException {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         List<Object> rows = ExcelUtils.importExcel(file);
-        if(org.apache.commons.collections4.CollectionUtils.isEmpty(rows)){
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(rows)) {
             throw new RemoteServiceException("导入内容为空");
         }
 
@@ -490,12 +479,10 @@ public class ChangeOrderLogic {
         Map<String, GoodsCategory> categoryMap1 = goodsCategoryList.stream().filter(v -> v.getLevel() == 1)
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
 
-        //工单渠道
-         Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
+        //销售渠道
+        Map<String, SysDictCompany> salesMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.SALES_TYPE, adminUser.getCompanyWechatId());
 
-        //工单渠道
-        Map<String, SysDictCompany> orderSourceMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_SOURCE, adminUser.getCompanyWechatId());
-        //网点名称
+             //网点名称
         Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .in(adminUser.getType() == 0, AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
@@ -503,37 +490,34 @@ public class ChangeOrderLogic {
                 .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
 
         List<WebsitDispatch> websitDispatches = new ArrayList<>();
-        for(Object o : rows) {
+        for (Object o : rows) {
             List<Object> row = (List<Object>) o;
 
-            String websitName = (String)row.get(0);
-            String websitId = (String)row.get(1);
-            String pName = (String)row.get(2);
-            String cName = (String)row.get(3);
-            String aName = (String)row.get(4);
-            String sName = (String)row.get(5);
-            String channelName = (String)row.get(6);
-            String smallName = (String)row.get(7);
-            String categoryName = (String)row.get(8);
-            String sourceName = (String)row.get(9);
-
-            String[] channelNames = channelName.split("/");
+            String websitName = (String) row.get(0);
+            String websitId = (String) row.get(1);
+            String pName = (String) row.get(2);
+            String cName = (String) row.get(3);
+            String aName = (String) row.get(4);
+            String sName = (String) row.get(5);
+            String saleName = (String) row.get(6);
+            String smallName = (String) row.get(7);
+            String categoryName = (String) row.get(8);
+
+
+            String[] salesNames = saleName.split("/");
             String[] smallNames = smallName.split("/");
             String[] categoryNames = categoryName.split("/");
-            String[] sourceNames = sourceName.split("/");
+
 
             AdminWebsit adminWebsit = adminWebsitMap.get(websitId);
             Region region = orderBaseLogic.getRegion(pName, cName, aName, sName);
 
-            for (String channel : channelNames) {
-                SysDictCompany orderChanne = orderChannelMap.get(channel);
+            for (String sales : salesNames) {
+                SysDictCompany saleOne = salesMap.get(sales);
                 for (String small : smallNames) {
                     OrderSmallType orderSmallType = orderSmallTypeMap.get(small);
                     for (String category : categoryNames) {
                         GoodsCategory goodsCategory = categoryMap1.get(category);
-                        for (String source : sourceNames) {
-
-                            SysDictCompany orderSource = orderSourceMap.get(source);
 
                             WebsitDispatch websitDispatch = new WebsitDispatch();
                             websitDispatch.setWebsitId(adminWebsit.getWebsitId());
@@ -556,23 +540,21 @@ public class ChangeOrderLogic {
                             websitDispatch.setCategoryId(goodsCategory.getCategoryId());
                             websitDispatch.setCategoryName(goodsCategory.getName());
 
-                            websitDispatch.setDictCode(orderChanne.getDictCode());
-                            websitDispatch.setDictValue(orderChanne.getDictValue());
+                            websitDispatch.setSaleTypeName(saleOne.getDictCode());
+                            websitDispatch.setSaleTypeId(saleOne.getDictValue());
 
-                            websitDispatch.setOrderSource(orderSource.getDictValue());
-                            websitDispatch.setOrderSourceId(orderSource.getDictCode());
 
-                            if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode,region.getId())
-                                    .eq(WebsitDispatch::getOrderSmallId,websitDispatch.getOrderSmallId())
-                                    .eq(WebsitDispatch::getCategoryId,websitDispatch.getCategoryId())
-                                    .eq(WebsitDispatch::getDictCode,websitDispatch.getDictCode())
-                                    .eq(WebsitDispatch::getOrderSourceId,websitDispatch.getOrderSourceId()).count() > 0) {
-                                throw new RemoteServiceException("存在街道："+websitDispatch.getStreetName()+"，产品大类："+websitDispatch.getCategoryName()+
-                                        "，工单渠道："+websitDispatch.getDictValue()+"，工单来源："+websitDispatch.getOrderSource()+"，工单类型："+websitDispatch.getOrderSmallTypeText());
+                            if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, region.getId())
+                                    .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                                    .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                                    .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
+                                    .count() > 0) {
+                                throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
+                                        "，承接渠道：" + websitDispatch.getSaleTypeName() + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
                             }
 
                             websitDispatches.add(websitDispatch);
-                        }
+
                     }
                 }
             }
@@ -587,14 +569,14 @@ public class ChangeOrderLogic {
     @Transactional(rollbackFor = Exception.class)
     public void updateDispatch(WebsitDispatch websitDispatch) {
 
-        if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode,websitDispatch.getStreetCode())
-                .eq(WebsitDispatch::getOrderSmallId,websitDispatch.getOrderSmallId())
-                .eq(WebsitDispatch::getCategoryId,websitDispatch.getCategoryId())
-                .eq(WebsitDispatch::getDictCode,websitDispatch.getDictCode())
-                .ne(WebsitDispatch::getId,websitDispatch.getId())
-                .eq(WebsitDispatch::getOrderSourceId,websitDispatch.getOrderSourceId()).count() > 0) {
-            throw new RemoteServiceException("存在街道："+websitDispatch.getStreetName()+"，产品大类："+websitDispatch.getCategoryName()+
-                    "，工单渠道："+websitDispatch.getDictValue()+"，工单来源："+websitDispatch.getOrderSource()+"，工单类型："+websitDispatch.getOrderSmallTypeText());
+        if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, websitDispatch.getStreetCode())
+                .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
+                .ne(WebsitDispatch::getId, websitDispatch.getId())
+                .count() > 0) {
+            throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
+                    "，承接渠道：" + websitDispatch.getSaleTypeName()  + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
         }
 
         websitDispatch.updateById();

mall-server-api/src/main/resources/mapper/workorder/IncreMapper.xml

@@ -29,8 +29,6 @@
         a.area_code,
         a.name as streetName,
         a.id as streetCode,
-        b.dict_value,
-        b.dict_code,
         c.order_small_type_text,
         c.id as orderSmallId,
         d.name as categoryName,
@@ -39,7 +37,7 @@
         e.dict_code as order_source_id
         FROM
         region a
-        join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0     and
+        join order_small_type c and
         a.city_name IN ( '广州市', '清远市', '韶关市', '佛山市', '肇庆市', '云浮市' )
         AND a.`level` = 4
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
@@ -48,13 +46,6 @@
                 #{item}
             </foreach>
         </if>
-        join order_small_type c
-        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
-            on c.company_wechat_id IN
-            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         join goods_category d on d.type = 2 and d.del =0 and d.`level` = 1
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND d.company_wechat_id IN
@@ -62,7 +53,7 @@
                 #{item}
             </foreach>
         </if>
-        join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
+        join sys_dict_company e on e.dict_type = 'SALES_TYPE' and e.del = 0
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND e.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -72,7 +63,7 @@
         ${ex.query}
 
         <if test="codeList != null and codeList.size > 0">
-            AND CONCAT(a.id,b.dict_code,c.id,d.category_id,e.dict_code) not In
+            AND CONCAT(a.id,e.dict_code,c.id,d.category_id) not In
             <foreach item="item" index="index" collection="codeList" open="(" separator="," close=")">
                 #{item}
             </foreach>