From 0ea6cd6f2be2fc9196ef29a0c9fd8db18c69811b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Mar 2021 11:48:15 +0800
Subject: [PATCH] 20210318 活动信息注册时，初始化
---
src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
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 0ceb582..1c7be54 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
@@ -86,6 +86,7 @@
ActivityMain activityMain = activityMainDao.selectOne(queryWrappers);
if(ObjectUtil.isNotEmpty(activityMain)) {
activityMainVo.setId(activityMain.getId());
+ activityMainVo.setHtmlImg(activityMain.getHtmlImg());
}
}
return Result.ok(activityMainVo);
@@ -132,6 +133,7 @@
public Result clinkReceive(long subId) {
//登录验证
Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ //Long memberId = Long.parseLong("47");
//验证是否实名认证
MemberEntity memberEntity = memberDao.selectById(memberId);
Integer certifyStatus = memberEntity.getCertifyStatus();
@@ -147,6 +149,9 @@
Date date = new Date();
if(ObjectUtil.isNotEmpty(invalidTime.getTime())) {
if(invalidTime.getTime() - date.getTime() < 0) {
+ //更新失效状态
+ activityReceiveRecord.setReceiveState(ActivityReceiveRecord.RECEIVESTATE_THREE);
+ activityReceiveRecordDao.updateById(activityReceiveRecord);
return Result.fail(MessageSourceUtils.getString("activity_service_0002"));
}
}
@@ -171,8 +176,9 @@
ActivitySub activitySub = activitySubDao.selectById(subId);
//获取当前人的累计爆仓金额
BigDecimal burstUsdt = contractOrderDao.getBurstUsdtByMemberId(memberId);
+ burstUsdt = burstUsdt.multiply(new BigDecimal(-1));
//判断是否满足领取条件
- if(ActivitySub.CODE_ONE != activitySub.getCode()) {
+ if(!ActivitySub.CODE_ONE.equals(activitySub.getCode())) {
if(activitySub.getBurstAmount().compareTo(burstUsdt) > 0) {
return Result.fail(MessageSourceUtils.getString("activity_service_0005"));
}
@@ -206,7 +212,7 @@
memberAccountMoneyChange.setAmount(amount);
memberAccountMoneyChange.setStatus(MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER);
memberAccountMoneyChange.setSymbol(MemberWalletCoinEnum.WALLETCOINCODE.getValue());
- memberAccountMoneyChange.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
+ memberAccountMoneyChange.setType(MemberAccountMoneyChange.TYPE_WALLET_AGENT);
memberAccountMoneyChangeDao.insert(memberAccountMoneyChange);
/**
* 更新领取记录表
--
Gitblit v1.9.1