From cf3ca4fe6e55c6cf5ed72897a56c6b061cdb1632 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期二, 20 六月 2023 18:10:32 +0800 Subject: [PATCH] 卡项退款-提交 --- /dev/null | 32 ---------- phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 32 ++++++++++ phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 31 ++++++++++ phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 43 ++++++++++++++ phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 31 ++++++++++ 5 files changed, 137 insertions(+), 32 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java new file mode 100644 index 0000000..9da7033 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java @@ -0,0 +1,32 @@ +package com.hz.his.vo.order.refund; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author CJH + * 閫�鍥炴敮浠樿褰曟墿灞� + */ +@Data +public class RefundMethodVo { + + /** 鍙��鏀粯鏂瑰紡缂栫爜 */ + private String payMethodNo; + /** 鍙��鏀粯鏂瑰紡鍚嶇О */ + private String payMethodName; + /** 鍙��鏀粯閲戦 */ + private BigDecimal payTotal; + /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/ + private Integer isMoneyPay; + /**鏄惁鍒掓墸璁$畻锛�0鍚�1鏄�*/ + private Integer isExecute; + + /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/ + private String refundNumberNo; + /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/ + private String refundNumberName; + /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/ + 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 deleted file mode 100644 index 4288f30..0000000 --- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardItemVo.java +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 2aada57..0000000 --- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundUserCardVo.java +++ /dev/null @@ -1,32 +0,0 @@ -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; - -} diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java new file mode 100644 index 0000000..bcdaa7e --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java @@ -0,0 +1,31 @@ +package com.hz.his.vo.order.refund.card; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/**鍗¢」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉冪泭 + * @author CJH + * */ +@Data +public class RefundUserCardEquityVo { + + /** 鐢ㄦ埛鍗″寘鍗¢」鏉$洰鏍囪瘑 */ + private String cardEquityId; + /** 鐢ㄦ埛鍗″寘鍗¢」鏉$洰鍚嶇О */ + private String cardEquityName; + /** 閫�娆惧崱椤规潯鐩� */ + private List<RefundUserCardItemVo> refundUserCardItemVoList; + + //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻 + /** 鍙��鎬婚噾棰�*/ + private BigDecimal approveRefundTotal = BigDecimal.ZERO; + /** 鍙��鎬荤Н鍒�*/ + private BigDecimal approveRefundIntegral = BigDecimal.ZERO; + /**鍒嗛厤閲戦*/ + private BigDecimal occupyRefundTotal = BigDecimal.ZERO; + /**鍒嗛厤绉垎*/ + private BigDecimal occupyRefundIntegral = BigDecimal.ZERO; + +} diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java new file mode 100644 index 0000000..4b23d21 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java @@ -0,0 +1,31 @@ +package com.hz.his.vo.order.refund.card; + +import lombok.Data; + +import java.math.BigDecimal; + +/**鍗¢」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉$洰 + * @author CJH + * */ +@Data +public class RefundUserCardItemVo { + + /** 鐢ㄦ埛鍗″寘鍗¢」鏉$洰鏍囪瘑 */ + private String cardItemInfoId; + /** 鐢ㄦ埛鍗″寘鍗¢」鏉$洰鍚嶇О */ + private String cardItemInfoName; + /**閫�娆炬暟閲忥紙鎶垫墸娆℃暟锛�*/ + private Integer refundQuantity; + + //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻 + /** 鍙��鎬婚噾棰�*/ + private BigDecimal approveRefundTotal = BigDecimal.ZERO; + /** 鍙��鎬荤Н鍒�*/ + private BigDecimal approveRefundIntegral = BigDecimal.ZERO; + /**鍒嗛厤閲戦*/ + private BigDecimal occupyRefundTotal = BigDecimal.ZERO; + /**鍒嗛厤绉垎*/ + private BigDecimal occupyRefundIntegral = BigDecimal.ZERO; + + +} 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..313f37c --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java @@ -0,0 +1,43 @@ +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; + +/**鍗¢」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭� + * + */ +@Data +public class RefundUserCardVo { + + /** 鐢ㄦ埛鍗″寘鏍囪瘑 */ + private String userCardId; + /** 鐢ㄦ埛鍗″寘鍚嶇О */ + private String userCardName; + + /** 閫�娆惧師鍥狅紙鍛樺伐锛� */ + private String remarks; + /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ + private String refundReason; + + /** 鍗¢」鏉冪泭 */ + private List<RefundUserCardEquityVo> refundUserCardEquityVoList; + /**鏀粯鏂瑰紡*/ + private List<RefundMethodVo> payMethodVos; + /**閫�娆炬敮浠樻柟寮�*/ + private List<RefundMethodVo> refundMethodVos; + + //-----鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻 + /** 鍙��鎬婚噾棰�*/ + private BigDecimal approveRefundTotal = BigDecimal.ZERO; + /** 鍙��鎬荤Н鍒�*/ + private BigDecimal approveRefundIntegral = BigDecimal.ZERO; + /**鍒嗛厤閲戦*/ + private BigDecimal occupyRefundTotal = BigDecimal.ZERO; + /**鍒嗛厤绉垎*/ + private BigDecimal occupyRefundIntegral = BigDecimal.ZERO; + +} -- Gitblit v1.8.0