From d5d1a6a8be10b3213514dd1f5efeb46b8c662749 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 22 十一月 2023 16:50:51 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/PlanController.java | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java index 305ffbc..d961d10 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java @@ -6,12 +6,10 @@ import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.annotations.ManagerAuth; -import com.core.common.BaseRes; -import com.core.common.Cools; -import com.core.common.DateUtils; -import com.core.common.R; +import com.core.common.*; import com.core.domain.KeyValueVo; import com.core.exception.CoolException; +import com.zy.crm.common.entity.PhoneCodeTypeParam; import com.zy.crm.common.model.SettleDto; import com.zy.crm.common.service.OssService; import com.zy.crm.common.utils.FileSaveExampleUtil; @@ -208,6 +206,10 @@ throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯"); } + if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) { + return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); + } + return R.ok(); } @@ -216,6 +218,13 @@ @Transactional public R assistantPlanAdd(@RequestParam Long hostPlanId) { Plan hostPlan = planService.selectById(hostPlanId); + if (hostPlan.getAssistantHostSign()!=0){ + return R.error("姝よ鍒掑崟涓嶉渶瑕佸垱寤哄壇娴佺▼"); + } + PlanType planType2 = planTypeService.selectById(hostPlan.getPlanType()); + if (planType2.getType()!=2){ + return R.error("姝よ鍒掑崟涓嶉渶瑕佸垱寤哄壇娴佺▼"); + } if (!Cools.isEmpty(hostPlan.getAssistantPlanId()) && hostPlan.getAssistantPlanId()!=0){ return R.error("姝よ鍒掑崟宸插瓨鍦ㄥ壇瑙勫垝鍗曪紝id涓�"+hostPlan.getAssistantPlanId()); } @@ -285,6 +294,9 @@ hostPlan.setHostPlanId(hostPlanId); if (!planService.updateById(hostPlan)) { throw new CoolException("鏇存柊澶辫触锛岃閲嶈瘯"); + } + if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) { + return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); } return R.ok("淇濆瓨鎴愬姛"); } @@ -580,11 +592,6 @@ plan.setUpdateBy(getUserId()); plan.setUpdateTime(new Date()); - boolean sendSmsCode = smsCodeService.sendSmsCodeText(planner.getMobile()); - if (!sendSmsCode) { - System.out.println("鐭俊鍙戦�佸け璐ワ紒"); - } - if (!planService.updateById(plan)) { throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); } @@ -595,6 +602,10 @@ planFoll.setUserId(planner.getId()); if (!planFollService.insert(planFoll)) { throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + + if (!smsCodeService.sendSmsCodeText(planner.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3)) { + return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); } break; case 2: @@ -641,6 +652,9 @@ if (!planService.updateById(plan)) { throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + if (!smsCodeService.sendSmsCodeText(salesman.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) { + return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); } break; case 3: @@ -891,7 +905,7 @@ * excel瀵煎叆 */ @PostMapping(value = "/plan/excel/import/auth") - @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆") + @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆") // @Transactional public R planExcelImport(MultipartFile file) throws IOException { InputStream inStream = file.getInputStream(); -- Gitblit v1.9.1