feat: 药店管理-批量导入加药店类型3

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

@@ -690,33 +690,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					wmTask.setTaskTypeId(wmTaskContent.getTemp3());
 				}
 
-				// 药店信息收集
-				if ("33".equals(wmTaskContent.getTemp30())) {
-					String taskTypeId;
-
-					switch (wmTaskContent.getTemp10()) {
-						case "ORDINARY":
-							// 普通药店走任务类型33
-							taskTypeId = "33";
-							break;
-						case "CHAIN":
-							// 连锁药店走任务类型73
-							taskTypeId = "73";
-							break;
-						default:
-							taskTypeId = "33";
-					}
-
-					// 根据选择的终端类型 查任务类型模板
-					WmTaskType baseTaskType = wmTaskTypeService.getById(taskTypeId);
-					// 查询当前企业的任务类型积分
-					WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-					WmTaskType queryTaskType = new WmTaskType();
-					queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-					queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
-					score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
-				}
-
 				// 校验任务类型是否启用
 				WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
 				WmTaskType queryTaskType = new WmTaskType();

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

@@ -12,6 +12,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionRule;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.entity.*;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.WmUserSignMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;
@@ -61,6 +62,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 	private final WmUserSignDetailService wmUserSignDetailService;
 	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
 	private final WmTaskSubmissionRuleService wmTaskSubmissionRuleService;
+	private final WmDaPharmacyService wmDaPharmacyService;
 	private final Sequence taskSequence;
 
 	/**
@@ -81,7 +83,25 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 		} else if ("2".equals(wmUserSign.getSignEntType())) {
 			taskTypeId = "6";
 		} else if ("3".equals(wmUserSign.getSignEntType())) {
-			taskTypeId = "33";
+			// 根据药店类型 区分任务类型33-普通药店/73-连锁药房
+			WmDaPharmacy daPharmacy = wmDaPharmacyService.getOne(Wrappers.<WmDaPharmacy>lambdaQuery()
+					.eq(WmDaPharmacy::getPharmacyName, wmUserSign.getSignEntName())
+					.eq(WmDaPharmacy::getDelFlag, DelEnum.NOT_DEL.val())
+					.eq(WmDaPharmacy::getEnableFlag, EnableEnum.ENABLE.val()));
+			if (daPharmacy == null) {
+				throw new BizException("药店不存在或已停用");
+			}
+
+			switch (daPharmacy.getPharmacyType()) {
+				case ORDINARY:
+					taskTypeId = "33";
+					break;
+				case CHAIN:
+					taskTypeId = "73";
+					break;
+				default:
+					taskTypeId = "33";
+			}
 		} else {
 			throw new BizException("拜访类型不存在");
 		}