From 369ada55754aef9e8ec6c6008a495d9ad161e328 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:53 +0800
Subject: [PATCH] 字段

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 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 6dcb6bb..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
@@ -1,5 +1,6 @@
 package com.hz.his.dto.order;
 
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -18,10 +19,13 @@
     private String type;
     /** 鍟嗗搧鍚嶇О */
     private String goodsName;
-    /** 瀹為��鏁� */
+    /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */
     private Integer refundNum;
-    /** 瀹為��閲戦 */
+    /** 瀹為��閲戦 锛堝鎴峰~鍐欙級*/
     private BigDecimal refundMoney;
+    /** 瀹為��鎶垫墸鍊�(绉垎锛屽墠绔牴鎹~鍐欑殑瀹為��閲戦(鎶垫墸閲戦)濉啓鎹㈢畻) */
+    private BigDecimal refundDeductTotal;
+
     /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
     private String remarks;
     /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
@@ -29,5 +33,29 @@
 
     /** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
     private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+    /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+    private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+
+    /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+    /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+    /** 鍙��鎬绘姷鎵g幇閲戦噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
+    /** 鍙��鎬绘姷鎵gН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;
+
+
+
+    /**鍒嗛厤鍙��閲戦*/
+    private List<OrderPayMethodDto> refundPayMethodList;
+
+    /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
+    private BigDecimal averageIntegral = BigDecimal.ZERO;
+    /** 骞虫憡鐨勬姷鎵g幇閲戯紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal averageDeductAmount = BigDecimal.ZERO;
+    /** 骞虫憡鐨勬姷鎵gН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal averageDeductIntegral = BigDecimal.ZERO;
 
 }

--
Gitblit v1.8.0