From 2a28984276e51d5f6635f3ae62b982b30c442bfd Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 17 五月 2024 14:40:06 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
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 4b23d21..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
@@ -16,16 +16,28 @@
private String cardItemInfoName;
/**閫�娆炬暟閲忥紙鎶垫墸娆℃暟锛�*/
private Integer refundQuantity;
+ /**鏄惁鏈�鍚庣殑鎶垫墸娆℃暟*/
+ private boolean lastNum = false;
//---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
/** 鍙��鎬婚噾棰�*/
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;
}
--
Gitblit v1.8.0