From bf6b2a0e57730d4b241a5b94cf2e8d3954a48c88 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 28 十一月 2023 16:20:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/SmsCode.java                  |    7 +++++++
 src/main/java/com/zy/crm/manager/controller/SmsCodeController.java    |    2 +-
 src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java |    7 ++++---
 src/main/java/com/zy/crm/manager/service/SmsCodeService.java          |    2 +-
 src/main/java/com/zy/crm/common/entity/PhoneCodeTypeParam.java        |    5 +++--
 src/main/resources/mapper/SmsCodeMapper.xml                           |    2 ++
 src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java            |    2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/crm/common/entity/PhoneCodeTypeParam.java b/src/main/java/com/zy/crm/common/entity/PhoneCodeTypeParam.java
index 819d5c9..c7db6ac 100644
--- a/src/main/java/com/zy/crm/common/entity/PhoneCodeTypeParam.java
+++ b/src/main/java/com/zy/crm/common/entity/PhoneCodeTypeParam.java
@@ -2,8 +2,9 @@
 
 public enum PhoneCodeTypeParam {
 
-    ALIYUN_M1ABAC630E(0, "銆愪腑鎵珛搴撱�戞湁鏂扮殑CRM娴佺▼闇�瑕佸鏍�","M1ABAC630E"),
-    ALIYUN_M6F3C81FE3(1, "銆愪腑鎵珛搴撱�戝垎閰嶄簡鏂扮殑瑙勫垝鐢宠鍗曚换鍔★紒","M6F3C81FE3"),
+    SMS(0, "銆愪腑鎵珛搴撱�戞湁鏂扮殑CRM娴佺▼闇�瑕佸鏍�","M1ABAC630E"),
+    ALIYUN_M1ABAC630E(1, "銆愪腑鎵珛搴撱�戞湁鏂扮殑CRM娴佺▼闇�瑕佸鏍�","M1ABAC630E"),
+    ALIYUN_M6F3C81FE3(2, "銆愪腑鎵珛搴撱�戝垎閰嶄簡鏂扮殑瑙勫垝鐢宠鍗曚换鍔★紒","M6F3C81FE3"),
     ;
 
     public Integer id;
diff --git a/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java b/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
index 765c020..dd699f7 100644
--- a/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
@@ -158,7 +158,7 @@
             return R.parse(CodeRes.USER_10002);
         }
 
-        SmsCode smsCode1 = smsCodeService.selectByPhone(phone);
+        SmsCode smsCode1 = smsCodeService.selectByPhone(phone,0);
         if (smsCode1 != null) {
             long createTime = smsCode1.getCreateTime().getTime();
             long nowTime = new Date().getTime();
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 b829a96..90dce0e 100644
--- a/src/main/java/com/zy/crm/manager/entity/SmsCode.java
+++ b/src/main/java/com/zy/crm/manager/entity/SmsCode.java
@@ -75,6 +75,13 @@
     @TableField("user_id")
     private Long userId;
 
+    /**
+     * 鍙戦�佷汉
+     */
+    @ApiModelProperty(value= "鍒嗙被")
+    private Integer type;
+
+
     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/mapper/SmsCodeMapper.java b/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java
index 5051d42..345786f 100644
--- a/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java
@@ -9,6 +9,6 @@
 @Repository
 public interface SmsCodeMapper extends BaseMapper<SmsCode> {
 
-    SmsCode selectByPhone(String phone);
+    SmsCode selectByPhone(String phone,Integer type);
 
 }
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 4cb3296..986bf98 100644
--- a/src/main/java/com/zy/crm/manager/service/SmsCodeService.java
+++ b/src/main/java/com/zy/crm/manager/service/SmsCodeService.java
@@ -6,7 +6,7 @@
 
 public interface SmsCodeService extends IService<SmsCode> {
 
-    SmsCode selectByPhone(String phone);
+    SmsCode selectByPhone(String phone,Integer type);
 
     boolean sendSmsCode(String phone);
 //    boolean sendSmsCodeText(String phone);
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 edcd43e..506bf2d 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
@@ -21,8 +21,8 @@
     private ConfigService configService;
 
     @Override
-    public SmsCode selectByPhone(String phone) {
-        return this.baseMapper.selectByPhone(phone);
+    public SmsCode selectByPhone(String phone,Integer type) {
+        return this.baseMapper.selectByPhone(phone,type);
     }
 
     @Override
@@ -84,6 +84,7 @@
         smsCode.setStatus(0);
         smsCode.setCreateTime(new Date());
         smsCode.setUserId(userId);
+        smsCode.setType(param.id);
         if (this.baseMapper.insert(smsCode) <= 0) {
             return false;
         }
@@ -101,7 +102,7 @@
 
     @Override
     public boolean verifySmsCode(String phone, String code) {
-        SmsCode smsCode1 = this.baseMapper.selectByPhone(phone);
+        SmsCode smsCode1 = this.baseMapper.selectByPhone(phone,0);
         if (smsCode1 == null) {
             return false;
         }
diff --git a/src/main/resources/mapper/SmsCodeMapper.xml b/src/main/resources/mapper/SmsCodeMapper.xml
index d7a8ef5..56c8f03 100644
--- a/src/main/resources/mapper/SmsCodeMapper.xml
+++ b/src/main/resources/mapper/SmsCodeMapper.xml
@@ -12,12 +12,14 @@
         <result column="send_time" property="sendTime" />
         <result column="use_time" property="useTime" />
         <result column="user_id" property="userId" />
+        <result column="type" property="type" />
 
     </resultMap>
 
     <select id="selectByPhone" resultMap="BaseResultMap">
         select top 1 * from sys_sms_code
         where phone = #{phone}
+        and type  = #{type}
         order by create_time desc
     </select>
 

--
Gitblit v1.9.1