From 36cc56b609ba66542e78fbe293ac8cd599c7d5cc Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 22 Mar 2021 09:52:10 +0800 Subject: [PATCH] 20210318 活动信息注册时,初始化 --- src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java | 9 +++++++-- 1 files changed, 7 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..e94540f 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 @@ -132,6 +132,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 +148,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 +175,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 +211,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