导入计划中添加勤策终端编码并验证与经销商之间的关系

src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/QinCeClienteleStoreDaoImpl.java

@@ -96,7 +96,8 @@ public class QinCeClienteleStoreDaoImpl implements QinCeClienteleStoreDao {
         // 指定字段查询
         qw.select(QinCeClienteleStoreDO::getQcId,
                 QinCeClienteleStoreDO::getStoreName,
-                QinCeClienteleStoreDO::getStoreAddr);
+                QinCeClienteleStoreDO::getStoreAddr,
+                QinCeClienteleStoreDO::getDealersName);
 
         QinCeClienteleStoreDO qinCeClienteleStoreDO = qinCeClienteleStoreMapper.selectOne(qw);
         return transitionDto(qinCeClienteleStoreDO);

src/main/java/com/wangxiaolu/promotion/pojo/user/dto/QinCeClienteleStoreDto.java

@@ -24,4 +24,5 @@ public class QinCeClienteleStoreDto {
     private String storeName;
 
     private String storeAddr;
+    private String dealersName;
 }

src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/ActivityPlanRecordCoreServiceImpl.java

@@ -81,9 +81,8 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
 
     private void saveActivityPlanInfo(ActivityPlanVo activityPlanVo, EmployeeActivityPlanRecordDto planDto) throws Exception {
         // 下载
-//        String filePath = "/home/" + planDto.getExcelFiledId();
-//        downloadExcel(activityPlanVo.getExcelUrl(), filePath);
-        String filePath = "/Users/tumaxiao/学习资料和自媒体/王小卤/02项目/销售-小程序/" + planDto.getExcelFiledId();
+        String filePath = "/home/" + planDto.getExcelFiledId();
+        downloadExcel(activityPlanVo.getExcelUrl(), filePath);
 
         // 读取
         List<EmployeeActivityPlanInfoDto> planInfoDtos = readSheet0(filePath, activityPlanVo, planDto);
@@ -134,8 +133,8 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
              throw new DataException("模板异常");
         }
 
-        String[] expectedHeaderGh = {"执行城市（二级行政单位市）", "门店负责人-工号", "经销商编码（T100中的编码）", "系统名称", "门店编码（勤策-终端编码）", "门店全称（系统名称+分店地址）", "活动模式（下拉选择）"};
-        String[] expectedHeader = {"执行城市（二级行政单位市）", "经销商编码（T100中的编码）", "系统名称", "门店编码（勤策-终端编码）", "门店全称（系统名称+分店地址）", "活动模式（下拉选择）"};
+        String[] expectedHeaderGh = {"执行城市（二级行政单位市）", "门店负责人-工号", "经销商编码（T100中的编码）", "系统名称", "门店编码（勤策-终端编码）", "门店名称（勤策-终端名称）", "活动模式"};
+        String[] expectedHeader = {"执行城市（二级行政单位市）", "经销商编码（T100中的编码）", "系统名称", "门店编码（勤策-终端编码）", "门店名称（勤策-终端名称）", "活动模式"};
         // 包含工号
         boolean containsGh = templateHeader[1].contains("门店负责人-工号");
         if(containsGh){
@@ -279,10 +278,6 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                 value.set(0, city + "市");
             }
 
-            if (!dealers.containsKey(((String) value.get(1)).trim())) {
-                sb.append("经销商编码错误；");
-            }
-
             if (StringUtils.isBlank((String) value.get(2))) {
                 sb.append("系统名称不可为空；");
             }
@@ -304,9 +299,14 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                     sb.append("勤策店铺编码不正确；");
                 } else {
                     if (StringUtils.isBlank(storeName)) {
-                        sb.append("店铺名称不可为空；");
+                        sb.append("勤策店铺名称不可为空；");
                     } else if (!storeName.equals(oneStore.getStoreName())) {
-                        sb.append("店铺名称不正确；");
+                        sb.append("勤策店铺编码/名称不正确；");
+                    }
+                    String dealersName = oneStore.getDealersName();
+                    String dealerId = ((String) value.get(1)).trim();
+                    if (!dealers.containsKey(dealerId) || !dealers.get(dealerId).equals(dealersName)) {
+                        sb.append("店铺不归属此经销商；");
                     }
                 }
             }
@@ -362,9 +362,9 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                 employeeNos.add((String) value.get(1));
             }
 
-            if (!dealers.containsKey(((String) value.get(2)).trim())) {
-                sb.append("经销商编码错误；");
-            }
+//            if (!dealers.containsKey(((String) value.get(2)).trim())) {
+//                sb.append("经销商编码错误；");
+//            }
 
             if (StringUtils.isBlank((String) value.get(3))) {
                 sb.append("系统名称不可为空；");
@@ -387,12 +387,16 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                     sb.append("勤策店铺编码不正确；");
                 } else {
                     if (StringUtils.isBlank(storeName)) {
-                        sb.append("店铺名称不可为空；");
+                        sb.append("勤策店铺名称不可为空；");
                     } else if (!storeName.equals(oneStore.getStoreName())) {
-                        sb.append("店铺名称不正确；");
+                        sb.append("勤策店铺编码/名称不正确；");
+                    }
+                    String dealersName = oneStore.getDealersName();
+                    String dealerId = ((String) value.get(2)).trim();
+                    if (!dealers.containsKey(dealerId) || !dealers.get(dealerId).equals(dealersName)) {
+                        sb.append("店铺不归属此经销商；");
                     }
                 }
-
             }
 
             String pattern = (String) value.get(6);