From 9e43ec0bbcd868e45ea6239dd865077f135fc51f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 13 五月 2024 10:25:34 +0800
Subject: [PATCH] 1.dto新增字段
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 6057910..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,6 +1,6 @@
package com.hz.his.dto.order;
-import com.hz.his.dto.order.refund.RefundPaymentMethodVo;
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;
import java.math.BigDecimal;
@@ -19,10 +19,13 @@
private String type;
/** 鍟嗗搧鍚嶇О */
private String goodsName;
- /** 瀹為��鏁� */
+ /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */
private Integer refundNum;
- /** 瀹為��閲戦 */
+ /** 瀹為��閲戦 锛堝鎴峰～鍐欙級*/
private BigDecimal refundMoney;
+ /** 瀹為��鎶垫墸鍊�(绉垎锛屽墠绔牴鎹～鍐欑殑瀹為��閲戦(鎶垫墸閲戦)濉啓鎹㈢畻) */
+ private BigDecimal refundDeductTotal;
+
/** 閫�娆惧師鍥狅紙鍛樺伐锛� */
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
@@ -30,8 +33,29 @@
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
- /**鍒嗛厤鐨勯��娆炬柟寮忛噾棰�-鍐呴儴浼犲弬浣跨敤锛屾帴鍙ｆ殏鏃舵棤鐢�*/
- private List<RefundPaymentMethodVo> distributionPayList;
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ 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