From 04c7ad9c89002913dd4d906d7701391d0a0c5398 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期四, 06 六月 2024 18:24:56 +0800 Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test --- phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 14 +++++++++++++- 1 files changed, 13 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..191f9ec 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,23 @@ import lombok.Data; +import java.math.BigDecimal; + /** * @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 inviteeNum = 0; + } -- Gitblit v1.8.0