From 4422f8f156ea35e82761d4cc90491ce29f1b0be4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 24 四月 2024 15:09:31 +0800
Subject: [PATCH] 卡包退款feign
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 4 ++++
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 10 ++++++++++
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 14 ++++++++++++++
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 8 ++++++++
5 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
index d34e59f..db7eaf3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
@@ -14,6 +14,8 @@
//鏀粯鎬婚噾棰� 蹇呭～
private BigDecimal paymentTotal;
+ //鏀粯鎶垫墸閲戦 蹇呭～
+ private BigDecimal paymentDeductionTotal;
// 鏀粯鏂瑰紡缂栧彿 蹇呭～
private String paymentNumberNo;
//鏀粯鏂瑰紡鍚嶇О 蹇呭～
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 053da40..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
@@ -19,6 +19,8 @@
private String payMethodName;
/** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /** 鍙��鏀粯閲戦 -鎶垫墸閲戦*/
+ private BigDecimal payDeductionTotal;
/**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPay;
/**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
@@ -32,6 +34,8 @@
private String refundMethodName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal refundTotal;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰�-鎶垫墸閲戦锛�*/
+ private BigDecimal refundDeductionTotal;
/**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPayRefund;
/**杞崲鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
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
index bcdaa7e..2cbadab 100644
--- 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
@@ -23,9 +23,17 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙�� 鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /** 鍙��绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
/**鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal occupyRefundIntegralCash = 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
index c079fca..4d85381 100644
--- 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
@@ -24,10 +24,20 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇ幇閲戠殑绉垎*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒嗘姷鎵ｇ殑鐜伴噾*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
+
+
/**鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyIntegralDeduction = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎鎶垫墸鐨勯噾棰�*/
+ private BigDecimal occupyIntegralCash = 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
index 5a96e24..28eb8ed 100644
--- 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
@@ -47,14 +47,28 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍙��鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍙��绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
+
/**绯荤粺璁＄畻璧嬪��-鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;
+
/**绯荤粺璁＄畻璧嬪��-閫�娆鹃噾棰�*/
private BigDecimal refundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒�*/
private BigDecimal refundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆炬姷鎵ｇ殑鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal refundIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒嗘姷鎵ｇ殑鐜伴噾*/
+ private BigDecimal refundIntegralCash = BigDecimal.ZERO;
/**鎿嶄綔绫诲瀷-绯荤粺*/
public static final String OP_TYPE_SYSTEM = "system";
--
Gitblit v1.8.0