From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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
index 9da7033..7bf4128 100644
--- 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
@@ -11,22 +11,34 @@
@Data
public class RefundMethodVo {
+ /** 鍙��鏀粯鏂瑰紡鏍囪瘑 */
+ private String payMethodId;
/** 鍙��鏀粯鏂瑰紡缂栫爜 */
private String payMethodNo;
/** 鍙��鏀粯鏂瑰紡鍚嶇О */
private String payMethodName;
/** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /** 鍙��鏀粯閲戦 -鎶垫墸閲戦*/
+ private BigDecimal payDeductionTotal;
/**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPay;
/**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
private Integer isExecute;
+ /** 杞崲鏂瑰紡鏍囪瘑 锛堝疄闄呴��娆炬柟寮忔爣璇嗭級*/
+ private String refundMethodId;
/** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
- private String refundNumberNo;
+ private String refundMethodNo;
/** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
- private String refundNumberName;
+ private String refundMethodName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal refundTotal;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰�-鎶垫墸閲戦锛�*/
+ private BigDecimal refundDeductionTotal;
+ /**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPayRefund;
+ /**杞崲鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecuteRefund;
}
--
Gitblit v1.8.0