益寿缘app-完善App手机验证码逻辑

fs-service/src/main/java/com/fs/his/strategy/impl/WatchCourseRedPacketStrategy.java

@@ -1,10 +1,8 @@
 package com.fs.his.strategy.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.fs.core.config.WxOpenProperties;
-import com.fs.course.domain.FsCourseRedPacketLog;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.his.domain.FsAppRewardCourseRedPacketLog;
 import com.fs.his.domain.FsUser;
@@ -16,13 +14,10 @@ import com.fs.his.param.WxSendRedPacketParam;
 import com.fs.his.service.IFsStorePaymentService;
 import com.fs.his.strategy.RewardResult;
 import com.fs.his.strategy.RewardStrategy;
-import com.github.binarywang.wxpay.bean.transfer.TransferBillsResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-
 @Slf4j
 @Component
 public class WatchCourseRedPacketStrategy implements RewardStrategy {

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -137,6 +137,9 @@ public class AppLoginController extends AppBaseController{
         List<FsUser> user = userService.selectFsUserListByPhone(encryptPhone);
         if(CollectionUtil.isEmpty(user)){
             user = userService.selectFsUserListByPhone(encryptPhoneOldKey(phone));
+            if (CollectionUtils.isEmpty(user)){
+                user=userService.selectFsUserListByPhone(phone);//如果加密后的电话号码没有搜到就直接用号码搜索
+            }
         }
         if (!CollectionUtil.isEmpty(user)){
             return R.error("此电话号码已注册");
@@ -177,6 +180,9 @@ public class AppLoginController extends AppBaseController{
         if (users == null || CollectionUtil.isEmpty(users)){
             String s = encryptPhoneOldKey(phone);
             users = userService.selectFsUserListByPhone(s);
+            if (CollectionUtils.isEmpty(users)){
+                users=userService.selectFsUserListByPhone(phone);//如果加密后的电话号码没有搜到就直接用号码搜索
+            }
         }
         if (!CollectionUtil.isEmpty(users)){
             return R.error("此账号已经注册");
@@ -313,12 +319,12 @@ public class AppLoginController extends AppBaseController{
         String encryptPhone = encryptPhone(phone);
         List<FsUser> user;
         user = userService.selectFsUserListByPhone(encryptPhone);
-        if (CollectionUtils.isEmpty(user)){
-            user=userService.selectFsUserListByPhone(phone);//如果加密后的电话号码没有搜到就直接用号码搜索
-        }
         logger.info("加密手机号查询用户列表数据：{}", JsonUtils.toJson(user));
         if (CollectionUtil.isEmpty(user)){
             user = userService.selectFsUserListByPhone(encryptPhoneOldKey(phone));
+            if (CollectionUtils.isEmpty(user)){
+                user=userService.selectFsUserListByPhone(phone);//如果加密后的电话号码没有搜到就直接用号码搜索
+            }
             logger.info("加密手机号查询用户列表数据----1>：{}", JsonUtils.toJson(user));
         }
         if (CollectionUtil.isEmpty(user)){
@@ -353,6 +359,9 @@ public class AppLoginController extends AppBaseController{
         List<FsUser> user = userService.selectFsUserListByPhone(encryptPhone);
         if (CollectionUtil.isEmpty(user)){
             user = userService.selectFsUserListByPhone(encryptPhoneOldKey(phone));
+            if (CollectionUtil.isEmpty(user)){
+                user = userService.selectFsUserListByPhone(phone);
+            }
         }
         if (CollectionUtil.isEmpty(user)){
             return R.error("此电话号码未绑定用户");
@@ -598,6 +607,9 @@ public class AppLoginController extends AppBaseController{
         List<FsUser> user = userService.selectFsUserListByPhone(encryptPhone);
         if(CollectionUtil.isEmpty(user)){
             user = userService.selectFsUserListByPhone(encryptPhoneOldKey(phone));
+            if (CollectionUtil.isEmpty(user)){
+                user = userService.selectFsUserListByPhone(phone);
+            }
         }
         if (CollectionUtil.isEmpty(user)){
             return R.error("此电话号码未绑定用户");