From 03d3cd458fc0dee8859564073ae3e754df228e2f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 十一月 2023 14:17:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index 21c5b59..f7ba377 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -12,6 +12,7 @@
import com.core.common.R;
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.web.BaseController;
import com.zy.crm.manager.entity.*;
@@ -59,6 +60,9 @@
@Autowired
private PriOnline2FollService priOnline2FollService;
+
+ @Autowired
+ private SmsCodeService smsCodeService;
String PZH = " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
@@ -270,7 +274,7 @@
priOnline2.setMemberId(getUserId());
Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
- priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
+ priOnline2.setTemplateName(cstmr.getName()); //瀹㈡埛淇℃伅鍚嶇О
priOnline2.setSettle(0);
@@ -672,10 +676,19 @@
if (user.getId().equals(priOnline2.getUserId())) {
if (priOnline2.getAssistantHostSign()==0){
+ User manager = new User();
+ try {
+ manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ } catch (Exception e) {
+ manager = getUser();
+ }
try {
priQuoteAdd(priOnline2.getId(), plannerId);
} catch (Exception e) {
return R.error("鑷姩鐢熸垚鎶ヤ环鍗曞け璐�");
+ }
+ if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}else {
try {
@@ -686,7 +699,11 @@
return R.error("鏇存柊涓昏〃澶辫触");
}
}
-
+ }else {
+ User phoneUser = userService.selectById(nextUserId);
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
}
return R.ok("瀹℃壒鎴愬姛");
@@ -753,8 +770,8 @@
@ManagerAuth
public R priOnline2priQuoteAdd(@RequestParam Long planId) {
List<KeyValueVo> vos = new ArrayList<>();
- vos.add(new KeyValueVo("鎶ヤ环妯℃澘1", 1L));
- vos.add(new KeyValueVo("鎶ヤ环妯℃澘2", 2L));
+ vos.add(new KeyValueVo("璐ф灦妯℃澘", 1L));
+ vos.add(new KeyValueVo("闆嗘垚妯℃澘", 2L));
return R.ok().add(vos);
}
--
Gitblit v1.9.1