解决重置实名信息失败时反馈成功bug

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -1296,15 +1296,17 @@ public class InnerController implements IBaseController {
         if (Objects.nonNull(userId) && ValidationUtil.validateChinese(name)) {
             try {
                 User user = userService.findById(userId);
-                int rows = userDetailService.updateIdCard(name, idNo, user.getPhoneNo());
+                int rows = userDetailService.updateNameAndIdCard(name, idNo, user.getPhoneNo());
                 log.info("重置用户实名信息,userId:{},name:{},idNo:{},result:[{}]", userId, name, idNo, rows);
-                return JsonResult.buildSuccessResult("用户姓名已重置.", name);
+                if(rows > 0){
+                    return JsonResult.buildSuccessResult("用户实名信息已重置.", name.concat(",").concat(idNo).concat(",").concat(userId.toString()));
+                }
             } catch (Exception e) {
-                log.error("用户姓名重置失败,userId[{}],name[{}],err:[{}]", userId, name, e);
+                log.error("用户实名信息重置失败,userId[{}],name[{}],err:[{}]", userId, name, e);
             }
-            return JsonResult.buildErrorStateResult("用户姓名重置失败.", "Error data");
+            return JsonResult.buildErrorStateResult("用户实名信息重置失败.", "Error data");
         } else {
-            return JsonResult.buildErrorStateResult("用户姓名重置失败.", "Error data");
+            return JsonResult.buildErrorStateResult("用户实名信息重置失败.", "Error data");
         }
     }
 
@@ -1356,9 +1358,17 @@ public class InnerController implements IBaseController {
             log.info("手机号有误, phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("用户手机号错误", null);
         }
-        int affectedRows = userDetailService.updateIdCard(name, idNo, phoneNo);
-        log.info("更新用户的信息,name;{},idNo:{},phoneNo:{},操作的理由reason:{},受影响的行数affectedRows:{}", name, idNo, phoneNo, reason, affectedRows);
-        return JsonResult.buildSuccessResult("修改用户身份证号或姓名成功", affectedRows);
+        log.info("重置用户实名信息 phoneNo:{},name:{},idNo:{}", phoneNo, name, idNo);
+        try {
+            int rows = userDetailService.updateNameAndIdCard(name, idNo, phoneNo);
+            log.info("重置用户实名信息,phoneNo:{},name:{},idNo:{},result:[{}],操作的理由reason:{}", phoneNo, name, idNo, rows, reason);
+            if(rows > 0){
+                return JsonResult.buildSuccessResult("用户实名信息已重置.", phoneNo.concat(",").concat(name).concat(",").concat(idNo));
+            }
+        } catch (Exception e) {
+            log.error("用户实名信息重置失败,phoneNo[{}],name[{}],err:[{}]", phoneNo, name, e);
+        }
+        return JsonResult.buildErrorStateResult("用户实名信息重置失败.", "Error data");
     }
 
     /**

src/main/java/cn/quantgroup/xyqb/repository/IUserDetailRepository.java

@@ -49,13 +49,8 @@ public interface IUserDetailRepository extends JpaRepository<UserDetail, Long>,
 
     @Transactional
     @Modifying
-    @Query(value = "update user_detail set id_no=?1,gender=?2 where phone_no=?3", nativeQuery = true)
-    int updateIdNoByPhoneNo(String idNo, int gender, String phoneNo);
-
-    @Transactional
-    @Modifying
-    @Query(value = "update user_detail set name=?1 where phone_no=?2", nativeQuery = true)
-    int updateNameByPhoneNo(String name, String phoneNo);
+    @Query(value = "update user_detail set name=?1,id_no=?2,gender=?3 where phone_no=?4", nativeQuery = true)
+    int updateNameAndIdNoByPhoneNo(String name, String idNo, int gender, String phoneNo);
 
     /**
      * 按照身份证号和手机号 - 模糊查询

src/main/java/cn/quantgroup/xyqb/service/user/IUserDetailService.java

@@ -30,9 +30,7 @@ public interface IUserDetailService {
 
     List<UserDetail> findByIdnos(List<String> idnos);
 
-    Page<UserDetail> getUserDetailsPage(List<Long> userId, List<String> phoneNos, List<String> idNos, int pageNumber, int pageSize,
-
-                                        String sortType);
+    Page<UserDetail> getUserDetailsPage(List<Long> userId, List<String> phoneNos, List<String> idNos, int pageNumber, int pageSize, String sortType);
 
     /**
      * 更新用户的身份证号
@@ -42,7 +40,7 @@ public interface IUserDetailService {
      * @param phoneNo phoneNo
      * @return 受影响的行数
      */
-    int updateIdCard(String name, String idNo, String phoneNo);
+    int updateNameAndIdCard(String name, String idNo, String phoneNo);
 
     List<UserDetail> findByPhones(List<String> phoneNos);
 

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

@@ -196,19 +196,26 @@ public class UserDetailServiceImpl implements IUserDetailService {
     }
 
     @Override
-    public int updateIdCard(String name, String idNo, String phoneNo) {
+    public int updateNameAndIdCard(String name, String idNo, String phoneNo) {
         UserDetail userDetail = userDetailRepository.findByPhoneNo(phoneNo);
         if (null != userDetail) {
+            String newName = userDetail.getName();
+            String newIdNo = userDetail.getIdNo();
+            Gender newGender = Gender.UNKNOWN;
+            if (ValidationUtil.validateChinese(name)) {
+                newName = name;
+            }
             if (StringUtils.isNotBlank(idNo)) {
                 IdCardInfo idCardInfo = idCardService.getIdCardInfo(idNo);
-                if (idCardInfo == null || !idCardInfo.isValid()) {
+                if(Objects.nonNull(idCardInfo) && idCardInfo.isValid()){
+                    newIdNo = idCardInfo.getIdNo();
+                    newGender = idCardInfo.getGender();
+                }else{
                     log.error("用户的身份证错误，phoneNo:{},idNo:{}", phoneNo, idNo);
-                    return 0;
                 }
-                return userDetailRepository.updateIdNoByPhoneNo(idCardInfo.getIdNo(), Optional.ofNullable(idCardInfo.getGender()).orElse(Gender.UNKNOWN).ordinal(), phoneNo);
             }
-            if (StringUtils.isNotBlank(name) && ValidationUtil.validateChinese(name)) {
-                return userDetailRepository.updateNameByPhoneNo(name, phoneNo);
+            if(!Objects.equals(newName, userDetail.getName()) || !Objects.equals(newIdNo, userDetail.getIdNo())){
+                return userDetailRepository.updateNameAndIdNoByPhoneNo(newName, newIdNo, Optional.ofNullable(newGender).orElse(Gender.UNKNOWN).ordinal(), phoneNo);
             }
         }
         return 0;