修改绑卡相关接口

src/main/java/cn/quantgroup/customer/service/ICardService.java

@@ -4,6 +4,10 @@ import cn.quantgroup.customer.rest.param.card.ModifyCardsQuery;
 import cn.quantgroup.customer.rest.param.card.ModifyReservePhone;
 import cn.quantgroup.customer.rest.param.card.UnBindCardModel;
 import cn.quantgroup.customer.rest.vo.JsonResult;
+import cn.quantgroup.customer.rest.vo.card.CardResult;
+import cn.quantgroup.customer.rest.vo.card.XyqbCardRelation;
+
+import java.util.List;
 
 /**
  * @author yangjun
@@ -11,11 +15,31 @@ import cn.quantgroup.customer.rest.vo.JsonResult;
  * @Desc 银行卡相关
  */
 public interface ICardService {
-    JsonResult queryCardLists(ModifyCardsQuery cardsQuery);
+    /**
+     * 查询绑卡信息
+     * @param cardsQuery
+     * @return
+     */
+    JsonResult<CardResult> queryCardLists(ModifyCardsQuery cardsQuery);
 
-    JsonResult queryCardRelation(Long bankId);
+    /**
+     * 查询卡关联信息
+     * @param bankId
+     * @return
+     */
+    JsonResult<List<XyqbCardRelation>> queryCardRelation(Long bankId);
 
-    JsonResult unBindCardRelation(UnBindCardModel unBindCardModel);
+    /**
+     * 解绑
+     * @param unBindCardModel
+     * @return
+     */
+    JsonResult<String> unBindCardRelation(UnBindCardModel unBindCardModel);
 
-    JsonResult modifyReservePhone(ModifyReservePhone modifyReservePhone);
+    /**
+     * 修改用户预留手机号
+     * @param modifyReservePhone
+     * @return
+     */
+    JsonResult<String> modifyReservePhone(ModifyReservePhone modifyReservePhone);
 }

src/main/java/cn/quantgroup/customer/service/IXyqbService.java

@@ -8,6 +8,8 @@ import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderInfoQuery;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
+import cn.quantgroup.customer.rest.vo.card.XyqbCardRelation;
+import cn.quantgroup.customer.rest.vo.card.XyqbCardsInfo;
 
 import java.util.List;
 
@@ -44,13 +46,33 @@ public interface IXyqbService {
      */
     JsonResult<OrderRepayment> repaymentPlanQuery(Long loanId);
 
-    String queryCardLists(Long userId);
+    /**
+     * 查询信用钱包返回用户绑卡列表信息
+     * @param userId
+     * @return
+     */
+    JsonResult<List<XyqbCardsInfo>> queryCardLists(Long userId);
 
-    String queryCardRelation(Long bankId);
+    /**
+     * 查询信用钱包卡关联信息
+     * @param bankId
+     * @return
+     */
+    JsonResult<List<XyqbCardRelation>> queryCardRelation(Long bankId);
 
-    String unBindCardRelation(UnBindCardModel unBindCardModel);
+    /**
+     * 卡解绑
+     * @param unBindCardModel
+     * @return
+     */
+    JsonResult<String> unBindCardRelation(UnBindCardModel unBindCardModel);
 
-    String modifyReservePhone(ModifyReservePhone modifyReservePhone);
+    /**
+     * 修改预留手机号
+     * @param modifyReservePhone
+     * @return
+     */
+    JsonResult<String> modifyReservePhone(ModifyReservePhone modifyReservePhone);
 
     String queryRepayInfo(RepayOrderInfoQuery repayOrderQuery);
 

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

@@ -15,8 +15,10 @@ import cn.quantgroup.customer.rest.vo.card.XyqbCardsInfo;
 import cn.quantgroup.customer.service.ICardService;
 import cn.quantgroup.customer.service.IUserService;
 import cn.quantgroup.customer.service.IXyqbService;
+import cn.quantgroup.customer.util.JSONTools;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,59 +42,44 @@ public class CardServiceImpl implements ICardService {
 
 
     @Override
-    public JsonResult queryCardLists(ModifyCardsQuery cardsQuery) {
+    public JsonResult<CardResult> queryCardLists(ModifyCardsQuery cardsQuery) {
+        final String logPre = "[queryCardLists] 查询用户绑卡信息";
         if (Objects.isNull(cardsQuery)) {
-            log.error("请求参数 cardsQuery 为空");
+            log.error("{} 请求参数 cardsQuery 为空", logPre);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
-
         if (StringUtils.isBlank(cardsQuery.getPhoneNo()) && Objects.isNull(cardsQuery.getUserId())) {
-            log.error("请求参数 phoneNo 和 userId 不能同时为空");
-            return JsonResult.buildErrorStateResult("phoneNo 和 userId 不能同时为空", ErrorCodeEnum.RETURN_ERROR.getCode());
+            log.error("{} 请求参数 phoneNo 和 userId 同时为空 cardsQuery={}", logPre, cardsQuery);
+            return JsonResult.buildErrorStateResult("phoneNo 和 userId 不能同时为空", ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
-        Long userId = cardsQuery.getUserId();
         CardResult cardResult = new CardResult();
-        if (Objects.isNull(userId)) {
-            UserQueryParam userQueryParam = new UserQueryParam();
-            userQueryParam.setPhoneNo(cardsQuery.getPhoneNo());
-            JsonResult userJsonResult = userService.findUserInfo(userQueryParam);
-            if (Objects.isNull(userJsonResult)
-                    || !userJsonResult.isSuccess()) {
-                log.error("根据手机号查不到用户信息");
-                return JsonResult.buildErrorStateResult("根据手机号查不到用户信息", ErrorCodeEnum.PARAM_ERROR.getCode());
-            }
-
-            UserBasicInfo userbasicinfo = (UserBasicInfo) userJsonResult.getData();
-            cardResult.setUserInfo(userbasicinfo);
-            userId = userbasicinfo.getUserId();
+        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);
         }
 
-        //发起xyqb查询
-        String cardXyqbStr = xyqbService.queryCardLists(userId);
-        log.info("[查询xyqb返回绑卡信息],cardXyqbStr={}", cardXyqbStr);
-        if (StringUtils.isBlank(cardXyqbStr)) {
-            log.error("[查询xyqb返回绑卡信息],返回结果为null");
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
-        }
+        UserBasicInfo userbasicinfo = userJsonResult.getData();
+        cardResult.setUserInfo(userbasicinfo);
 
-        JsonResult<List<XyqbCardsInfo>> xyqbCardsResult;
-        try {
-            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<XyqbCardsInfo>>>() {
-            }.getType();
-            xyqbCardsResult = Constant.GSON.fromJson(cardXyqbStr, jsonType);
-        } catch (Exception e) {
-            log.error("[绑卡信息转换异常]", e);
+        //发起xyqb查询
+        JsonResult<List<XyqbCardsInfo>> xyqbCardInfoResult = xyqbService.queryCardLists(userbasicinfo.getUserId());
+        log.info("{} 信用钱包返回信息 unBindCardResult:{}", logPre, xyqbCardInfoResult);
+        if (Objects.isNull(xyqbCardInfoResult)) {
+            log.error("{} 返回为空 userId={}", logPre, userbasicinfo.getUserId());
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-
-        if (!xyqbCardsResult.isSuccess()) {
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        if (!xyqbCardInfoResult.isSuccess()) {
+            log.error("{} 信息异常 userId={},xyqbCardInfoResult={}", logPre, userbasicinfo.getUserId(), xyqbCardInfoResult);
+            return JsonResult.buildErrorStateResult(xyqbCardInfoResult.getMsg(), xyqbCardInfoResult.getCode());
         }
 
-        cardResult.setBindCardInfo(xyqbCardsResult.getData());
-        log.info("[查询绑卡信息]，返回 cardResult={}", cardResult);
+        cardResult.setBindCardInfo(xyqbCardInfoResult.getData());
+        log.info("{} 返回cardResult={}", logPre, cardResult);
         return JsonResult.buildSuccessResult("处理成功", cardResult);
     }
 
@@ -104,74 +91,63 @@ public class CardServiceImpl implements ICardService {
      * @return
      */
     @Override
-    public JsonResult queryCardRelation(Long bankId) {
+    public JsonResult<List<XyqbCardRelation>> queryCardRelation(Long bankId) {
+        final String logPre = "[queryCardRelation] 查询卡关联信息";
         if (Objects.isNull(bankId)) {
-            log.error("请求参数 bankId 为空");
+            log.error("{} 请求参数 bankId 为空", logPre);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
         //发起xyqb查询
-        String cardRelationStr = xyqbService.queryCardRelation(bankId);
-        log.info("[查询xyqb返回卡关联信息],cardRelationStr={}", cardRelationStr);
-        if (StringUtils.isBlank(cardRelationStr)) {
-            log.error("[查询xyqb返回卡关联信息],返回结果为null");
+        JsonResult<List<XyqbCardRelation>> xyqbCardRelationResult = xyqbService.queryCardRelation(bankId);
+        log.info("{} 信用钱包返回信息 xyqbCardRelationResult:{}", logPre, xyqbCardRelationResult);
+        if (Objects.isNull(xyqbCardRelationResult)) {
+            log.error("{} 返回为空 bankId={}", logPre, bankId);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-
-        JsonResult<List<XyqbCardRelation>> xyqbCardRelationResult;
-        try {
-            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<XyqbCardRelation>>>() {
-            }.getType();
-            xyqbCardRelationResult = Constant.GSON.fromJson(cardRelationStr, jsonType);
-        } catch (Exception e) {
-            log.error("[卡关联信息转换异常]", e);
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        if (!xyqbCardRelationResult.isSuccess()) {
+            log.error("{} 信息异常 bankId={},xyqbCardInfoResult={}", logPre, bankId, xyqbCardRelationResult);
+            return JsonResult.buildErrorStateResult(xyqbCardRelationResult.getMsg(), xyqbCardRelationResult.getCode());
         }
 
-        log.info("[查询卡关联信息]，返回 xyqbCardRelationResult={}", xyqbCardRelationResult);
-        return xyqbCardRelationResult;
+        return JsonResult.buildSuccessResult("处理成功", xyqbCardRelationResult.getData());
     }
 
     @Override
-    public JsonResult unBindCardRelation(UnBindCardModel unBindCardModel) {
+    public JsonResult<String> unBindCardRelation(UnBindCardModel unBindCardModel) {
+        final String logPre = "[unBindCardRelation] 解除绑卡";
+
         if (Objects.isNull(unBindCardModel)) {
-            log.error("请求参数 unBindCardModel 为空");
+            log.error("{} 请求参数 unBindCardModel 为空", logPre);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
-
         if (Objects.isNull(unBindCardModel.getBindCardRecordId()) || Objects.isNull(unBindCardModel.getUserId())) {
-            log.error("请求参数 bindCardRecordId 和 userId 不能为空");
-            return JsonResult.buildErrorStateResult("bindCardRecordId 和 userId 不能为空", ErrorCodeEnum.RETURN_ERROR.getCode());
+            log.error("{} 请求参数 bindCardRecordId 和 userId 为空 unBindCardModel:{}", logPre, unBindCardModel);
+            return JsonResult.buildErrorStateResult("请求参数 bindCardRecordId 和 userId 不能为空", ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
         //发起xyqb查询
-        String unBindCardStr = xyqbService.unBindCardRelation(unBindCardModel);
-        log.info("[解除绑卡信息],unBindCardStr={}", unBindCardStr);
-        if (StringUtils.isBlank(unBindCardStr)) {
-            log.error("[解除绑卡信息],返回结果为null");
+        JsonResult<String> unBindCardResult = xyqbService.unBindCardRelation(unBindCardModel);
+        log.info("{} 信用钱包返回信息 unBindCardResult:{}", logPre, unBindCardResult);
+        if (Objects.isNull(unBindCardResult)) {
+            log.error("{} 返回为空 unBindCardModel={}", logPre, unBindCardModel);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-
-
-        JsonResult<String> modifyResult;
-        try {
-            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<String>>() {
-            }.getType();
-            modifyResult = Constant.GSON.fromJson(unBindCardStr, jsonType);
-        } catch (Exception e) {
-            log.error("[解除绑卡信息转换异常]", e);
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        if (!unBindCardResult.isSuccess()) {
+            log.error("{} 信息异常 unBindCardModel={},unBindCardModel={}", logPre, unBindCardModel, unBindCardResult);
+            return JsonResult.buildErrorStateResult(unBindCardResult.getMsg(), unBindCardResult.getCode());
         }
 
-        log.info("[解除绑卡信息]，返回 modifyResult={}", modifyResult);
-        return modifyResult;
+        return JsonResult.buildSuccessResult("处理成功", unBindCardResult.getData());
     }
 
     @Override
-    public JsonResult modifyReservePhone(ModifyReservePhone modifyReservePhone) {
+    public JsonResult<String> modifyReservePhone(ModifyReservePhone modifyReservePhone) {
+        final String logPre = "[modifyReservePhone] 修改预留手机号";
+
         if (Objects.isNull(modifyReservePhone)) {
-            log.error("请求参数 modifyReservePhone 为空");
+            log.error("{} 请求参数 modifyReservePhone 为空", logPre);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
@@ -179,30 +155,23 @@ public class CardServiceImpl implements ICardService {
         if (Objects.isNull(modifyReservePhone.getBankId())
                 || Objects.isNull(modifyReservePhone.getUserId())
                 || StringUtils.isBlank(modifyReservePhone.getPhoneNo())) {
-            log.error("请求参数 bankId,userId,phoneNo 都不能为空");
-            return JsonResult.buildErrorStateResult("bankId,userId,phoneNo 不能为空", ErrorCodeEnum.RETURN_ERROR.getCode());
+            log.error("{} 请求参数 bankId,userId,phoneNo 为空 modifyReservePhone:{}", logPre, modifyReservePhone);
+            return JsonResult.buildErrorStateResult("请求参数 cbankId,userId,phoneNo 不能为空", ErrorCodeEnum.PARAM_ERROR.getCode());
         }
 
         //发起xyqb查询
-        String modifyReservePhoneStr = xyqbService.modifyReservePhone(modifyReservePhone);
-        log.info("[调用xyqb，修改预留手机号],modifyReservePhoneStr={}", modifyReservePhoneStr);
-        if (StringUtils.isBlank(modifyReservePhoneStr)) {
-            log.error("[调用xyqb，修改预留手机号],返回结果为null");
+        JsonResult<String> modifyReservePhoneResult = xyqbService.modifyReservePhone(modifyReservePhone);
+        log.info("{} 信用钱包返回信息 modifyReservePhoneResult:{}", logPre, modifyReservePhoneResult);
+        if (Objects.isNull(modifyReservePhoneResult)) {
+            log.error("{} 返回为空 modifyReservePhone={}", logPre, modifyReservePhone);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-
-        JsonResult<String> modifyResult;
-        try {
-            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<String>>() {
-            }.getType();
-            modifyResult = Constant.GSON.fromJson(modifyReservePhoneStr, jsonType);
-        } catch (Exception e) {
-            log.error("[修改预留手机号结果转换异常]", e);
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        if (!modifyReservePhoneResult.isSuccess()) {
+            log.error("{} 信息异常 modifyReservePhone={},modifyReservePhoneResult={}", logPre, modifyReservePhone, modifyReservePhoneResult);
+            return JsonResult.buildErrorStateResult(modifyReservePhoneResult.getMsg(), modifyReservePhoneResult.getCode());
         }
 
-        log.info("[修改预留手机号]，返回 modifyResult={}", modifyResult);
-        return modifyResult;
+        return JsonResult.buildSuccessResult("处理成功", modifyReservePhoneResult.getData());
     }
 
 

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

 package cn.quantgroup.customer.service.impl;
 
+import cn.quantgroup.customer.constant.Constant;
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.model.order.*;
 import cn.quantgroup.customer.rest.param.applyorder.ApplyOrderQuery;
@@ -9,6 +10,8 @@ import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderInfoQuery;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
+import cn.quantgroup.customer.rest.vo.card.XyqbCardRelation;
+import cn.quantgroup.customer.rest.vo.card.XyqbCardsInfo;
 import cn.quantgroup.customer.service.IXyqbService;
 import cn.quantgroup.customer.service.http.IHttpService;
 import cn.quantgroup.customer.util.JSONTools;
@@ -17,10 +20,12 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -194,7 +199,8 @@ public class XyqbServiceImpl implements IXyqbService {
      * @return
      */
     @Override
-    public String queryCardLists(Long userId) {
+    public JsonResult<List<XyqbCardsInfo>> queryCardLists(Long userId) {
+        final String logPre = "XyqbServiceImpl.queryCardLists 查询信用钱包用户绑卡信息";
         String url = xyqbSysUrl + "/ex/customer_sys/query/bankcard";
         Map<String, Object> param = new HashMap<>(4);
         if (Objects.nonNull(userId)) {
@@ -203,15 +209,24 @@ public class XyqbServiceImpl implements IXyqbService {
         String response = null;
         try {
             response = httpService.post(url, param);
-            log.info("[queryCardLists] param:{},请求业务系统返回值:{}", param, response);
+            log.info("{} response={}", logPre, response);
+            if (StringUtils.isBlank(response)) {
+                log.error("{} 返回结果为null", logPre);
+                return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+            }
+
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<XyqbCardsInfo>>>() {
+            }.getType();
+            return Constant.GSON.fromJson(response, jsonType);
         } catch (Exception e) {
-            log.error("[queryCardLists] param:{},请求业务系统异常:{}", param, e);
+            log.error("{} 处理失败 param:{},response:{},异常信息:{}", logPre, param, response, ExceptionUtils.getStackTrace(e));
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-        return response;
     }
 
     @Override
-    public String queryCardRelation(Long bankId) {
+    public JsonResult<List<XyqbCardRelation>> queryCardRelation(Long bankId) {
+        final String logPre = "XyqbServiceImpl.queryCardRelation 查询信用钱包卡关联信息";
         String url = xyqbSysUrl + "/ex/customer_sys/query/cardrelation";
         Map<String, Object> param = new HashMap<>(4);
         if (Objects.nonNull(bankId)) {
@@ -221,60 +236,67 @@ public class XyqbServiceImpl implements IXyqbService {
         String response = null;
         try {
             response = httpService.post(url, param);
-            log.info("[queryCardRelation] param:{},请求业务系统返回值:{}", param, response);
+            log.info("{} response={}", logPre, response);
+            if (StringUtils.isBlank(response)) {
+                log.error("{} 返回结果为null", logPre);
+                return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+            }
+
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<XyqbCardRelation>>>() {
+            }.getType();
+            return Constant.GSON.fromJson(response, jsonType);
         } catch (Exception e) {
-            log.error("[queryCardRelation] param:{},请求业务系统异常:{}", param, e);
+            log.error("{} 处理失败 param:{},response:{}, 异常信息:{}", logPre, param, response, ExceptionUtils.getStackTrace(e));
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-        return response;
     }
 
     @Override
-    public String unBindCardRelation(UnBindCardModel unBindCardModel) {
+    public JsonResult<String> unBindCardRelation(UnBindCardModel unBindCardModel) {
+        final String logPre = "XyqbServiceImpl.unBindCardRelation 银行卡解绑";
         String url = xyqbSysUrl + "/ex/customer_sys/unbundle/relation";
-        Map<String, Object> param = new HashMap<>(4);
-        Long userId = unBindCardModel.getUserId();
-        Long bindCardRecordId = unBindCardModel.getBindCardRecordId();
-        if (Objects.nonNull(bindCardRecordId)) {
-            param.put("bindCardRecordId", bindCardRecordId);
-        }
-        if (Objects.nonNull(userId)) {
-            param.put("userId", userId);
-        }
+        Map<String, Object> param = JSONTools.toMap(unBindCardModel);
+
         String response = null;
         try {
             response = httpService.post(url, param);
-            log.info("[unBindCardRelation] param:{},请求业务系统返回值:{}", param, response);
+            log.info("{} response={}", logPre, response);
+            if (StringUtils.isBlank(response)) {
+                log.error("{} 返回结果为null", logPre);
+                return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+            }
+
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<String>>() {
+            }.getType();
+            return Constant.GSON.fromJson(response, jsonType);
         } catch (Exception e) {
-            log.error("[unBindCardRelation] param:{},请求业务系统异常:{}", param, e);
+            log.error("{} 处理失败 param:{},response:{}, 异常信息:{}", logPre, param, response, ExceptionUtils.getStackTrace(e));
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-        return response;
     }
 
     @Override
-    public String modifyReservePhone(ModifyReservePhone modifyReservePhone) {
+    public JsonResult<String> modifyReservePhone(ModifyReservePhone modifyReservePhone) {
+        final String logPre = "XyqbServiceImpl.modifyReservePhone 修改预留手机号";
         String url = xyqbSysUrl + "/ex/customer_sys/modify/reservedphone";
-        Map<String, Object> param = new HashMap<>(8);
-        Long userId = modifyReservePhone.getUserId();
-        Long bankId = modifyReservePhone.getBankId();
-        String phoneNo = modifyReservePhone.getPhoneNo();
-        if (Objects.nonNull(bankId)) {
-            param.put("bankId", bankId);
-        }
-        if (Objects.nonNull(userId)) {
-            param.put("userId", userId);
-        }
-        if (StringUtils.isNotBlank(phoneNo)) {
-            param.put("phoneNo", phoneNo);
-        }
+        Map<String, Object> param = JSONTools.toMap(modifyReservePhone);
 
         String response = null;
         try {
             response = httpService.post(url, param);
-            log.info("[modifyReservePhone] param:{},请求业务系统返回值:{}", param, response);
+            log.info("{} response={}", logPre, response);
+            if (StringUtils.isBlank(response)) {
+                log.error("{} 返回结果为null", logPre);
+                return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+            }
+
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<String>>() {
+            }.getType();
+            return Constant.GSON.fromJson(response, jsonType);
         } catch (Exception e) {
-            log.error("[modifyReservePhone] param:{},请求业务系统异常:{}", param, e);
+            log.error("{} 处理失败 param:{},response:{}, 异常信息:{}", logPre, param, response, ExceptionUtils.getStackTrace(e));
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
-        return response;
     }
 
     @Override
@@ -313,7 +335,7 @@ public class XyqbServiceImpl implements IXyqbService {
             response = httpService.post(url, param);
             log.info("[queryRepayOptRecords] param:{},请求业务系统返回值:{}", param, response);
         } catch (Exception e) {
-            log.error("[queryRepayOptRecords] param:{},请求业务系统异常:{}", param, e);
+            log.error("[queryRepayOptRecords] param:{},请求业务系统异常:{}", param, ExceptionUtils.getStackTrace(e));
         }
         return response;
     }