From d23645e976981bc9b670eea1d469fe8a36be309c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 17 Apr 2024 17:19:53 +0800
Subject: [PATCH] 55测试环境

---
 src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java |    7 +++++--
 1 files changed, 5 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 674e38d..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();
@@ -174,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"));
             }
@@ -209,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