From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 bb27487..42858ef 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
@@ -26,8 +28,15 @@
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
- /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
- /** 鍙��鎬婚噾棰�*/
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+
+ /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
+ private BigDecimal averageIntegral = BigDecimal.ZERO;
}
--
Gitblit v1.8.0