From 0de596b5fce6a1ae1d33adb8015f4c8b07c65c11 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 14 六月 2023 19:18:03 +0800
Subject: [PATCH] 卡项退款-提交

---
 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardItemVo.java |   29 ++++++++++++++
 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardVo.java     |   32 ++++++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java             |    2 +
 3 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 1e89f21..e05dee0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -40,6 +40,8 @@
     //////绯荤粺鍙傛暟
     /** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */
     private BigDecimal totalAmount;
+    /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */
+    private BigDecimal totalIntegral;
     /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
     private BigDecimal refundTotal;
     /** 鍙��娆炬柟寮忛泦鍚� */
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardItemVo.java
new file mode 100644
index 0000000..4288f30
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardItemVo.java
@@ -0,0 +1,29 @@
+package com.hz.his.vo.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鍗¢」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-瀛愪俊鎭�
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardItemVo {
+
+    /** 鐢ㄦ埛鍗″寘鍗¢」鏉$洰鏍囪瘑 */
+    private String cardItemInfoId;
+    /** 鐢ㄦ埛鍗″寘鍗¢」鏉$洰鍚嶇О */
+    private String cardItemInfoName;
+    /**閫�娆炬暟閲忥紙鎶垫墸娆℃暟锛�*/
+    private Integer refundQuantity;
+
+    /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+    private String remarks;
+    /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+    private String refundReason;
+
+    ///---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻
+    /** 鍙��鎬婚噾棰�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardVo.java
new file mode 100644
index 0000000..2aada57
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardVo.java
@@ -0,0 +1,32 @@
+package com.hz.his.vo.order.refund;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗¢」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭�
+ *
+ */
+@Data
+public class RefundUserCardVo {
+
+    /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+    private String userCardId;
+    /** 鐢ㄦ埛鍗″寘鍚嶇О */
+    private String userCardName;
+
+    /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+    private String remarks;
+    /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+    private String refundReason;
+
+    /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻
+    /** 鍙��鎬婚噾棰�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+
+    /** 鍗¢」鏉$洰 */
+    private List<RefundUserCardItemVo> refundUserCardItemVoList;
+
+}

--
Gitblit v1.8.0