h5密码登录提示文案与app不一样

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -217,6 +217,7 @@ public class LoginController extends AccountBaseController {
     @PostMapping("/unifiedVerification")
     public PicaResponse unifiedVerification(@RequestBody EncryptEntity entity) throws Exception{
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        request.setSourceType(super.getSourceType());
         loginService.preLoginValidate(request);
         return PicaResponse.toResponse();
     }

server/src/main/java/com/pica/cloud/account/account/server/enums/AccountExceptionEnum.java

@@ -52,6 +52,8 @@ public enum AccountExceptionEnum {
     PICA_CAP_CODE_ERROR("216544", "拼图验证失败"),
     PICA_CAP_GET_INVOKE_ERROR("216545", "拼图获取失败"),
     PICA_RC_BUSINESS_ERROR("216546", "参数格式错误"),
+    PICA_MOBILE_NOT_REGIST_H5("216547", "该手机号尚未设置密码，设置密码请前往云鹊医APP，或使用其他方式登录。"),
+    PICA_MOBILE_NOT_SETED_PASSWORD_H5("216548", "该手机号尚未设置密码，设置密码请前往云鹊医APP，或使用其他方式登录。"),
 
 
     xxx_xxx("","");

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -9,6 +9,7 @@ import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.*;
@@ -122,6 +123,7 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public LoginResult login(BaseRequest request) {
         String mobile = request.getMobile();
+        Integer sourceType = request.getSourceType();
         String encrypt = AESUtil.encryptV0(mobile);
         AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(encrypt);
         logger.info("bizType:{}, account not null：{}", request.getBizType(), accountInfoEntity != null);
@@ -132,9 +134,14 @@ public class LoginServiceImpl implements LoginService {
                     request.getBizType().equals(1)) {
                 // 新版-未设置密码
                 if (StringUtils.isEmpty(oldPwd)) {
-                    throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getCode(),
-                            AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getMessage()
-                                    .replace("{mobile}", mobile));
+                    if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
+                        throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD_H5.getCode(),
+                                AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD_H5.getMessage());
+                    } else {
+                        throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getCode(),
+                                AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getMessage()
+                                        .replace("{mobile}", mobile));
+                    }
                 } else {
                     //  判断账号是否已锁
                     logger.info("new login failure：" + mobile);
@@ -181,10 +188,15 @@ public class LoginServiceImpl implements LoginService {
         } else {
             if (null != request.getBizType() &&
                     request.getBizType().equals(1)) {
-                //  新版-未注册
-                throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getCode(),
-                        AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getMessage()
-                                .replace("{mobile}", mobile));
+                if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
+                    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_REGIST_H5.getCode(),
+                            AccountExceptionEnum.PICA_MOBILE_NOT_REGIST_H5.getMessage());
+                } else {
+                    //  新版-未注册
+                    throw new PicaException(AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getCode(),
+                            AccountExceptionEnum.PICA_PASSWORD_RULE_ERROR.getMessage()
+                                    .replace("{mobile}", mobile));
+                }
             } else {
                 throw new PicaException(AccountExceptionEnum.PICA_NOT_REGISTER.getCode(), AccountExceptionEnum.PICA_NOT_REGISTER.getMessage());
             }
@@ -568,6 +580,7 @@ public class LoginServiceImpl implements LoginService {
     public void preLoginValidate(BaseRequest request) {
         Integer bizType = request.getBizType();
         String mobile = request.getMobile();
+        Integer sourceType = request.getSourceType();
 
         if (null == bizType) {
             logger.info("bizType is null");
@@ -592,13 +605,23 @@ public class LoginServiceImpl implements LoginService {
             //  手机号是否注册
             AccountInfoEntity accountInfo = accountInfoDetailMapper.selectByMobile(AESUtil.encryptV0(mobile));
             if (accountInfo == null) {
-                throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_REGIST.getCode(),
-                        AccountExceptionEnum.PICA_MOBILE_NOT_REGIST.getMessage().replace("{mobile}", mobile));
+                if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
+                    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_REGIST_H5.getCode(),
+                            AccountExceptionEnum.PICA_MOBILE_NOT_REGIST_H5.getMessage());
+                } else {
+                    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_REGIST.getCode(),
+                            AccountExceptionEnum.PICA_MOBILE_NOT_REGIST.getMessage().replace("{mobile}", mobile));
+                }
             }
             //  手机号是否设置了密码
             if (StringUtils.isEmpty(accountInfo.getPassword())) {
-                throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD.getCode(),
-                        AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD.getMessage().replace("{mobile}", mobile));
+                if (sourceType != null && SourceTypeEnum.H5.getCode().equals(sourceType)) {
+                    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD_H5.getCode(),
+                            AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD_H5.getMessage());
+                } else {
+                    throw new PicaWarnException(AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD.getCode(),
+                            AccountExceptionEnum.PICA_MOBILE_NOT_SETED_PASSWORD.getMessage().replace("{mobile}", mobile));
+                }
             }
         }