Merge remote-tracking branch 'origin/login' into login

# Conflicts:
#	src/main/java/cn/quantgroup/customer/service/impl/XyqbServiceImpl.java

src/main/java/cn/quantgroup/customer/rest/RepayRest.java

 package cn.quantgroup.customer.rest;
 
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
+import cn.quantgroup.customer.rest.param.card.ModifyCardsQuery;
+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.service.IRepayService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 import static cn.quantgroup.customer.constant.Constant.GSON;
 
 @Slf4j
@@ -36,4 +42,28 @@ public class RepayRest {
         String response = repayService.findRepayOrders(repayOrderQuery);
         return GSON.fromJson(response, JsonResult.class);
     }
+
+    /**
+     * 还款信息
+     *
+     * @param repayOrderQuery
+     * @return
+     */
+    @GetMapping("/info")
+    public JsonResult queryRepayInfo(@Valid RepayOrderInfoQuery repayOrderQuery) {
+        log.info("[查询还款信息],请求参数:repayOrderQuery={}", repayOrderQuery);
+        return repayService.queryRepayInfo(repayOrderQuery);
+    }
+
+    /**
+     * 查询还款操作记录
+     *
+     * @param businessFlowNo
+     * @return
+     */
+    @GetMapping("/oplog/{businessFlowNo}")
+    public JsonResult queryRepayOptRecords(@PathVariable String businessFlowNo) {
+        log.info("[查询还款操作记录],请求参数:businessFlowNo={}", businessFlowNo);
+        return repayService.queryRepayOptRecords(businessFlowNo);
+    }
 }

src/main/java/cn/quantgroup/customer/rest/param/repay/RepayOrderInfoQuery.java

+package cn.quantgroup.customer.rest.param.repay;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author yangjun
+ * @Date 2020/3/10 12:20
+ * @Desc
+ * @Update
+ */
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class RepayOrderInfoQuery {
+    @NotNull(message = "借款订单号不能为空")
+    private Long loanId;
+    private Integer termNo;
+}

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

+package cn.quantgroup.customer.rest.vo.repay;
+
+import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author yangjun
+ * @Date 2020/3/10 13:11
+ * @Desc
+ * @Update
+ */
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class RepayInfoResult {
+    private List<XyqbRepayInfo> repaymentList;
+    private UserBasicInfo userInfo;
+}

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

+package cn.quantgroup.customer.rest.vo.repay;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @author yangjun
+ * @Date 2020/3/10 12:36
+ * @Desc
+ * @Update
+ */
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class RepayOptRecord {
+    /**
+     * 操作时间
+     */
+
+    String operationTime;
+
+    /**
+     * 操作类型
+     * TODO
+     */
+    Integer type;
+
+    /**
+     * 操作类型描述
+     */
+    String typeDesc;
+
+    /**
+     * 业务类型 0：提现，1：还款，2 绑卡
+     */
+    Integer optionType;
+
+    /**
+     * 支付渠道名称
+     */
+    String payApproachName;
+
+    /**
+     * 商编号
+     */
+    String accountNo;
+
+    /**
+     * 卡号
+     */
+    String cardNo;
+
+    /**
+     * 预留手机号
+     */
+    String phoneNo;
+
+    /**
+     * 0：失败， 1：成功，2：超时
+     */
+    Integer status;
+
+    /**
+     * 短信发送方式
+     */
+    String sendSms;
+
+    /**
+     * 错误描述
+     */
+    String errorMsg;
+}

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/XyqbRepayInfo.java

+package cn.quantgroup.customer.rest.vo.repay;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yangjun
+ * @Date 2020/3/10 13:04
+ * @Desc
+ * @Update
+ */
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class XyqbRepayInfo {
+    private String repayType;
+    private Long loanId;
+    private Integer termNo;
+    private BigDecimal repayAmount;
+    private String applyRepaidAt;
+    private String repayStatus;
+    private String paymentNo;
+    private String remark;
+    private String businessFlowNo;
+}

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/IRepayService.java

 package cn.quantgroup.customer.service;
 
+import cn.quantgroup.customer.rest.param.repay.RepayOrderInfoQuery;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderQuery;
+import cn.quantgroup.customer.rest.vo.JsonResult;
 
 public interface IRepayService {
     String findRepayOrders(RepayOrderQuery repayOrderQuery);
+
+    JsonResult queryRepayInfo(RepayOrderInfoQuery repayOrderQuery);
+
+    JsonResult queryRepayOptRecords(String businessFlowNo);
 }

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

@@ -4,6 +4,7 @@ import cn.quantgroup.customer.model.order.FlowNode;
 import cn.quantgroup.customer.rest.param.card.ModifyReservePhone;
 import cn.quantgroup.customer.rest.param.card.UnBindCardModel;
 import cn.quantgroup.customer.rest.param.applyorder.ApplyOrderQuery;
+import cn.quantgroup.customer.rest.param.repay.RepayOrderInfoQuery;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 
@@ -42,4 +43,8 @@ public interface IXyqbService {
     String unBindCardRelation(UnBindCardModel unBindCardModel);
 
     String modifyReservePhone(ModifyReservePhone modifyReservePhone);
+
+    String queryRepayInfo(RepayOrderInfoQuery repayOrderQuery);
+
+    String queryRepayOptRecords(String businessFlowNo);
 }

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

@@ -57,8 +57,8 @@ public class CardServiceImpl implements ICardService {
             UserCombinationParam userCombinationParam = new UserCombinationParam();
             userCombinationParam.setPhoneNo(cardsQuery.getPhoneNo());
             JsonResult userJsonResult = userService.findUserInfo(userCombinationParam);
-            if(Objects.isNull(userJsonResult)
-                    || !userJsonResult.isSuccess()){
+            if (Objects.isNull(userJsonResult)
+                    || !userJsonResult.isSuccess()) {
                 log.error("根据手机号查不到用户信息");
                 return JsonResult.buildErrorStateResult("根据手机号查不到用户信息", ErrorCodeEnum.PARAM_ERROR.getCode());
             }
@@ -76,7 +76,7 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        XyqbCardsResult xyqbCardsResult = null;
+        XyqbCardsResult xyqbCardsResult;
         try {
             xyqbCardsResult = JSONObject.parseObject(cardXyqbStr, XyqbCardsResult.class);
         } catch (Exception e) {
@@ -116,7 +116,7 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        XyqbCardRelationResult xyqbCardRelationResult = null;
+        XyqbCardRelationResult xyqbCardRelationResult;
         try {
             xyqbCardRelationResult = JSONObject.parseObject(cardRelationStr, XyqbCardRelationResult.class);
         } catch (Exception e) {
@@ -149,12 +149,24 @@ public class CardServiceImpl implements ICardService {
         String unBindCardStr = xyqbService.unBindCardRelation(unBindCardModel);
         log.info("[解除绑卡信息],unBindCardStr={}", unBindCardStr);
         if (StringUtils.isBlank(unBindCardStr)) {
-            log.error("[查询xyqb返回绑卡信息],返回结果为null");
+            log.error("[解除绑卡信息],返回结果为null");
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+        JsonResult modifyResult;
+        try {
+            modifyResult = JSONObject.parseObject(unBindCardStr, JsonResult.class);
+        } 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("[解除绑卡信息]，返回 cardResult={}", 123);
-        return JsonResult.buildSuccessResult("处理成功", "");
+        log.info("[解除绑卡信息]，返回 modifyResult={}", modifyResult);
+        return JsonResult.buildSuccessResult("处理成功", null);
     }
 
     @Override
@@ -180,8 +192,20 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        log.info("[修改预留手机号]，返回 cardResult={}", 123);
-        return JsonResult.buildSuccessResult("处理成功", "");
+        JsonResult modifyResult;
+        try {
+            modifyResult = JSONObject.parseObject(modifyReservePhoneStr, JsonResult.class);
+        } 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);
     }
 
 

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

@@ -2,17 +2,30 @@ package cn.quantgroup.customer.service.impl;
 
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.exception.BusinessException;
+import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
+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.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.util.Objects;
+
 @Slf4j
 @Service("repayService")
 public class RepayServiceImpl implements IRepayService {
@@ -47,4 +60,93 @@ public class RepayServiceImpl implements IRepayService {
 
         return xyqbService.findRepayOrders(repayOrderQuery);
     }
+
+    @Override
+    public JsonResult queryRepayInfo(RepayOrderInfoQuery repayOrderQuery) {
+        // 参数校验
+        if (Objects.isNull(repayOrderQuery)) {
+            log.error("查询还款信息,请求参数 repayOrderQuery 为空");
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
+        }
+
+
+        if (Objects.isNull(repayOrderQuery.getLoanId())) {
+            log.error("查询还款信息,请求参数 loanId 不能为空");
+            return JsonResult.buildErrorStateResult("借款订单号不能为空", ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+        Long loanId = repayOrderQuery.getLoanId();
+        RepayInfoResult repayInfoResult = new RepayInfoResult();
+
+        // 处理用户信息
+        UserCombinationParam userCombinationParam = new UserCombinationParam();
+        userCombinationParam.setLoanId(loanId);
+        JsonResult userJsonResult = userService.findUserInfo(userCombinationParam);
+        if (Objects.isNull(userJsonResult)
+                || !userJsonResult.isSuccess()) {
+            log.error("根据loanId查不到用户信息");
+            return JsonResult.buildErrorStateResult("该笔借款申请号查询不到用户信息", ErrorCodeEnum.PARAM_ERROR.getCode());
+        }
+
+        UserBasicInfo userbasicinfo = (UserBasicInfo) userJsonResult.getData();
+        repayInfoResult.setUserInfo(userbasicinfo);
+
+
+        //处理还款信息
+        String repayInfoStr = xyqbService.queryRepayInfo(repayOrderQuery);
+        log.info("[查询xyqb返回还款信息],repayInfoStr={}", repayInfoStr);
+        if (StringUtils.isBlank(repayInfoStr)) {
+            log.error("[查询xyqb返回还款信息],返回结果为null");
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+        XyqbRepayInfoResult xyqbRepayInfoResult;
+        try {
+            xyqbRepayInfoResult = JSONObject.parseObject(repayInfoStr, XyqbRepayInfoResult.class);
+        } catch (Exception e) {
+            log.error("[还款信息转换异常]", e);
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+        if (!xyqbRepayInfoResult.isSucc()) {
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+
+        repayInfoResult.setRepaymentList(xyqbRepayInfoResult.getData());
+        log.info("[查询还款信息]，返回 repayInfoResult={}", repayInfoResult);
+        return JsonResult.buildSuccessResult("处理成功", repayInfoResult);
+    }
+
+    @Override
+    public JsonResult queryRepayOptRecords(String businessFlowNo) {
+        log.info("[查询还款操作记录][queryRepayOptRecords],请求参数:businessFlowNo={}", businessFlowNo);
+        if (StringUtils.isBlank(businessFlowNo)) {
+            log.error("查询还款操作记录,流水号为空");
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
+        }
+
+        //发起xyqb查询
+        String optRecordsStr = xyqbService.queryRepayOptRecords(businessFlowNo);
+        log.info("[查询xyqb还款操作记录],optRecordsStr={}", optRecordsStr);
+        if (StringUtils.isBlank(optRecordsStr)) {
+            log.error("[查询xyqb还款操作记录],返回结果为null");
+            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+        RepayOptRecordResult repayOptRecordResult;
+        try {
+            repayOptRecordResult = JSONObject.parseObject(optRecordsStr, RepayOptRecordResult.class);
+        } 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());
+    }
 }

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

@@ -5,6 +5,7 @@ import cn.quantgroup.customer.model.order.FlowNode;
 import cn.quantgroup.customer.rest.param.applyorder.ApplyOrderQuery;
 import cn.quantgroup.customer.rest.param.card.ModifyReservePhone;
 import cn.quantgroup.customer.rest.param.card.UnBindCardModel;
+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.service.IXyqbService;
@@ -60,8 +61,8 @@ public class XyqbServiceImpl implements IXyqbService {
 
     @Override
     public JsonResult<List<ApplyOrder>> findApplyOrders(ApplyOrderQuery applyOrderQuery) {
-        String logPre="XyqbServiceImpl.findApplyOrders";
-        log.info("{} 申请订单查询 applyOrderQuery={}",logPre,applyOrderQuery);
+        String logPre = "XyqbServiceImpl.findApplyOrders";
+        log.info("{} 申请订单查询 applyOrderQuery={}", logPre, applyOrderQuery);
         String orderNo = applyOrderQuery.getOrderNo();
         Long loanId = applyOrderQuery.getLoanId();
         Long userId = applyOrderQuery.getUserId();
@@ -78,14 +79,14 @@ public class XyqbServiceImpl implements IXyqbService {
         }
         Map<String, String> header = Maps.newHashMap();
         header.put("Content-type", "application/x-www-form-urlencoded");
-        JsonResult jsonResult = httpService.post(url, header,param, JsonResult.class);
-        if(Objects.isNull(jsonResult) || jsonResult.isSuccess()){
-            log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}",logPre,url, header,param,jsonResult);
-            return JsonResult.buildErrorStateResult("申请订单查询失败",null);
+        JsonResult jsonResult = httpService.post(url, header, param, JsonResult.class);
+        if (Objects.isNull(jsonResult) || jsonResult.isSuccess()) {
+            log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}", logPre, url, header, param, jsonResult);
+            return JsonResult.buildErrorStateResult("申请订单查询失败", null);
         }
         List<ApplyOrder> applyOrderList = new ArrayList<>();
         List list = (List) jsonResult.getData();
-        list.forEach(e ->{
+        list.forEach(e -> {
             ApplyOrder applyOrder = GSON.fromJson(e.toString(), ApplyOrder.class);
             applyOrderList.add(applyOrder);
         });
@@ -99,15 +100,15 @@ public class XyqbServiceImpl implements IXyqbService {
         log.info("{} 流程日志查询 orderNo={}",logPre,orderNo);
         String url = xyqbSysUrl + "/ex/inside/customer_sys/query/applyOrder";
         if (StringUtils.isEmpty(orderNo)) {
-            log.error("{} 申请订单号为空 orderNo={}",logPre,orderNo);
-            return JsonResult.buildErrorStateResult("申请订单号为空",null);
+            log.error("{} 申请订单号为空 orderNo={}", logPre, orderNo);
+            return JsonResult.buildErrorStateResult("申请订单号为空", null);
         }
         Map<String, Object> param = Maps.newHashMap();
         param.put("orderNo", orderNo);
 
         Map<String, String> header = Maps.newHashMap();
         header.put("Content-type", "application/x-www-form-urlencoded");
-        JsonResult jsonResult = httpService.post(url, header,param, JsonResult.class);
+        JsonResult jsonResult = httpService.post(url, header, param, JsonResult.class);
 
         if(Objects.isNull(jsonResult) || !jsonResult.isSuccess()){
             log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}",logPre,url, header,param,jsonResult);
@@ -126,23 +127,23 @@ public class XyqbServiceImpl implements IXyqbService {
 
     @Override
     public JsonResult findLoanDetail(Long loanId) {
-        String logPre="XyqbServiceImpl.findLoanDetail";
-        log.info("{} 提现订单详情 loanId={}",logPre,loanId);
+        String logPre = "XyqbServiceImpl.findLoanDetail";
+        log.info("{} 提现订单详情 loanId={}", logPre, loanId);
         String url = xyqbSysUrl + "/ex/inside/customer_sys/loan/detail";
         if (Objects.isNull(loanId)) {
-            log.error("{} 借款订单号为空 orderNo={}",logPre,loanId);
-            return JsonResult.buildErrorStateResult("借款订单号为空",null);
+            log.error("{} 借款订单号为空 orderNo={}", logPre, loanId);
+            return JsonResult.buildErrorStateResult("借款订单号为空", null);
         }
         Map<String, Object> param = Maps.newHashMap();
         param.put("loanId", loanId);
 
         Map<String, String> header = Maps.newHashMap();
         header.put("Content-type", "application/x-www-form-urlencoded");
-        JsonResult jsonResult = httpService.post(url, header,param, JsonResult.class);
+        JsonResult jsonResult = httpService.post(url, header, param, JsonResult.class);
 
-        if(Objects.isNull(jsonResult) || jsonResult.isSuccess()){
-            log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}",logPre,url, header,param,jsonResult);
-            return JsonResult.buildErrorStateResult("提现订单详情查询失败",null);
+        if (Objects.isNull(jsonResult) || jsonResult.isSuccess()) {
+            log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}", logPre, url, header, param, jsonResult);
+            return JsonResult.buildErrorStateResult("提现订单详情查询失败", null);
         }
         //data数据结构 LoanOrderDetail
         return jsonResult;
@@ -238,5 +239,44 @@ public class XyqbServiceImpl implements IXyqbService {
         return response;
     }
 
+    @Override
+    public String queryRepayInfo(RepayOrderInfoQuery repayOrderQuery) {
+        String url = xyqbSysUrl + "/ex/inside/customer_sys/query/repayment";
+        Map<String, Object> param = new HashMap<>(4);
+        Long loanId = repayOrderQuery.getLoanId();
+        Integer termNo = repayOrderQuery.getTermNo();
+        if (Objects.nonNull(loanId)) {
+            param.put("loanId", loanId);
+        }
+        if (Objects.nonNull(termNo)) {
+            param.put("termNo", termNo);
+        }
 
+        String response = null;
+        try {
+            response = httpService.post(url, param);
+            log.info("[queryRepayInfo] param:{},请求业务系统返回值:{}", param, response);
+        } catch (Exception e) {
+            log.error("[queryRepayInfo] param:{},请求业务系统异常:{}", param, e);
+        }
+        return response;
+    }
+
+    @Override
+    public String queryRepayOptRecords(String businessFlowNo) {
+        String url = xyqbSysUrl + "/ex/inside/customer_sys/repayment/detail";
+        Map<String, Object> param = new HashMap<>(4);
+        if (StringUtils.isNotBlank(businessFlowNo)) {
+            param.put("businessFlowNo", businessFlowNo);
+        }
+
+        String response = null;
+        try {
+            response = httpService.post(url, param);
+            log.info("[queryRepayOptRecords] param:{},请求业务系统返回值:{}", param, response);
+        } catch (Exception e) {
+            log.error("[queryRepayOptRecords] param:{},请求业务系统异常:{}", param, e);
+        }
+        return response;
+    }
 }