Merge branch 'master' into feat-20230828-newstoppackage

db/v2.0/230829.sql

@@ -0,0 +1,8 @@
+alter table wm_task_type_sub_cate2
+    modify sub_cate varchar(50) not null comment '次级分类';
+
+alter table wm_task_sub_percent_rule
+    modify sub_cate varchar(50) not null comment '次级分类';
+
+alter table wm_task_type_sub_cate2
+    add parent_id varchar(10) null comment '对应wm_task_type的parent_id' after sub_cate;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -87,6 +87,7 @@ public final class UpmsType {
 		PRODUCT_PROMOTION("PRODUCT_PROMOTION", TaskCategory.FORWARD, "产品推广"),
 		MARKET_INFO_COLLECTION("MARKET_INFO_COLLECTION", TaskCategory.MARKET_INFO_COLLECTION, "市场信息搜集"),
 		SPECIAL_SERVICE("SPECIAL_SERVICE", null, "专项服务"),
+		BUSINESS_COMPANY_CUSTOMER_MANAGEMENT("BUSINESS_COMPANY_CUSTOMER_MANAGEMENT", null, "商业公司客户管理"),
 		TASK_TYPE_CONFIG("TASK_TYPE_CONFIG", null, "任务类型配置");
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -254,6 +254,11 @@ public class ApiController {
 		} else if ("47".equals(taskTypeId) || "48".equals(taskTypeId) || "49".equals(taskTypeId) || "50".equals(taskTypeId)) {
 			// 库存调研、竞品调研、培训、使用情况调查 都取47
 			connfigMap = getTaskContentConfigByTaskTypeId("47");
+		} else if ("56".equals(taskTypeId) || "57".equals(taskTypeId)) {
+			// 56首营管理-诊所
+			connfigMap.put("56", getTaskContentConfigByTaskTypeId("56"));
+			// 57首营管理-药店
+			connfigMap.put("57", getTaskContentConfigByTaskTypeId("57"));
 		} else {
 			connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
 		}
@@ -480,6 +485,10 @@ public class ApiController {
 			// 库存调研、竞品调研、培训、使用情况调查
 			taskTypeId = "47";
 		}
+		else if ("51".equals(taskTypeId) || "52".equals(taskTypeId) || "53".equals(taskTypeId)) {
+			// 信用管理A、信用管理B、信用管理C
+			taskTypeId = "51";
+		}
 
 		queryConn.setTaskTypeId(taskTypeId);
 		queryConn.setDelFlag("0");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1965,17 +1965,15 @@ public class WmScorePackageController {
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				} else if (!"".equals(wmScorePackage.getRelationScoreId()) && sysDept1.getLevel() == 3) {
 					wmScoreTaskType.setScoreId(wmScorePackage.getId());
 					wmScoreTaskType.setType("1");
 					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
 					wmScoreTaskTypess.add(wmScoreTaskType);
-					wmScoreTaskTypeService.deleteByScoreId(wmScoreTaskType.getScoreId());
-					wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 				}
 			}
+			wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
+			wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 		}
 		if (isAnswer) {
 
@@ -2069,6 +2067,7 @@ public class WmScorePackageController {
 	 * @param wmScorePackage
 	 * @return
 	 */
+	@SysLog("终止积分包(大包)")
 	@PostMapping("/stopWmScorePackage")
 	@Transactional(rollbackFor = Exception.class)
 	public R stopWmScorePackage(@RequestBody WmScorePackage wmScorePackage) {
@@ -2571,75 +2570,71 @@ public class WmScorePackageController {
 						}
 					}
 				}
-				if (null != wmScorePackage.getWmScoreTaskTypeList() && wmScorePackage.getWmScoreTaskTypeList()
-						.size() > 0) {
-
-					// 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "39".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskType40 = new WmScoreTaskType();
-						addTaskType40.setScoreId(wmScorePackage.getId());
-						addTaskType40.setType("1");
-						addTaskType40.setTaskTypeId("40");
-						WmScoreTaskType addTaskType41 = new WmScoreTaskType();
-						addTaskType41.setScoreId(wmScorePackage.getId());
-						addTaskType41.setType("1");
-						addTaskType41.setTaskTypeId("41");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType40);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType41);
-					}
-					// 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型（42/43/44）
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskType43 = new WmScoreTaskType();
-						addTaskType43.setScoreId(wmScorePackage.getId());
-						addTaskType43.setType("1");
-						addTaskType43.setTaskTypeId("43");
-						WmScoreTaskType addTaskType44 = new WmScoreTaskType();
-						addTaskType44.setScoreId(wmScorePackage.getId());
-						addTaskType44.setType("1");
-						addTaskType44.setTaskTypeId("44");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType43);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskType44);
-					}
-					// 如果存在taskTypeId=47 47,库存调研 48,竞品调研  49,培训 50,使用情况调查
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "47".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskTypeTree48 = new WmScoreTaskType();
-						addTaskTypeTree48.setTaskTypeId("48");
-						addTaskTypeTree48.setType("1");
-						WmScoreTaskType addTaskTypeTree49 = new WmScoreTaskType();
-						addTaskTypeTree49.setTaskTypeId("49");
-						addTaskTypeTree49.setType("1");
-						WmScoreTaskType addTaskTypeTree50 = new WmScoreTaskType();
-						addTaskTypeTree50.setTaskTypeId("50");
-						addTaskTypeTree50.setType("1");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree48);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree49);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree50);
-					}
+				wmScorePackageService.updateBatchById(wmScorePackageList);
+			}
+		}
 
-					List<WmScoreTaskType> wmScoreTaskTypess = new ArrayList<>();
-					for (WmScoreTaskType wmScoreTaskTypes : wmScorePackage.getWmScoreTaskTypeList()) {
-						WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
-						//将积分表id和前端传的tasktypeId赋值给wmScoreTaskTypess
-						if ("".equals(wmScorePackage.getRelationScoreId())) {
-							wmScoreTaskType.setScoreId(wmScorePackage.getId());
-							wmScoreTaskType.setType("1");
-							wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
-							wmScoreTaskTypess.add(wmScoreTaskType);
-							wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
-							wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
-						} else {
-							wmScoreTaskType.setScoreId(wmScorePackage.getId());
-							wmScoreTaskType.setType("1");
-							wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
-							wmScoreTaskTypess.add(wmScoreTaskType);
-							wmScoreTaskTypeService.deleteByScoreId(wmScoreTaskType.getScoreId());
-							wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
-						}
-					}
+		if (CollUtil.isNotEmpty(wmScorePackage.getWmScoreTaskTypeList())) {
+			// 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）
+			if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "39".equals(wmTaskTypeTree.getTaskTypeId()))) {
+				WmScoreTaskType addTaskType40 = new WmScoreTaskType();
+				addTaskType40.setScoreId(wmScorePackage.getId());
+				addTaskType40.setType("1");
+				addTaskType40.setTaskTypeId("40");
+				WmScoreTaskType addTaskType41 = new WmScoreTaskType();
+				addTaskType41.setScoreId(wmScorePackage.getId());
+				addTaskType41.setType("1");
+				addTaskType41.setTaskTypeId("41");
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType40);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType41);
+			}
+			// 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型（42/43/44）
+			if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
+				WmScoreTaskType addTaskType43 = new WmScoreTaskType();
+				addTaskType43.setScoreId(wmScorePackage.getId());
+				addTaskType43.setType("1");
+				addTaskType43.setTaskTypeId("43");
+				WmScoreTaskType addTaskType44 = new WmScoreTaskType();
+				addTaskType44.setScoreId(wmScorePackage.getId());
+				addTaskType44.setType("1");
+				addTaskType44.setTaskTypeId("44");
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType43);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskType44);
+			}
+			// 如果存在taskTypeId=47 47,库存调研 48,竞品调研  49,培训 50,使用情况调查
+			if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "47".equals(wmTaskTypeTree.getTaskTypeId()))) {
+				WmScoreTaskType addTaskTypeTree48 = new WmScoreTaskType();
+				addTaskTypeTree48.setTaskTypeId("48");
+				addTaskTypeTree48.setType("1");
+				WmScoreTaskType addTaskTypeTree49 = new WmScoreTaskType();
+				addTaskTypeTree49.setTaskTypeId("49");
+				addTaskTypeTree49.setType("1");
+				WmScoreTaskType addTaskTypeTree50 = new WmScoreTaskType();
+				addTaskTypeTree50.setTaskTypeId("50");
+				addTaskTypeTree50.setType("1");
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree48);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree49);
+				wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree50);
+			}
 
+			List<WmScoreTaskType> wmScoreTaskTypess = new ArrayList<>();
+			for (WmScoreTaskType wmScoreTaskTypes : wmScorePackage.getWmScoreTaskTypeList()) {
+				WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
+				//将积分表id和前端传的tasktypeId赋值给wmScoreTaskTypess
+				if ("".equals(wmScorePackage.getRelationScoreId())) {
+					wmScoreTaskType.setScoreId(wmScorePackage.getId());
+					wmScoreTaskType.setType("1");
+					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
+					wmScoreTaskTypess.add(wmScoreTaskType);
+				} else {
+					wmScoreTaskType.setScoreId(wmScorePackage.getId());
+					wmScoreTaskType.setType("1");
+					wmScoreTaskType.setTaskTypeId(wmScoreTaskTypes.getTaskTypeId());
+					wmScoreTaskTypess.add(wmScoreTaskType);
 				}
-				wmScorePackageService.updateBatchById(wmScorePackageList);
 			}
+			wmScoreTaskTypeService.deleteByScoreId(wmScorePackage.getId());
+			wmScoreTaskTypeService.batchInsertType(wmScoreTaskTypess);
 		}
 
 		// 查询原积分包值

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -768,7 +768,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("subjectLocation", input.getSubjectLocation().getType());
 				params.put("taxMode", "SPECIAL");
 				params.put("transactionModel", "CHANNEL");
-				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
+				params.put("taskDescription", "按要求完成学术推广并用在线工具采集记录");
 
 				// 发起结算
 				String url1 = String.format(GIG_SETTLE_URL, upmsConfig.getGigServiceUrl());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -840,6 +840,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					tasktypeList.add(addTaskTypeTree49);
 					tasktypeList.add(addTaskTypeTree50);
 				}
+				// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
+//				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
+//					addTaskTypeTree51.setTaskTypeId("52");
+//					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
+//					addTaskTypeTree52.setTaskTypeId("53");
+//					tasktypeList.add(addTaskTypeTree51);
+//					tasktypeList.add(addTaskTypeTree52);
+//				}
 
 				for (WmTaskTypeTree type : tasktypeList) {
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
@@ -1587,6 +1596,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					tasktypeList.add(addTaskTypeTree49);
 					tasktypeList.add(addTaskTypeTree50);
 				}
+				// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
+//				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
+//					addTaskTypeTree51.setTaskTypeId("52");
+//					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
+//					addTaskTypeTree52.setTaskTypeId("53");
+//					tasktypeList.add(addTaskTypeTree51);
+//					tasktypeList.add(addTaskTypeTree52);
+//				}
 
 				for (WmTaskTypeTree type : tasktypeList) {
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -1073,7 +1073,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("subjectType", "QI_FU");
 				params.put("channel", "DEFAULT");
 				params.put("subjectLocation", note.getSubjectLocation());
-				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
+				params.put("taskDescription", "按要求完成学术推广并用在线工具采集记录");
 				params.put("taxMode", "SPECIAL");
 				params.put("transactionModel", "CHANNEL");
 
@@ -2588,7 +2588,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("subjectLocation", note.getSubjectLocation().getType());
 			params.put("taxMode", "SPECIAL");
 			params.put("transactionModel", "CHANNEL");
-			params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
+			params.put("taskDescription", "按要求完成学术推广并用在线工具采集记录");
 
 			// 发起结算
 			HttpHeaders headers = new HttpHeaders();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -683,6 +683,37 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
 				}
 
+				// 信用管理A/B/C 积分值设置
+				if ("51".equals(wmTaskContent.getTemp30())) {
+					// 根据选择的信用等级 查任务类型模板
+					WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
+					// 查询当前企业的任务类型积分
+					WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
+					WmTaskType queryTaskType = new WmTaskType();
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
+					// 设置实际的任务类型
+					wmTaskContent.setTemp30(wmTaskContent.getTemp23());
+					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
+				}
+				// 首营管理-诊所/药店
+				if ("56".equals(wmTaskContent.getTemp30())) {
+					// 根据选择的终端类型 查任务类型模板
+					WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp3());
+					// 查询当前企业的任务类型积分
+					WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
+					WmTaskType queryTaskType = new WmTaskType();
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
+					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
+					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
+					// 设置实际的任务类型
+					wmTaskContent.setTemp30(wmTaskContent.getTemp3());
+					wmTask.setTaskTypeId(wmTaskContent.getTemp3());
+				}
+
 				// 校验任务类型是否启用
 				WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
 				WmTaskType queryTaskType = new WmTaskType();

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskSubmissionRuleServiceTest.java

@@ -1,6 +1,8 @@
 package com.qunzhixinxi.hnqz.admin;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
@@ -16,7 +18,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.Collections.addAll;
 
 /**
  * @author snows
@@ -60,7 +71,43 @@ public class WmTaskSubmissionRuleServiceTest {
                 taskSubmissionPercentRuleService.save(percentRule);
             }
         });
+    }
+
+    /**
+     * 增量更新企业的任务类型配置数据
+     */
+//    @Test
+    public void initNewTaskTypeConfig() {
+
+        // 平台新增的任务类型
+        Set<String> taskTypeIds = new HashSet<>();
+        taskTypeIds.add("51");
+        taskTypeIds.add("52");
+        taskTypeIds.add("53");
+        taskTypeIds.add("54");
+        taskTypeIds.add("55");
+        taskTypeIds.add("56");
+        taskTypeIds.add("57");
 
+            // 查询待修改企业的规则
+            List<WmTaskSubmissionPercentRule> queryRules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
+                    .eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG));
+            if (CollUtil.isNotEmpty(queryRules)) {
+                queryRules.forEach(percentRule -> {
+                    log.info("初始化deptId={}", percentRule.getDeptId());
 
+                    String[] oldTaskTypeIds = percentRule.getRule().getTaskTypeIds();
+
+                    WmTaskSubmissionPercentRule updateRule = new WmTaskSubmissionPercentRule();
+                    updateRule.setRuleId(percentRule.getRuleId());
+                    Set<String> newTaskTypeIdSet = Stream.of(oldTaskTypeIds).collect(Collectors.toSet());
+                    newTaskTypeIdSet.addAll(taskTypeIds);
+                    WmTaskSubmissionPercentRule.PercentRule updatePercentRule = BeanUtil.copyProperties(percentRule.getRule(), WmTaskSubmissionPercentRule.PercentRule.class);
+                    updatePercentRule.setTaskTypeIds(newTaskTypeIdSet.stream().sorted(Comparator.comparingInt(Integer::parseInt)).toArray(String[]::new));
+                    updateRule.setRule(updatePercentRule);
+                    updateRule.setUpdateTime(LocalDateTime.now());
+                    taskSubmissionPercentRuleService.updateById(updateRule);
+                });
+            }
     }
 }

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskTypeServiceTest.java

@@ -58,7 +58,7 @@ public class WmTaskTypeServiceTest {
 	/**
 	 * 批量同步指定的任务类型给所有企业
 	 */
-	@Test
+//	@Test
 	public void test() {
 		List<WmTaskType> tempList = wmTaskTypeMapper.selectBatchIds(taskTypeIdList);