From 49ab626b5cb89219a4b4b86b5f1774f4705df51c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 15:46:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/SmsCodeController.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

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 a71a463..929368b 100644
--- a/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
+import com.zy.crm.common.CodeRes;
 import com.zy.crm.manager.entity.SmsCode;
 import com.zy.crm.manager.service.SmsCodeService;
 import com.core.annotations.ManagerAuth;
@@ -15,6 +16,8 @@
 import com.core.domain.KeyValueVo;
 import com.zy.crm.common.web.BaseController;
 import com.zy.crm.manager.utils.SmsUtils;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +28,8 @@
 
     @Autowired
     private SmsCodeService smsCodeService;
+    @Autowired
+    private UserService userService;
 
     @RequestMapping(value = "/smsCode/{id}/auth")
     @ManagerAuth
@@ -143,8 +148,17 @@
         if (!SmsUtils.verifyPhone(phone)) {
             return R.error("鎵嬫満鍙锋牸寮忎笉姝g‘");
         }
+        EntityWrapper<User> userWrapper = new EntityWrapper<>();
+        userWrapper.eq("mobile", phone);
+        User user = userService.selectOne(userWrapper);
+        if (Cools.isEmpty(user)){
+            return R.parse(CodeRes.USER_10001);
+        }
+        if (user.getStatus()!=1){
+            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();
@@ -154,10 +168,15 @@
             }
         }
 
-        boolean sendSmsCode = smsCodeService.sendSmsCode(phone);
-        if (!sendSmsCode) {
-            return R.error();
+        try{
+            boolean sendSmsCode = smsCodeService.sendSmsCode(phone);
+            if (!sendSmsCode) {
+                return R.error("鍙戦�佸け璐ワ紝璇锋鏌ョ綉缁�!");
+            }
+        }catch (Exception e){
+            return R.error("鍙戦�佸け璐ワ紝璇锋鏌ョ綉缁滐紒");
         }
+
         return R.ok();
     }
 

--
Gitblit v1.9.1