用户修改手机号 - 谛听系统提示文案修改。

src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java

@@ -208,8 +208,15 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
             modifyPhoneNo.setUpdatedAt(new Date());
         }
         if (ModifyPhoneNoApplyStatusEnum.DONE == auditReq.getApplyStatus()) {
-            allowModify4Audit(modifyPhoneNo.getUserId(), modifyPhoneNo.getName(), modifyPhoneNo.getIdCard(),
-                    modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo());
+            log.info("audit userId = 【{}】, name = 【{}】, idCard = 【{}】, prevPhoneNo = 【{}】, " +
+                    "curPhoneNo = 【{}】", modifyPhoneNo.getUserId(), modifyPhoneNo.getName(), modifyPhoneNo.getIdCard(), modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo());
+            if (userDetailRepository.findByUserIdAndPhoneNoAndNameAndIdNo(modifyPhoneNo.getUserId(), modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getName(), modifyPhoneNo.getIdCard()) == null) {
+                throw new DataException("姓名、身份证、电话号不符。");
+            }
+            if (userRepository.findByPhoneNo(modifyPhoneNo.getCurPhoneNo()) != null) {
+                throw new DataException("新手机号已存在，不支持更换。");
+            }
+            checkLoanStatus(modifyPhoneNo.getUserId());
             userService.modifyPhoneNo(modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo());
             modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
             modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.WAIT_4_USER_FEEDBACK.ordinal());
@@ -235,25 +242,27 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
      * @return
      */
     public void allowModify4Step1(Long userId, String name, String idCard, String prevPhoneNo, String curPhoneNo, String smsCode) {
+        log.info("allowModify4Step1 userId = 【{}】, name = 【{}】, idCard = 【{}】, prevPhoneNo = 【{}】, " +
+                "curPhoneNo = 【{}】, smsCode = 【{}】", userId, name, idCard, prevPhoneNo, curPhoneNo, smsCode);
         if (modifyPhoneNoRepository.findFirstByUserIdAndApplyStatus(userId, ModifyPhoneNoProcessingStatusEnum.INIT.ordinal()) != null) {
             throw new DataException("已存在处理中的申请单，不支持再次更换。");
         }
         if (!smsService.verifyPhoneAndCode(curPhoneNo, smsCode)) {
             throw new DataException("验证码不正确。");
         }
-        allowModify4Audit(userId, name, idCard, prevPhoneNo, curPhoneNo);
-    }
-
-    /**
-     * @param userId user.id
-     */
-    public void allowModify4Audit(Long userId, String name, String idCard, String prevPhoneNo, String curPhoneNo) {
         if (userDetailRepository.findByUserIdAndPhoneNoAndNameAndIdNo(userId, prevPhoneNo, name, idCard) == null) {
             throw new DataException("信息填写有误，请重新填写。");
         }
         if (userRepository.findByPhoneNo(curPhoneNo) != null) {
             throw new DataException("信息填写有误，请重新填写。");
         }
+        checkLoanStatus(userId);
+    }
+
+    /**
+     * @param userId user.id
+     */
+    public void checkLoanStatus(Long userId) {
         log.info("allowModify userId = 【{}】", userId);
         String res = httpService.get(apiHttps + "/ex/loan/user/loan_status.json?userId=" + userId);
         log.info("allowModify res = 【{}】", res);