From 79a564a9ca0caa10288844d567fb695a80abf006 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Mar 2021 15:39:47 +0800
Subject: [PATCH] 20210318 活动信息注册时，初始化
---
src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java | 3 +
src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java | 15 ++++---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 57 ++++++++++++++++++++++++++++
3 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java b/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java
index da64dc0..17f0e7c 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/entity/ActivityMain.java
@@ -55,7 +55,8 @@
* 活动状态1:开始2结束
*/
-
+ public static final Integer STATE_START = 1;
+ public static final Integer STATE_END = 2;
private Integer state;
/**
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..6afc908 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
@@ -195,13 +195,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,6 +224,14 @@
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());
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 19fdafd..c4d3fa1 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -5,6 +5,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.contants.AppContants;
@@ -13,6 +14,14 @@
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.common.system.service.CommonService;
+import com.xcong.excoin.modules.activity.dao.ActivityMainDao;
+import com.xcong.excoin.modules.activity.dao.ActivityMemberDetailDao;
+import com.xcong.excoin.modules.activity.dao.ActivityReceiveRecordDao;
+import com.xcong.excoin.modules.activity.dao.ActivitySubDao;
+import com.xcong.excoin.modules.activity.entity.ActivityMain;
+import com.xcong.excoin.modules.activity.entity.ActivityMemberDetail;
+import com.xcong.excoin.modules.activity.entity.ActivityReceiveRecord;
+import com.xcong.excoin.modules.activity.entity.ActivitySub;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
@@ -31,12 +40,14 @@
import com.xcong.excoin.utils.ThreadPoolUtils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.Put;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -99,6 +110,16 @@
@Resource
AppVersionDao appVersionDao;
+
+ @Resource
+ ActivityMainDao activityMainDao;
+ @Resource
+ ActivityMemberDetailDao activityMemberDetailDao;
+ @Resource
+ ActivityReceiveRecordDao activityReceiveRecordDao;
+ @Resource
+ ActivitySubDao activitySubDao;
+
@Resource
private MemberSettingDao memberSettingDao;
@@ -223,6 +244,42 @@
levelRate.setSymbol(symbolEnum.getValue());
memberLevelRateDao.insert(levelRate);
}
+ /**
+ * 初始化活动信息
+ */
+ //获取开始中的活动
+ ActivityMain activityMain = activityMainDao.selectById(1);
+ if(ObjectUtil.isNotEmpty(activityMain)) {
+ if(ActivityMain.STATE_START == activityMain.getState()) {
+ //新增【活动记录表】信息
+ ActivityReceiveRecord activityReceiveRecord = new ActivityReceiveRecord();
+ activityReceiveRecord.setMemberId(member.getId());
+ activityReceiveRecord.setMainId(activityMain.getId());
+ activityReceiveRecord.setReceiveCoinAmount(BigDecimal.ZERO);
+ activityReceiveRecord.setReceiveState(ActivityReceiveRecord.RECEIVESTATE_TWO);
+ Date startTime = new Date();
+ Date date = new Date(startTime.getTime() + ActivityReceiveRecord.DAYS*24*60*60*1000);
+ activityReceiveRecord.setInvalidTime(date);
+ Map<String, Object> activitySubMap = new HashMap<>();
+ activitySubMap.put("main_id", activityMain.getId());
+ List<ActivitySub> activitySubs = activitySubDao.selectByMap(activitySubMap );
+ if(CollUtil.isNotEmpty(activitySubs)) {
+ for(ActivitySub ActivitySub : activitySubs) {
+ Long subId = ActivitySub.getId();
+ activityReceiveRecord.setSubId(subId);
+ activityReceiveRecordDao.insert(activityReceiveRecord);
+ }
+ }
+ //新增【活动个人详情表】信息
+ ActivityMemberDetail activityMemberDetail = new ActivityMemberDetail();
+ activityMemberDetail.setMainId(activityMain.getId());
+ activityMemberDetail.setBurstUsdt(BigDecimal.ZERO);
+ activityMemberDetail.setReceivedUsdt(BigDecimal.ZERO);
+ activityMemberDetail.setSurplusUsdt(activityMain.getAmount());
+ activityMemberDetail.setMemberId(member.getId());
+ activityMemberDetailDao.insert(activityMemberDetail);
+ }
+ }
return Result.ok(MessageSourceUtils.getString("home_service_0009"));
}
--
Gitblit v1.9.1