修改新橙还款计划mock

src/main/java/cn/qg/holmes/entity/xincheng/CashOrder.java

-package cn.qg.holmes.entity.xincheng;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class CashOrder {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-    private String orderNo;
-    private BigDecimal monthlyRate;
-    private BigDecimal amount;
-    private BigDecimal term;
-    private Date orderDate;
-}

src/main/java/cn/qg/holmes/entity/xincheng/RepaymentVo.java

@@ -6,22 +6,22 @@ import java.math.BigDecimal;
 
 @Data
 public class RepaymentVo {
-    private BigDecimal serviceFee;
-    private BigDecimal overdueFee;
+    private Double serviceFee;
+    private Double overdueFee;
     private String orderNo;
-    private BigDecimal repayPrincipal;
-    private BigDecimal alreadyRepayInterest;
-    private BigDecimal otherFee;
-    private BigDecimal alreadyRepayPrincipal;
-    private BigDecimal repayAmount;
-    private BigDecimal alreadyOverdueFee;
-    private BigDecimal alreadyServiceFee;
-    private String dueTime;
-    private String canRepayTime;
-    private BigDecimal alreadyOtherFee;
-    private String successTime;
+    private Double repayPrincipal;
+    private Double alreadyRepayInterest;
+    private Double otherFee;
+    private Double alreadyRepayPrincipal;
+    private Double repayAmount;
+    private Double alreadyOverdueFee;
+    private Double alreadyServiceFee;
+    private Long dueTime;
+    private Long canRepayTime;
+    private Double alreadyOtherFee;
+    private Long successTime;
     private Integer overdueDay;
     private Integer termNo;
-    private BigDecimal repayInterest;
-    private String statusCode;
+    private Double repayInterest;
+    private Integer statusCode;
 }

src/main/java/cn/qg/holmes/interceptor/XinchengInterceptor.java

@@ -39,7 +39,7 @@ public class XinchengInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception{
         String uri = request.getRequestURI();
-        log.info("收到新橙2{} 接口请求", uri);
+        log.info("收到新橙2 {} 接口请求", uri);
 //        Map<String, String[]> parameterMap = request.getParameterMap();
         Map<String, String> parameterMap = getParamsMapFromReader(request);
         QueryWrapper<Mock> mockQueryWrapper = new QueryWrapper<>();
@@ -122,16 +122,12 @@ public class XinchengInterceptor implements HandlerInterceptor {
 
     /**
      * 生成还款计划
-     * @param orderNo
-     * @param contractLoanAmount
-     * @param contractTerm
-     * @param createRepaymentAt
-     * @return
      */
-    public static List<RepaymentVo> getRepaymentPlanList(String orderNo, String contractLoanAmount, String contractTerm, Date createRepaymentAt) {
+    public static List<RepaymentVo> getRepaymentPlanList(String orderNo, String contractLoanAmount, String contractTerm, Date createRepaymentAt) throws Exception {
         List<RepaymentVo> repaymentVoList =  new ArrayList<>();
         SimpleDateFormat  simpleDateFormat  = new SimpleDateFormat("yyyy-MM-dd");
         String createDateStr = simpleDateFormat.format(createRepaymentAt);
+        // 请求mo-trade还款计划的参数
         Map<String, String> params = new HashMap<>();
         params.put("fundCorpProductId", "100053");
         params.put("stage", "0");
@@ -146,14 +142,27 @@ public class XinchengInterceptor implements HandlerInterceptor {
             repaymentVo.setOrderNo(orderNo);
             repaymentVo.setTermNo((Integer) map.get("term"));
             Map<String, Object> subjectMap = JSON.parseObject(JSON.toJSONString(map.get("subject")), Map.class);
-            repaymentVo.setRepayPrincipal((BigDecimal) subjectMap.get("principal"));
-            repaymentVo.setRepayInterest((BigDecimal) subjectMap.get("interest"));
-            repaymentVo.setServiceFee((BigDecimal) subjectMap.get("guarantee"));
+            repaymentVo.setRepayPrincipal((Double) subjectMap.get("principal"));
+            repaymentVo.setRepayInterest((Double) subjectMap.get("interest"));
+            repaymentVo.setServiceFee((Double) subjectMap.get("guarantee"));
+            repaymentVo.setOtherFee(0.00);
+            repaymentVo.setAlreadyRepayPrincipal(0.00);
+            repaymentVo.setAlreadyRepayInterest(0.00);
+            repaymentVo.setAlreadyServiceFee(0.00);
+            repaymentVo.setAlreadyOverdueFee(0.00);
+            repaymentVo.setAlreadyOtherFee(0.00);
+            repaymentVo.setCanRepayTime(simpleDateFormat.parse(subjectMap.get("deadline").toString()).getTime());
+            repaymentVo.setDueTime(simpleDateFormat.parse(subjectMap.get("deadline").toString()).getTime());
+            repaymentVo.setOrderNo(orderNo);
+            repaymentVo.setStatusCode(1);
+            repaymentVo.setOverdueDay(0);
         }
         return repaymentVoList;
     }
 
-    // 生成还款试算
+    /**
+     * 还款试算
+     */
     public static Map<String, Object> getLoanCaculatorResult(String amount, String term) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         SimpleDateFormat  simpleDateFormat  = new SimpleDateFormat("yyyy-MM-dd");

src/main/java/cn/qg/holmes/interceptor/YeebaoInterceptor.java

@@ -40,6 +40,7 @@ public class YeebaoInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
         String uri = request.getRequestURI();
+        log.info("收到易宝 {} 接口请求", uri);
         Map<String, String[]> parameterMap = request.getParameterMap();
         QueryWrapper<Mock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("url", uri);