修改绑卡相关接口

src/main/java/cn/quantgroup/customer/service/impl/CardServiceImpl.java

@@ -54,21 +54,23 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult("phoneNo 和 userId 不能同时为空", ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
-        CardResult cardResult = new CardResult();
         UserQueryParam userQueryParam = JSONTools.convert(cardsQuery, UserQueryParam.class);
         JsonResult<UserBasicInfo> userJsonResult = userService.findUserInfo(userQueryParam);
         log.info("{} 查询用户信息 userJsonResult={} ", logPre, userJsonResult);
         if (Objects.isNull(userJsonResult) || !userJsonResult.isSuccess()) {
-            log.error("{} 根据手机号查不到用户信息 phoneNo={},userJsonResult={}", logPre, cardsQuery.getPhoneNo(), userJsonResult);
-            return JsonResult.buildSuccessResult("用户不存在", null);
+            log.error("{} 获取用户信息失败 userQueryParam={},userJsonResult={}", logPre, userQueryParam, userJsonResult);
+            return JsonResult.buildErrorStateResult("获取用户信息失败", ErrorCodeEnum.RETURN_ERROR.getCode());
         }
+        UserBasicInfo userbasicinfo;
+        if (Objects.isNull(userbasicinfo = userJsonResult.getData())) {
+            log.warn("{} 不存在对应用户 userQueryParam={},userJsonResult={}", logPre, userQueryParam, userJsonResult);
+            return JsonResult.buildSuccessResult("不存在对应用户信息", null);
 
-        UserBasicInfo userbasicinfo = userJsonResult.getData();
-        cardResult.setUserInfo(userbasicinfo);
+        }
 
         //发起xyqb查询
         JsonResult<List<XyqbCardsInfo>> xyqbCardInfoResult = xyqbService.queryCardLists(userbasicinfo.getUserId());
-        log.info("{} 信用钱包返回信息 unBindCardResult:{}", logPre, xyqbCardInfoResult);
+        log.info("{} 信用钱包返回信息 xyqbCardInfoResult:{}", logPre, xyqbCardInfoResult);
         if (Objects.isNull(xyqbCardInfoResult)) {
             log.error("{} 返回为空 userId={}", logPre, userbasicinfo.getUserId());
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
@@ -78,6 +80,8 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(xyqbCardInfoResult.getMsg(), xyqbCardInfoResult.getCode());
         }
 
+        CardResult cardResult = new CardResult();
+        cardResult.setUserInfo(userbasicinfo);
         cardResult.setBindCardInfo(xyqbCardInfoResult.getData());
         log.info("{} 返回cardResult={}", logPre, cardResult);
         return JsonResult.buildSuccessResult("处理成功", cardResult);
@@ -106,7 +110,7 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
         if (!xyqbCardRelationResult.isSuccess()) {
-            log.error("{} 信息异常 bankId={},xyqbCardInfoResult={}", logPre, bankId, xyqbCardRelationResult);
+            log.error("{} 信息异常 bankId={},xyqbCardRelationResult={}", logPre, bankId, xyqbCardRelationResult);
             return JsonResult.buildErrorStateResult(xyqbCardRelationResult.getMsg(), xyqbCardRelationResult.getCode());
         }
 
@@ -135,7 +139,7 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
         if (!unBindCardResult.isSuccess()) {
-            log.error("{} 信息异常 unBindCardModel={},unBindCardModel={}", logPre, unBindCardModel, unBindCardResult);
+            log.error("{} 信息异常 unBindCardModel={},unBindCardResult={}", logPre, unBindCardModel, unBindCardResult);
             return JsonResult.buildErrorStateResult(unBindCardResult.getMsg(), unBindCardResult.getCode());
         }