From 31ba782e2e3f82a65bdf6cb1a2d6f0fba73f312d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Mar 2021 18:02:56 +0800
Subject: [PATCH] 20210318 活动信息注册时，初始化
---
src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java | 3 +++
src/main/java/com/xcong/excoin/modules/activity/entity/ActivitySub.java | 4 ++++
src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java | 33 ++++++++-------------------------
3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java b/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
index 0c94613..ca05a3e 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
@@ -6,6 +6,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import com.xcong.excoin.common.annotations.SubmitRepeat;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.activity.service.ActivityService;
import com.xcong.excoin.modules.activity.vo.ActivityMainDetailVo;
@@ -52,6 +54,7 @@
/**
* 点击领取
*/
+ @SubmitRepeat
@ApiOperation(value="点击领取", notes="点击领取")
@GetMapping(value = "/clinkReceive")
public Result clinkReceive(@ApiParam(name = "subId", value = "活动规则ID", example = "1")
diff --git a/src/main/java/com/xcong/excoin/modules/activity/entity/ActivitySub.java b/src/main/java/com/xcong/excoin/modules/activity/entity/ActivitySub.java
index 321f414..d9dcdd0 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/entity/ActivitySub.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/entity/ActivitySub.java
@@ -59,6 +59,10 @@
private BigDecimal amount;
+ /**
+ * 累计爆仓金额
+ */
+ private BigDecimal burstAmount;
diff --git a/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java b/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
index e6ee64f..0ceb582 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
@@ -152,10 +152,10 @@
}
//验证当前活动是否结束
ActivityMain activityMain = activityMainDao.selectById(activityReceiveRecord.getMainId());
- Date endTime = activityMain.getEndTime();
- if(endTime.getTime() - date.getTime() < 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0004"));
- }
+// Date endTime = activityMain.getEndTime();
+// if(endTime.getTime() - date.getTime() < 0) {
+// return Result.fail(MessageSourceUtils.getString("activity_service_0004"));
+// }
//处于失效状态
Integer receiveState = activityReceiveRecord.getReceiveState();
@@ -169,31 +169,14 @@
//获取对应的规则编码
ActivitySub activitySub = activitySubDao.selectById(subId);
- String code = activitySub.getCode();
//获取当前人的累计爆仓金额
BigDecimal burstUsdt = contractOrderDao.getBurstUsdtByMemberId(memberId);
//判断是否满足领取条件
- if(ActivitySub.CODE_TWO.equals(code)) {
- if(ActivitySub.CODE_TWO_BIG_DECIMAL.compareTo(burstUsdt) > 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0005"));
- }
+ if(ActivitySub.CODE_ONE != activitySub.getCode()) {
+ if(activitySub.getBurstAmount().compareTo(burstUsdt) > 0) {
+ return Result.fail(MessageSourceUtils.getString("activity_service_0005"));
+ }
}
- if(ActivitySub.CODE_THREE.equals(code)) {
- if(ActivitySub.CODE_THREE_BIG_DECIMAL.compareTo(burstUsdt) > 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0005"));
- }
- }
- if(ActivitySub.CODE_FOUR.equals(code)) {
- if(ActivitySub.CODE_FOUR_BIG_DECIMAL.compareTo(burstUsdt) > 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0005"));
- }
- }
- if(ActivitySub.CODE_FIVE.equals(code)) {
- if(ActivitySub.CODE_FIVE_BIG_DECIMAL.compareTo(burstUsdt) > 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0005"));
- }
- }
-
Long mainId = activitySub.getMainId();
BigDecimal amount = activitySub.getAmount();
/**
--
Gitblit v1.9.1