修改转换方式，增加remark字段

src/main/java/cn/quantgroup/customer/rest/vo/card/XyqbCardRelationResult.java

-package cn.quantgroup.customer.rest.vo.card;
-
-import cn.quantgroup.customer.constant.Constant;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author yangjun
- * @Date 2020/3/9 11:13
- * @Desc
- * @Update
- */
-@Data
-@ToString
-@AllArgsConstructor
-@NoArgsConstructor
-public class XyqbCardRelationResult {
-    private String msg;
-    private String code;
-    private String businessCode;
-    private Boolean success;
-    private List<XyqbCardRelation> data;
-
-    public boolean isSucc() {
-        return Constant.SUCCESS_CODE.equals(this.getCode()) && Objects.nonNull(this.data);
-    }
-}

src/main/java/cn/quantgroup/customer/rest/vo/card/XyqbCardsResult.java

-package cn.quantgroup.customer.rest.vo.card;
-
-import cn.quantgroup.customer.constant.Constant;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author yangjun
- * @Date 2020/3/9 11:13
- * @Desc
- * @Update
- */
-@Data
-@ToString
-@AllArgsConstructor
-@NoArgsConstructor
-public class XyqbCardsResult {
-    private String msg;
-    private String code;
-    private String businessCode;
-    private Boolean success;
-    private List<XyqbCardsInfo> data;
-
-
-    public boolean isSucc() {
-        return Constant.SUCCESS_CODE.equals(this.getCode()) && Objects.nonNull(this.data);
-    }
-}

src/main/java/cn/quantgroup/customer/rest/vo/repay/RepayOptRecord.java

@@ -72,4 +72,9 @@ public class RepayOptRecord {
      * 错误描述
      */
     String errorMsg;
+
+    /**
+     * 备注
+     */
+    String remark;
 }

src/main/java/cn/quantgroup/customer/rest/vo/repay/RepayOptRecordResult.java

-package cn.quantgroup.customer.rest.vo.repay;
-
-import cn.quantgroup.customer.constant.Constant;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author yangjun
- * @Date 2020/3/10 12:35
- * @Desc
- * @Update
- */
-@Data
-@ToString
-@AllArgsConstructor
-@NoArgsConstructor
-public class RepayOptRecordResult {
-    private String msg;
-    private String code;
-    private String businessCode;
-    private Boolean success;
-    private List<RepayOptRecord> data;
-
-    public boolean isSucc() {
-        return Constant.SUCCESS_CODE.equals(this.getCode()) && Objects.nonNull(this.data);
-    }
-}

src/main/java/cn/quantgroup/customer/rest/vo/repay/XyqbRepayInfoResult.java

-package cn.quantgroup.customer.rest.vo.repay;
-
-import cn.quantgroup.customer.constant.Constant;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author yangjun
- * @Date 2020/3/10 13:05
- * @Desc
- * @Update
- */
-@Data
-@ToString
-@AllArgsConstructor
-@NoArgsConstructor
-public class XyqbRepayInfoResult {
-    private String msg;
-    private String code;
-    private String businessCode;
-    private Boolean success;
-    private List<XyqbRepayInfo> data;
-
-    public boolean isSucc() {
-        return Constant.SUCCESS_CODE.equals(this.getCode()) && Objects.nonNull(this.data);
-    }
-}

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

 package cn.quantgroup.customer.service.impl;
 
+import cn.quantgroup.customer.constant.Constant;
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
 import cn.quantgroup.customer.rest.param.card.ModifyCardsQuery;
@@ -8,19 +9,19 @@ import cn.quantgroup.customer.rest.param.card.UnBindCardModel;
 import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.card.CardResult;
-import cn.quantgroup.customer.rest.vo.card.XyqbCardRelationResult;
-import cn.quantgroup.customer.rest.vo.card.XyqbCardsResult;
+import cn.quantgroup.customer.rest.vo.card.XyqbCardRelation;
+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 com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -76,19 +77,20 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        XyqbCardsResult xyqbCardsResult;
+        JsonResult<List<XyqbCardsInfo>> xyqbCardsResult;
         try {
-            xyqbCardsResult = JSONObject.parseObject(cardXyqbStr, XyqbCardsResult.class);
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<XyqbCardsInfo>>>() {
+            }.getType();
+            xyqbCardsResult = Constant.GSON.fromJson(cardXyqbStr, jsonType);
         } catch (Exception e) {
             log.error("[绑卡信息转换异常]", e);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        if (!xyqbCardsResult.isSucc()) {
+        if (!xyqbCardsResult.isSuccess()) {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-
         cardResult.setBindCardInfo(xyqbCardsResult.getData());
         log.info("[查询绑卡信息]，返回 cardResult={}", cardResult);
         return JsonResult.buildSuccessResult("处理成功", cardResult);
@@ -116,20 +118,18 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        XyqbCardRelationResult xyqbCardRelationResult;
+        JsonResult<List<XyqbCardRelation>> xyqbCardRelationResult;
         try {
-            xyqbCardRelationResult = JSONObject.parseObject(cardRelationStr, XyqbCardRelationResult.class);
+            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.isSucc()) {
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
-        }
-
-        log.info("[查询卡关联信息]，返回 data={}", xyqbCardRelationResult.getData());
-        return JsonResult.buildSuccessResult("处理成功", xyqbCardRelationResult.getData());
+        log.info("[查询卡关联信息]，返回 xyqbCardRelationResult={}", xyqbCardRelationResult);
+        return xyqbCardRelationResult;
     }
 
     @Override
@@ -153,20 +153,19 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        JsonResult modifyResult;
+
+        JsonResult<String> modifyResult;
         try {
-            modifyResult = JSONObject.parseObject(unBindCardStr, JsonResult.class);
+            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 (!modifyResult.isSuccess()) {
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
-        }
-
         log.info("[解除绑卡信息]，返回 modifyResult={}", modifyResult);
-        return JsonResult.buildSuccessResult("处理成功", null);
+        return modifyResult;
     }
 
     @Override
@@ -192,20 +191,18 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        JsonResult modifyResult;
+        JsonResult<String> modifyResult;
         try {
-            modifyResult = JSONObject.parseObject(modifyReservePhoneStr, JsonResult.class);
+            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 (!modifyResult.isSuccess()) {
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
-        }
-
         log.info("[修改预留手机号]，返回 modifyResult={}", modifyResult);
-        return JsonResult.buildSuccessResult("处理成功", null);
+        return modifyResult;
     }
 
 

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

 package cn.quantgroup.customer.service.impl;
 
+import cn.quantgroup.customer.constant.Constant;
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.exception.BusinessException;
 import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
@@ -7,23 +8,21 @@ import cn.quantgroup.customer.rest.param.repay.RepayOrderInfoQuery;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderQuery;
 import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
-import cn.quantgroup.customer.rest.vo.card.CardResult;
-import cn.quantgroup.customer.rest.vo.card.XyqbCardRelationResult;
-import cn.quantgroup.customer.rest.vo.card.XyqbCardsResult;
 import cn.quantgroup.customer.rest.vo.repay.RepayInfoResult;
-import cn.quantgroup.customer.rest.vo.repay.RepayOptRecordResult;
-import cn.quantgroup.customer.rest.vo.repay.XyqbRepayInfoResult;
+import cn.quantgroup.customer.rest.vo.repay.RepayOptRecord;
+import cn.quantgroup.customer.rest.vo.repay.XyqbRepayInfo;
 import cn.quantgroup.customer.service.IRepayService;
 import cn.quantgroup.customer.service.IUserService;
 import cn.quantgroup.customer.service.IXyqbService;
 import cn.quantgroup.user.retbean.XUser;
 import cn.quantgroup.user.vo.UserSysResult;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -100,15 +99,17 @@ public class RepayServiceImpl implements IRepayService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        XyqbRepayInfoResult xyqbRepayInfoResult;
+        JsonResult<List<XyqbRepayInfo>> xyqbRepayInfoResult;
         try {
-            xyqbRepayInfoResult = JSONObject.parseObject(repayInfoStr, XyqbRepayInfoResult.class);
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<XyqbRepayInfo>>>() {
+            }.getType();
+            xyqbRepayInfoResult = Constant.GSON.fromJson(repayInfoStr, jsonType);
         } catch (Exception e) {
             log.error("[还款信息转换异常]", e);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        if (!xyqbRepayInfoResult.isSucc()) {
+        if (!xyqbRepayInfoResult.isSuccess()) {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
@@ -134,19 +135,17 @@ public class RepayServiceImpl implements IRepayService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        RepayOptRecordResult repayOptRecordResult;
+        JsonResult<List<RepayOptRecord>> repayOptRecordResult;
         try {
-            repayOptRecordResult = JSONObject.parseObject(optRecordsStr, RepayOptRecordResult.class);
+            Type jsonType = new com.google.gson.reflect.TypeToken<JsonResult<List<RepayOptRecord>>>() {
+            }.getType();
+            repayOptRecordResult = Constant.GSON.fromJson(optRecordsStr, jsonType);
         } catch (Exception e) {
             log.error("[还款操作记录转换异常]", e);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        if (!repayOptRecordResult.isSucc()) {
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
-        }
-
-        log.info("[查询还款操作记录]，返回 data={}", repayOptRecordResult.getData());
-        return JsonResult.buildSuccessResult("处理成功", repayOptRecordResult.getData());
+        log.info("[查询还款操作记录]，返回 repayOptRecordResult={}", repayOptRecordResult);
+        return repayOptRecordResult;
     }
 }