From c1107fe385312f9a7b1d9d84c06aaf54e01440fa Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期二, 14 五月 2024 15:27:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java | 4 ++++
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
index 32fa863..561dc8f 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
@@ -41,6 +41,8 @@
private BigDecimal refundIncrement;
/**蹇呭～ 閫�娆炬�荤Н鍒� */
private BigDecimal refundIntegral;
+ /**蹇呭～ 閫�娆炬�绘姷鎵ｇН鍒� */
+ private BigDecimal refundIntegralDeduction;
////鎿嶄綔浜轰俊鎭�
/**蹇呭～ 鎿嶄綔浜虹被鍨� */
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
index 2543ad8..9910c22 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
@@ -17,6 +17,8 @@
private String thirdPartyNo;
/***宸查��娆炬�婚噾棰�***/
private BigDecimal refundTotal = BigDecimal.ZERO;
+ /***宸查��娆炬�绘姷鎵ｉ噾棰�***/
+ private BigDecimal refundDeductionTotal = BigDecimal.ZERO;
/**********閫�娆剧被鍨�************/
/**閫�娆剧被鍨嬬被鍨�-寰俊*/
@@ -31,5 +33,7 @@
public static final int REFUND_TYPE_INCREMENT = 6;
/**閫�娆剧被鍨嬬被鍨�--his鐨勯��娆炬柟寮忥紙鎵�鏈夋柟寮忎唬琛級*/
public static final int REFUND_TYPE_HIS = 7;
+ /**閫�娆剧被鍨嬬被鍨�--鎶垫墸绉垎*/
+ public static final int REFUND_TYPE_INTEGRAL_CASH = 8;
}
--
Gitblit v1.8.0