From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
index df2114e..8320abf 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.math.RoundingMode;
/**
* @author CJH
@@ -13,16 +14,37 @@
private Integer isExecute = 0;
/**鏄惁宸蹭笅鍗�*/
private Integer isOrder = 0;
-
- /**杩旇禒鐨勫鍊奸噾*/
+ /**澧炲�奸噾*/
private BigDecimal incrementMoney = BigDecimal.ZERO;
- /**杩旇禒鐨勭Н鍒�*/
+ /**绉垎*/
private BigDecimal integralMoney = BigDecimal.ZERO;
- /**杩旇禒鐨勪紭鎯犲埜鏁伴噺*/
+ /**浼樻儬鍒告暟閲�*/
private Integer couponNum = 0;
/**閭�璇风殑浜烘暟*/
private Integer inviteeNum = 0;
/**鍒嗕韩鐨勪汉鏁�*/
private Integer shareNum = 0;
+
+
+ public void incrementMoneyAdd(BigDecimal money) {
+ if (money == null){
+ money = BigDecimal.ZERO;
+ }
+ this.incrementMoney = this.incrementMoney.add(money).setScale(2, RoundingMode.HALF_UP);
+ }
+ public void integralMoneyAdd(BigDecimal money) {
+ if (money == null){
+ money = BigDecimal.ZERO;
+ }
+ this.integralMoney = this.integralMoney.add(money).setScale(2, RoundingMode.HALF_UP);
+ }
+ public void couponNumAdd(Integer num) {
+ if (num == null){
+ num = 0;
+ }
+ this.couponNum = this.couponNum + num;
+ }
+
+
}
--
Gitblit v1.8.0