From 703583a4183d2153742b64663193fd003ff7a9e5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Mar 2021 17:43:02 +0800
Subject: [PATCH] 20210318 活动信息注册时，初始化
---
src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 10b717f..e6ee64f 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
@@ -69,7 +69,7 @@
@Override
public Result getActivityMain() {
//登录验证
- LoginUserUtils.getAppLoginUser().getId();
+ //LoginUserUtils.getAppLoginUser().getId();
ActivityMainVo activityMainVo = new ActivityMainVo();
//活动图片
@@ -143,10 +143,12 @@
queryWrapperActivityReceiveRecord.eq("member_id",memberId);
queryWrapperActivityReceiveRecord.eq("sub_id",subId);
ActivityReceiveRecord activityReceiveRecord = activityReceiveRecordDao.selectOne(queryWrapperActivityReceiveRecord);
- Date receiveTime = activityReceiveRecord.getReceiveTime();
+ Date invalidTime = activityReceiveRecord.getInvalidTime();
Date date = new Date();
- if(receiveTime.getTime() - date.getTime() < 0) {
- return Result.fail(MessageSourceUtils.getString("activity_service_0002"));
+ if(ObjectUtil.isNotEmpty(invalidTime.getTime())) {
+ if(invalidTime.getTime() - date.getTime() < 0) {
+ return Result.fail(MessageSourceUtils.getString("activity_service_0002"));
+ }
}
//验证当前活动是否结束
ActivityMain activityMain = activityMainDao.selectById(activityReceiveRecord.getMainId());
@@ -195,13 +197,6 @@
Long mainId = activitySub.getMainId();
BigDecimal amount = activitySub.getAmount();
/**
- * 更新领取记录表
- */
- activityReceiveRecord.setReceiveCoinAmount(amount);
- activityReceiveRecord.setReceiveState(ActivityReceiveRecord.RECEIVESTATE_ONE);
- activityReceiveRecord.setReceiveTime(new Date());
- activityReceiveRecordDao.updateById(activityReceiveRecord);
- /**
* 更新个人详情页面信息
*/
QueryWrapper<ActivityMemberDetail> queryWrapperMemberDetail = new QueryWrapper<>();
@@ -231,13 +226,21 @@
memberAccountMoneyChange.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
memberAccountMoneyChangeDao.insert(memberAccountMoneyChange);
/**
+ * 更新领取记录表
+ */
+ activityReceiveRecord.setReceiveCoinAmount(amount);
+ activityReceiveRecord.setReceiveState(ActivityReceiveRecord.RECEIVESTATE_ONE);
+ activityReceiveRecord.setReceiveTime(new Date());
+ activityReceiveRecord.setAmcId(memberAccountMoneyChange.getId());
+ activityReceiveRecordDao.updateById(activityReceiveRecord);
+ /**
* 更新币币账户
*/
MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, MemberWalletCoinEnum.WALLETCOINCODE.getValue());
BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance();
BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance();
- availableBalance.add(amount);
- totalBalance.add(amount);
+ memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amount));
+ memberWalletCoinEntity.setTotalBalance(totalBalance.add(amount));
memberWalletCoinDao.updateById(memberWalletCoinEntity);
return Result.ok(MessageSourceUtils.getString("activity_service_0006"));
}
--
Gitblit v1.9.1