sdsd

src/main/java/com/template/controller/LogInfoController.java

@@ -58,7 +58,7 @@ public class LogInfoController implements LogInfoControllerAPI {
         queryWrapper1.eq("is_verify", 0);
         queryWrapper1.eq("phone_number", phone);
         queryWrapper1.eq("code", code);
-        queryWrapper1.ne("method", 1);
+        queryWrapper1.isNull("method");
         queryWrapper1.ge("expiration_time", new Date());
         List<SmsCode> listc = smsCodeService.getSmsCodeByKey(queryWrapper1);
         if (listc.isEmpty()) {

src/main/java/com/template/controller/WechatScanLoginController.java

@@ -181,7 +181,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                 queryWrapper1.eq("is_verify", 0);
                 queryWrapper1.eq("phone_number", phone);
                 queryWrapper1.eq("code", messageCode);
-                queryWrapper1.ne("method", 1);
+                queryWrapper1.isNull("method");
                 queryWrapper1.ge("expiration_time", new Date());
                 List<SmsCode> listc = smsCodeService.getSmsCodeByKey(queryWrapper1);
                 if (listc.isEmpty()) {
@@ -569,7 +569,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
         queryWrapper2.eq("deleted", 0);
         queryWrapper2.eq("is_verify", 0);
         queryWrapper2.eq("phone_number", phone);
-        queryWrapper2.ne("method", 1);
+        queryWrapper2.isNull("method");
         queryWrapper2.ge("expiration_time", new Date());
         List<SmsCode> listc = smsCodeService.getSmsCodeByKey(queryWrapper2);
         if (!listc.isEmpty()) {
@@ -658,6 +658,8 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
             return CommonResult.fail("该用户已失效");
         }
 
+        List<SmartUser> oldUsers = smartUserService.getPhoneUsers(oldData.getPhone());
+
         QueryWrapper<SmsCode> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("is_verify", 0);
@@ -675,11 +677,15 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
             smsCodeService.updateSmsCode(smsCode);
         }
 
-        oldData.setPhone(phone);
+        if (oldUsers != null && oldUsers.size() > 0) {
+            for (SmartUser oldUser :oldUsers){
+                oldUser.setPhone(phone);
+            }
 
-        int result = smartUserService.updateSmartUser(oldData);
-        if(result <= 0){
-            return CommonResult.fail("修改失败");
+            boolean result = smartUserService.updateUserBatchById(oldUsers);
+            if (!result) {
+                return CommonResult.fail("修改失败");
+            }
         }
 
         return CommonResult.ok("修改成功");
@@ -704,7 +710,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
             queryWrapper1.eq("is_verify", 0);
             queryWrapper1.eq("phone_number", phone);
             queryWrapper1.eq("code", code);
-            queryWrapper1.ne("method", 1);
+            queryWrapper1.isNull("method");
             queryWrapper1.ge("expiration_time", new Date());
             List<SmsCode> listc = smsCodeService.getSmsCodeByKey(queryWrapper1);
             if (listc.isEmpty()) {

src/main/java/com/template/controller/WxGzhController.java

@@ -103,7 +103,7 @@ public class WxGzhController implements WxGzhControllerAPI {
         queryWrapper1.eq("deleted", 0);
         queryWrapper1.eq("is_verify", 0);
         queryWrapper1.eq("phone_number", phone);
-        queryWrapper1.ne("method", 1);
+        queryWrapper1.isNull("method");
         queryWrapper1.eq("code", code);
         queryWrapper1.ge("expiration_time", new Date());
         List<SmsCode> listc = smsCodeService.getSmsCodeByKey(queryWrapper1);