Merge branch 'feat-20230316-tasktype47' into temp-pre

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

@@ -1166,7 +1166,7 @@ public class ApiController {
 		HnqzUser user = SecurityUtils.getUser();
 		String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, wmTaskContent.getTemp30(), user.getId());
 
-		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(wmTaskContent));
+		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(wmTaskContent), 12, TimeUnit.HOURS);
 
 		return R.ok();
 	}

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

@@ -651,6 +651,20 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					wmTask.setTaskTypeId(taskTypeId);
 				}
 
+				// 药店推广-47 积分值设置
+				if ("47".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);
+					// 计算实际任务积分（数量*企业这个任务类型的积分值）
+					score = score * Integer.parseInt(wmTaskContent.getTemp13());
+				}
+
 				// 校验任务类型是否启用
 				WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
 				WmTaskType queryTaskType = new WmTaskType();