From bceee99e4493c359e2c0872e4076d3db95718b71 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index 400e7dd..0a6dd75 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -1,8 +1,10 @@
package com.hz.his.dto.order;
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @Author
@@ -21,6 +23,32 @@
private Integer refundNum;
/** 瀹為��閲戦 */
private BigDecimal refundMoney;
- /** 瀹為��鍘熷洜 */
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ 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