From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 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 294892a..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
@@ -2,11 +2,49 @@
import lombok.Data;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
/**
* @author CJH
*/
@Data
public class OrderActivityReturnVo {
/**娲诲姩鐨勮鍗曟槸鍚﹀凡鎵ц锛�0鍚�1鏄�*/
- private Integer isExecute;
+ 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