From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index a8c19b5..d74177a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -23,6 +23,9 @@
private Integer refundNum;
/** 瀹為��閲戦 锛堝鎴峰～鍐欙級*/
private BigDecimal refundMoney;
+ /** 瀹為��鎶垫墸鍊�(绉垎锛屽墠绔牴鎹～鍐欑殑瀹為��閲戦(鎶垫墸閲戦)濉啓鎹㈢畻) */
+ private BigDecimal refundDeductTotal;
+
/** 閫�娆惧師鍥狅紙鍛樺伐锛� */
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
@@ -38,8 +41,21 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇ幇閲戦噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;
+
+
+
+ /**鍒嗛厤鍙��閲戦*/
+ private List<OrderPayMethodDto> refundPayMethodList;
/** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
private BigDecimal averageIntegral = BigDecimal.ZERO;
+ /** 骞虫憡鐨勬姷鎵ｇ幇閲戯紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal averageDeductAmount = BigDecimal.ZERO;
+ /** 骞虫憡鐨勬姷鎵ｇН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal averageDeductIntegral = BigDecimal.ZERO;
}
--
Gitblit v1.8.0