二期 频安宝 bug

src/main/java/com/care/client/controller/PassportController.java

@@ -109,6 +109,9 @@ public class PassportController {
         String vcode = String.format("%04d",new Random().nextInt(9999));
         boolean flag = false;
         if("1".equals(type)){
+            if(careMemberInfoService.detailByPhone(phone) != null){
+                return Result.error("该手机号已经注册");
+            }
             flag = smsSendService.sendSmsCode4RegisterPhone(phone, vcode);
         } else if("2".equals(type)){
             flag = smsSendService.sendSmsCode4ModifyPassword(phone, vcode);

src/main/java/com/care/client/service/PassportService.java

@@ -82,9 +82,15 @@ public class PassportService extends AbstractPassportService {
 
      public Result<Object> decodePhoneNumber(String code, String encryptedData,String iv) {
          MemberInitParams params = (MemberInitParams) redisUtil.hget(RedisKeyConstant.PINANBAO_WX_LOGIN_INFO, code);
-         String sessionKey = params.getSessionKey();
+
          String openId = params.getOpenid();
+         //判断是否注册过了
+         CareMemberInfo careMemberInfoDb = careMemberInfoService.detailByOpenid(openId);
+         if(careMemberInfoDb != null) {
+             return cache(params);
+         }
 
+         String sessionKey = params.getSessionKey();
          log.warn("encryptedData==" + encryptedData);
          log.warn("sessionKey==" + sessionKey);
          log.warn("iv==" + iv);