From 00cfc5c8aae4a252824f5c43f2fb30c508b490eb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 七月 2024 18:56:19 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 23 +++++++++++++++++++++++
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java | 14 ++++++++++----
2 files changed, 33 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 0b3377a..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
@@ -24,4 +25,26 @@
/**鍒嗕韩鐨勪汉鏁�*/
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;
+ }
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
index aab61db..810fbf4 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
@@ -14,15 +14,21 @@
/**娲诲姩鍖哄垎缂栧彿*/
private String activityPageCode;
- /**鏌ヨ娑堣垂鍜屾墽琛�*/
- private Boolean selectJoin = false;
- /**鏌ヨ閲戦*/
+ /**鏌ヨ涓嬪崟鎵ц杩旇禒閲戦鏁版嵁*/
private Boolean selectMoney = false;
/**閲戦鐨勬潵婧愮被鍨�*/
private String operationReason;
- /**鏌ヨ浼樻儬鍒�*/
+ /**鏌ヨ杩旇禒鐨勪紭鎯犲埜*/
private Boolean selectCoupon = false;
/**浼樻儬鍒告潵婧愮被鍨�(CouponRecordDto)*/
private String couponType;
+
+ /**鏌ヨ鍒嗕韩杩旇禒閲戦鏁版嵁*/
+ private Boolean selectShareMoney = false;
+ private String shareOperationReason;
+ /**鏌ヨ杩旇禒浼樻儬鍒告暟鎹�*/
+ private Boolean selectShareCoupon = false;
+ private String shareCouponType;
+
}
--
Gitblit v1.8.0