From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
new file mode 100644
index 0000000..5a96e24
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
@@ -0,0 +1,66 @@
+package com.hz.his.vo.order.refund.card;
+
+
+import com.hz.his.vo.order.refund.RefundMethodVo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗¢」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭�
+ * @author CJH
+ */
+@Data
+public class RefundUserCardVo {
+
+    /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+    private String userCardId;
+    /** 鐢ㄦ埛鍗″寘鍚嶇О */
+    private String userCardName;
+
+    /** 鍗¢」鏉冪泭 */
+    private List<RefundUserCardEquityVo> refundUserCardEquityVoList;
+    /**鏀粯鏂瑰紡*/
+    private List<RefundMethodVo> payMethodVos;
+    /**閫�娆炬敮浠樻柟寮�*/
+    private List<RefundMethodVo> refundMethodVos;
+    /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+    private String remarks;
+    /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+    private String refundReason;
+
+    /**鎿嶄綔浜虹被鍨嬶紝榛樿鍛樺伐*/
+    private String  opType = OP_TYPE_STAFF;
+    /**鎿嶄綔鍛樺伐鏍囪瘑*/
+    private String staffId;
+    /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+    private String staffRoleId;
+    /**鎿嶄綔骞冲彴-鏍囧織*/
+    private String appId;
+    /**鎿嶄綔骞冲彴-鍟嗘埛鑷畾涔夌紪鐮�*/
+    private String appIdCode;
+    /**鎿嶄綔骞冲彴-鍚嶇О*/
+    private String appIdName;
+
+    //-----鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻
+    /**绯荤粺璁$畻璧嬪��-鍙��鎬婚噾棰�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+    /**绯荤粺璁$畻璧嬪��-鍙��鎬荤Н鍒�*/
+    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+    /**绯荤粺璁$畻璧嬪��-鍒嗛厤閲戦*/
+    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+    /**绯荤粺璁$畻璧嬪��-鍒嗛厤绉垎*/
+    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+    /**绯荤粺璁$畻璧嬪��-閫�娆鹃噾棰�*/
+    private BigDecimal refundTotal = BigDecimal.ZERO;
+    /**绯荤粺璁$畻璧嬪��-閫�娆剧Н鍒�*/
+    private BigDecimal refundIntegral = BigDecimal.ZERO;
+
+    /**鎿嶄綔绫诲瀷-绯荤粺*/
+    public static final String OP_TYPE_SYSTEM = "system";
+    /**鎿嶄綔绫诲瀷-鐢ㄦ埛*/
+    public static final String OP_TYPE_USER = "user";
+    /**鎿嶄綔绫诲瀷-鍛樺伐*/
+    public static final String OP_TYPE_STAFF = "staff";
+
+}

--
Gitblit v1.8.0