From bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 23 十一月 2022 19:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 26 ++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 0 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 f3d7783..993e363 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
@@ -3,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author wzh
@@ -13,6 +14,10 @@
/** 瀛愯鍗昳d */
private String orderItemId;
+ /** 瀛愯鍗曠被鍨� */
+ private String type;
+ /** 鍟嗗搧鍚嶇О */
+ private String goodsName;
/** 瀹為��鏁� */
private Integer refundNum;
/** 瀹為��閲戦 */
@@ -20,4 +25,7 @@
/** 瀹為��鍘熷洜 */
private String refundReason;
+ /** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
+ private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+
}
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
new file mode 100644
index 0000000..400e7dd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author
+ * 璁㈠崟缁撹处鎵╁睍 浜岀骇瀛愯鍗�
+ */
+@Data
+public class OrderItemSourceRefundDto {
+
+ /** 瀛愯鍗昳d */
+ private String orderItemSonId;
+ /** 瀛愯鍗曠被鍨� */
+ private String type;
+ /** 鍟嗗搧鍚嶇О */
+ private String goodsName;
+ /** 瀹為��鏁� */
+ private Integer refundNum;
+ /** 瀹為��閲戦 */
+ private BigDecimal refundMoney;
+ /** 瀹為��鍘熷洜 */
+ private String refundReason;
+}
--
Gitblit v1.8.0