From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander
---
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java | 7 +++++++
1 files changed, 7 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 c4c0133..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
@@ -30,6 +30,9 @@
/** 閫�娆惧娉� */
private String remarks;
+ /**宸查��鏂瑰紡鐨勯噾棰濓紝涓嶄細鍦–RM鍐嶆墽琛岄��娆撅紝鍙绠楅��娆鹃噾棰濈殑鏁版嵁*/
+ private List<RefundModelVo> refundModelList;
+
/**蹇呭～ 閫�娆剧涓夋柟鏀粯鎬婚噾棰濓紙寰俊/鏀粯瀹濇敮浠�/鍏朵粬锛夛紙鍏冿級 */
private BigDecimal refundAmountTotal;
/**蹇呭～ 閫�娆惧偍鍊奸噾鎬婚噾棰濓紙鍏冿級 */
@@ -38,6 +41,8 @@
private BigDecimal refundIncrement;
/**蹇呭～ 閫�娆炬�荤Н鍒� */
private BigDecimal refundIntegral;
+ /**蹇呭～ 閫�娆炬�绘姷鎵ｇН鍒� */
+ private BigDecimal refundIntegralDeduction;
////鎿嶄綔浜轰俊鎭�
/**蹇呭～ 鎿嶄綔浜虹被鍨� */
@@ -49,5 +54,7 @@
/*鏄惁鏁村崟閫� 0鍚�1鏄� 锛堝洜涓虹Н鍒嗚鍗曠殑鍘熷洜锛屾殏鏃剁粰phis鐢級*/
private Integer isWholeOrder;
+ /*鏄惁鍙栨秷璁㈠崟 0鍚�1鏄�*/
+ private Integer isCancelOrder;
}
--
Gitblit v1.8.0