挂账接口

cash-common/cash-common-service/src/main/java/com/czg/order/entity/CreditBuyer.java

@@ -76,4 +76,14 @@ public class CreditBuyer implements Serializable {
      * 删除标志 0-正常 1-删除
      */
     private Integer isDel;
+    /**
+     * 还款提醒日  最大28
+     */
+    private Integer expireRemindDay;
+    /**
+     * 还款提醒  提醒多久以前的数据 暂定单位 月
+     */
+    private Integer expireRemind;
+
+
 }

cash-common/cash-common-service/src/main/java/com/czg/order/entity/CreditBuyerOrder.java

@@ -36,10 +36,18 @@ public class CreditBuyerOrder implements Serializable {
      * 挂账人编码
      */
     private String creditBuyerId;
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderAmount;
     /**
      * 已付金额
      */
     private BigDecimal paidAmount;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
     /**
      * 状态 unpaid-未付款 partial-部分支付 paid-已付款
      */

cash-common/cash-common-service/src/main/java/com/czg/order/service/CreditBuyerOrderService.java

@@ -3,6 +3,7 @@ package com.czg.order.service;
 import com.czg.order.dto.CreditBuyerOrderDTO;
 import com.czg.order.entity.CreditBuyerOrder;
 import com.czg.order.entity.CreditPaymentRecord;
+import com.czg.order.entity.OrderInfo;
 import com.czg.order.param.CreditBuyerOrderQueryParam;
 import com.czg.order.vo.CreditBuyerOrderSummaryVo;
 import com.mybatisflex.core.paginate.Page;
@@ -46,17 +47,7 @@ public interface CreditBuyerOrderService extends IService<CreditBuyerOrder> {
      * @param creditBuyerId 挂账人id
      * @param orderId       订单id
      */
-    boolean save(String creditBuyerId, Long orderId);
-
-    /**
-     * 挂账人退款(整单退款)
-     *
-     * @param creditBuyerId 挂账人id
-     * @param orderId       订单id
-     * @return
-     */
-    @Deprecated
-    boolean refund(String creditBuyerId, Long orderId);
+    boolean save(OrderInfo orderInfo, String creditBuyerId, Long orderId);
 
 
     /**
@@ -67,6 +58,6 @@ public interface CreditBuyerOrderService extends IService<CreditBuyerOrder> {
      * @param refundAmount  退款金额
      * @return
      */
-    boolean partRefund(String creditBuyerId, Long orderId, BigDecimal refundAmount);
+    boolean partRefund(String creditBuyerId, Long orderId, String orderNo, BigDecimal refundAmount);
 
 }

cash-common/cash-common-service/src/main/java/com/czg/order/service/CreditBuyerService.java

@@ -17,11 +17,10 @@ import com.mybatisflex.core.service.IService;
 public interface CreditBuyerService extends IService<CreditBuyer> {
     Page<CreditBuyerDTO> getCreditBuyerPage(CreditBuyerQueryParam param);
 
-    CreditBuyerDTO getCreditBuyerById(String id);
 
-    void addCreditBuyer(CreditBuyerDTO dto);
+    void addCreditBuyer(CreditBuyer dto);
 
-    void updateCreditBuyer(CreditBuyerDTO dto);
+    void updateCreditBuyer(CreditBuyer dto);
 
     void deleteCreditBuyer(String id);
 

cash-common/cash-common-service/src/main/java/com/czg/order/vo/CreditBuyerRepaymentVo.java

@@ -25,14 +25,14 @@ public class CreditBuyerRepaymentVo implements Serializable {
      * 还款金额
      */
     private BigDecimal repaymentAmount;
-    /**
-     * 支付欠款
-     */
-    private BigDecimal payAmount;
-    /**
-     * 转存金额
-     */
-    private BigDecimal rechargeAmount;
+//    /**
+//     * 支付欠款
+//     */
+//    private BigDecimal payAmount;
+//    /**
+//     * 转存金额
+//     */
+//    private BigDecimal rechargeAmount;
     /**
      * 还款反馈消息
      */