From b02003b95ac0c709efa582baf643242bbaeec9a7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 29 四月 2024 17:14:47 +0800
Subject: [PATCH] 子单分配抵扣金额优先计算
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 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
index ab500f3..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
@@ -8,7 +8,7 @@
import java.util.List;
/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭�
- *
+ * @author CJH
*/
@Data
public class RefundUserCardVo {
@@ -18,30 +18,63 @@
/** 鐢ㄦ埛鍗″寘鍚嶇О */
private String userCardName;
- /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
- private String remarks;
- /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
- private String refundReason;
-
/** 鍗￠」鏉冪泭 */
private List<RefundUserCardEquityVo> refundUserCardEquityVoList;
/**鏀粯鏂瑰紡*/
private List<RefundMethodVo> payMethodVos;
/**閫�娆炬敮浠樻柟寮�*/
private List<RefundMethodVo> refundMethodVos;
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
- //-----鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
- /** 鍙��鎬婚噾棰�*/
- private BigDecimal approveRefundTotal = BigDecimal.ZERO;
- /** 鍙��鎬荤Н鍒�*/
- private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
- /**鍒嗛厤閲戦*/
- private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
- /**鍒嗛厤绉垎*/
- private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
-
+ /**鎿嶄綔浜虹被鍨嬶紝榛樿鍛樺伐*/
+ 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 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";
+ /**鎿嶄綔绫诲瀷-鐢ㄦ埛*/
+ public static final String OP_TYPE_USER = "user";
+ /**鎿嶄綔绫诲瀷-鍛樺伐*/
+ public static final String OP_TYPE_STAFF = "staff";
+
}
--
Gitblit v1.8.0