From 237f9af69f9bf1a9ef8cd46e60ec368caa549ae7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 28 十一月 2023 14:17:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 4 ++--
src/main/java/com/zy/crm/manager/entity/SmsCode.java | 7 +++++++
src/main/java/com/zy/crm/manager/controller/PlanController.java | 14 +++++++-------
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 4 ++--
src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java | 5 +++--
src/main/java/com/zy/crm/manager/service/SmsCodeService.java | 2 +-
src/main/resources/mapper/SmsCodeMapper.xml | 1 +
7 files changed, 23 insertions(+), 14 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 5fe3109..f1e3a41 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -225,11 +225,11 @@
if (!planFollService.insert(planFoll)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
}
-
- if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
- return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ if (users.size()>1 && !users.get(1).getId().equals(getUserId())){
+ if (!smsCodeService.sendSmsCodeText(users.get(1).getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
+ return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
}
-
return R.ok();
}
@@ -336,7 +336,7 @@
if (!planService.updateById(hostPlan)) {
throw new CoolException("鏇存柊澶辫触锛岃閲嶈瘯");
}
- if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
return R.ok("淇濆瓨鎴愬姛");
@@ -544,12 +544,12 @@
}
if (!plan.getSettle().equals(plan.getSettleSize())){
if (!Cools.isEmpty(plannerId) && nextUserId.equals(plannerId)){
- if (!smsCodeService.sendSmsCodeText(plannerUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3)) {
+ if (!smsCodeService.sendSmsCodeText(plannerUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3,getUserId())) {
return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}else {
User phoneUser = userService.selectById(nextUserId);
- if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}
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 9838888..86d5cef 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -625,7 +625,7 @@
} catch (Exception e) {
return R.error("鑷姩鐢熸垚鎶ヤ环鍗曞け璐�");
}
- if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}else {
@@ -639,7 +639,7 @@
}
}else {
User phoneUser = userService.selectById(nextUserId);
- if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index 04612bb..c2dbf12 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -512,7 +512,7 @@
if (!priQuoteService.updateById(priQuote)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
@@ -561,7 +561,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
User phoneUser = userService.selectById(priQuote.getUserId());
- if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
break;
diff --git a/src/main/java/com/zy/crm/manager/entity/SmsCode.java b/src/main/java/com/zy/crm/manager/entity/SmsCode.java
index 9c26ea7..b829a96 100644
--- a/src/main/java/com/zy/crm/manager/entity/SmsCode.java
+++ b/src/main/java/com/zy/crm/manager/entity/SmsCode.java
@@ -68,6 +68,13 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date useTime;
+ /**
+ * 鍙戦�佷汉
+ */
+ @ApiModelProperty(value= "鍙戦�佷汉")
+ @TableField("user_id")
+ private Long userId;
+
public SmsCode() {}
public SmsCode(String phone,String code,Integer status,Date createTime,Date sendTime,Date useTime) {
diff --git a/src/main/java/com/zy/crm/manager/service/SmsCodeService.java b/src/main/java/com/zy/crm/manager/service/SmsCodeService.java
index eb540d7..4cb3296 100644
--- a/src/main/java/com/zy/crm/manager/service/SmsCodeService.java
+++ b/src/main/java/com/zy/crm/manager/service/SmsCodeService.java
@@ -10,7 +10,7 @@
boolean sendSmsCode(String phone);
// boolean sendSmsCodeText(String phone);
- boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param);
+ boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param,Long userId);
boolean verifySmsCode(String phone, String code);
diff --git a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
index 1fe703d..edcd43e 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
@@ -72,9 +72,9 @@
// }
@Override
- public boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param) {
+ public boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param,Long userId) {
Config config = configService.selectConfigByCode("SMSNotification");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+ if (Cools.isEmpty(config) || !config.getValue().equals("true")) {
return true;
}
String randomNum = param.code;
@@ -83,6 +83,7 @@
smsCode.setCode(randomNum);
smsCode.setStatus(0);
smsCode.setCreateTime(new Date());
+ smsCode.setUserId(userId);
if (this.baseMapper.insert(smsCode) <= 0) {
return false;
}
diff --git a/src/main/resources/mapper/SmsCodeMapper.xml b/src/main/resources/mapper/SmsCodeMapper.xml
index 4410811..d7a8ef5 100644
--- a/src/main/resources/mapper/SmsCodeMapper.xml
+++ b/src/main/resources/mapper/SmsCodeMapper.xml
@@ -11,6 +11,7 @@
<result column="create_time" property="createTime" />
<result column="send_time" property="sendTime" />
<result column="use_time" property="useTime" />
+ <result column="user_id" property="userId" />
</resultMap>
--
Gitblit v1.9.1