From 17a2faf677cbaa5d2ec1a35cd8111c68eb0b9e75 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 15 十一月 2023 17:41:11 +0800
Subject: [PATCH] Merge branch 'rx-1109-营销优惠券优化' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 993e363..8c63637 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,14 +19,22 @@
private String type;
/** 鍟嗗搧鍚嶇О */
private String goodsName;
- /** 瀹為��鏁� */
+ /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */
private Integer refundNum;
- /** 瀹為��閲戦 */
+ /** 瀹為��閲戦 锛堝鎴峰～鍐欙級*/
private BigDecimal refundMoney;
- /** 瀹為��鍘熷洜 */
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
}
--
Gitblit v1.8.0