Merge branch 'features/qianyi-diting20211219'

src/main/java/cn/quantgroup/customer/model/order/BaitRepayPlan.java

+package cn.quantgroup.customer.model.order;
+
+import cn.quantgroup.customer.util.MoneySerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+@Data
+public class BaitRepayPlan {
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal principle;//应还本金
+
+    private Integer termNo;//期数
+
+    private Integer orderId;//订单id
+
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal interest;//利息
+
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal penaltyInterest;//逾期罚息
+
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal redPacketAmount;//
+
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal collectionReduction;//减免金额
+
+    private Integer repaymentStatus;//还款状态
+
+    private String repaymentStatusDesc;//还款状态描述
+
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal repayAmount;//应还金额
+
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal serviceAmount;//
+
+    private String deadline;//还款期限
+
+    private String repaidAt;//还款时间
+
+}

src/main/java/cn/quantgroup/customer/model/order/BaitRepaymentPlan.java

+package cn.quantgroup.customer.model.order;
+
+import cn.quantgroup.customer.enums.UserRepayType;
+import cn.quantgroup.customer.util.DateUtil;
+import cn.quantgroup.customer.util.MoneySerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class BaitRepaymentPlan {
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 商户号
+     */
+    private Integer merchantId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 订单名称
+     */
+    private String orderName;
+    /**
+     * 订单日期
+     */
+    private String orderTime;
+    /**
+     *订单金额
+     */
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal orderAmount;
+    /**
+     *订单期数
+     */
+    private String repayTermDesc;
+    /**
+     *订单状态
+     */
+    private String statusDesc;
+
+    private List<BaitRepayPlan> baitRepayPlanList;
+
+
+    public static BaitRepaymentPlan valueOf(BaitRepaymentPlanItem repaymentPlanItem) {
+
+        if (repaymentPlanItem == null) {
+            return null;
+        }
+        BaitRepaymentPlan repayment = new BaitRepaymentPlan();
+        repayment.setOrderId(repaymentPlanItem.getOrderId());
+        repayment.setOrderNo(repaymentPlanItem.getOrderNo());
+        repayment.setOrderName(repaymentPlanItem.getOrderName());
+        repayment.setMerchantId(repaymentPlanItem.getMerchantId());
+        repayment.setOrderAmount(repaymentPlanItem.getOrderAmount());
+        repayment.setRepayTermDesc(repaymentPlanItem.getRepayTermDesc());
+        repayment.setStatusDesc(repaymentPlanItem.getStatusDesc());
+        repayment.setOrderTime(repaymentPlanItem.getOrderTime());
+        List<BaitRepayPlan> plans = repaymentPlanItem.getPlans();
+        repayment.setBaitRepayPlanList(plans);
+        return repayment;
+    }
+}

src/main/java/cn/quantgroup/customer/model/order/BaitRepaymentPlanItem.java

+package cn.quantgroup.customer.model.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class BaitRepaymentPlanItem {
+    private Long orderId;
+    private Integer merchantId;
+    private String orderNo;//　订单编号
+    private String orderName;
+    private BigDecimal orderAmount;
+    private Integer repayTerm;
+    private String repayTermDesc;
+    private Integer status;
+    private String statusDesc;
+    private String orderTime;
+    private Integer orderType;
+    private String orderTypeDesc;
+    private List<BaitRepayPlan> plans;
+}

src/main/java/cn/quantgroup/customer/model/order/LoanOrderDetail.java

@@ -19,5 +19,6 @@ public class LoanOrderDetail {
 
     List<Repayment> repaymentList;
 
+    List<BaitRepaymentPlan> baitRepaymentList;
 
 }

src/main/java/cn/quantgroup/customer/model/order/OrderRepayment.java

@@ -77,4 +77,7 @@ public class OrderRepayment {
 
     /** 还款计划 */
     private List<RepaymentPlanItem> repaymentPlans;
+
+    /** 白条还款计划 */
+    private List<BaitRepaymentPlanItem> baitRepaymentPlans;
 }

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

@@ -94,7 +94,7 @@ public class OrderServiceImpl implements IOrderService {
         //JsonResult<LoanOrder> loanOrder = xyqbService.findLoanOrder(loanId);
         //todo 替换中台接口
         JsonResult<LoanOrder> loanOrder = iceService.findLoanOrder(loanId);
-
+        log.info("{} 提现详情 loanOrder={}", loanOrder);
         if (!loanOrder.isSuccess()) {
             log.error("{} 提现订单查询失败 loanId={}, result={}", logPre, loanId, loanOrder);
             return JsonResult.buildErrorStateResult(loanOrder.getMsg(), loanOrder.getData());
@@ -105,7 +105,10 @@ public class OrderServiceImpl implements IOrderService {
         LoanOrder loanOrderData = loanOrder.getData();
         loanOrderDetail.setLoanOrder(loanOrderData);
         loanOrderDetail.setRepaymentList(repaymentList);
-
+        //add by wuq 2021-12-30 begin
+        List<BaitRepaymentPlan> baitRepaymentList = new ArrayList<>();
+        loanOrderDetail.setBaitRepaymentList(baitRepaymentList);
+        //add by wuq 2021-12-30 end
         if (Objects.isNull(loanOrderData) || !loanOrderData.getShowPlans()) {
             log.info("{} 不需查询还款计划", logPre);
             return JsonResult.buildSuccessResult("查询成功", loanOrderDetail);
@@ -125,6 +128,14 @@ public class OrderServiceImpl implements IOrderService {
             repaymentPlans.forEach(e -> repaymentList.add(Repayment.valueOf(e)));
         }
 
+        //add by wuq 2021-12-30 begin
+        if(orderRepaymentJsonResult.getData() != null){
+            List<BaitRepaymentPlanItem> baitRepaymentPlans = orderRepaymentJsonResult.getData().getBaitRepaymentPlans();
+            if(baitRepaymentPlans !=null && !baitRepaymentPlans.isEmpty()){
+                baitRepaymentPlans.forEach(e -> baitRepaymentList.add(BaitRepaymentPlan.valueOf(e)));
+            }
+        }
+        //add by wuq 2021-12-30 end
         return JsonResult.buildSuccessResult("查询成功", loanOrderDetail);
     }