From ea67d65fc71723719ea1d05bcacfd9aedd7d543c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Nov 2021 17:37:56 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
index ea0460d..c84bd0f 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
@@ -10,13 +10,11 @@
 import com.xcong.excoin.common.enumerates.CoinTypeEnum;
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.modules.coin.service.CoinService;
-import com.xcong.excoin.modules.fish.dao.CannonAccountMoneyChangeDao;
-import com.xcong.excoin.modules.fish.dao.CannonOwnRecordDao;
-import com.xcong.excoin.modules.fish.dao.CannonSettingDao;
-import com.xcong.excoin.modules.fish.dao.MemberAccountGoldDao;
+import com.xcong.excoin.modules.fish.dao.*;
 import com.xcong.excoin.modules.fish.dto.*;
 import com.xcong.excoin.modules.fish.entity.*;
 import com.xcong.excoin.modules.fish.service.MemberCannonService;
+import com.xcong.excoin.modules.fish.vo.AccountAvaBanlaceVo;
 import com.xcong.excoin.modules.fish.vo.CannonSettingVo;
 import com.xcong.excoin.modules.fish.vo.GoldAccountVo;
 import com.xcong.excoin.modules.fish.vo.OwnCannonVo;
@@ -33,21 +31,23 @@
 public class MemberCannonServiceImpl extends ServiceImpl<CannonOwnRecordDao, CannonOwnRecord> implements MemberCannonService {
 
     @Resource
-    CannonSettingDao cannonSettingDao;
-    @Resource
     MemberAccountGoldDao memberAccountGoldDao;
-    @Resource
-    CannonAccountMoneyChangeDao cannonAccountMoneyChangeDao;
     @Resource
     MemberWalletCoinDao memberWalletCoinDao;
     @Resource
+    private MemberCannonService memberCannonService;
+    @Resource
+    CannonAccountMoneyChangeDao cannonAccountMoneyChangeDao;
+    @Resource
     CannonOwnRecordDao cannonOwnRecordDao;
+    @Resource
+    CannonSettingDao cannonSettingDao;
+    @Resource
+    CannonGameRecordDao cannonGameRecordDao;
     @Resource
     RedisUtils redisUtils;
     @Resource
     private CoinService coinService;
-    @Resource
-    private MemberCannonService memberCannonService;
 
     @Override
     public Result coinGoldExchange(CoinGoldExchangeDto coinGoldExchangeDto) {
@@ -252,9 +252,33 @@
         BigDecimal goldConsume = cannonSetting.getGoldConsume().subtract(new BigDecimal(goldWin)).setScale(0,BigDecimal.ROUND_DOWN);
         MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
         memberCannonService.updateTotalBalanceAndAvailableBalance(memberAccountGold.getId(),goldConsume.negate(),goldConsume.negate(),null);
+        //增加一条游戏记录
+        CannonGameRecord cannonGameRecord = new CannonGameRecord();
+        cannonGameRecord.setMemberId(memberId);
+        cannonGameRecord.setCannonOwnId(cannonOwnRecord.getId());
+        cannonGameRecord.setCannonName(cannonOwnRecord.getCannonName());
+        cannonGameRecord.setCannonCode(cannonOwnRecord.getCannonCode());
+        cannonGameRecord.setGoldConsume(cannonSetting.getGoldConsume());
+        cannonGameRecord.setGoldReward(new BigDecimal(goldWin));
+        cannonGameRecordDao.insert(cannonGameRecord);
+
         return Result.ok("success");
     }
 
+    @Override
+    public Result getAccountAvaBanlace() {
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
+        MemberWalletCoinEntity memberWalletCoinEntityXCT = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
+        MemberWalletCoinEntity memberWalletCoinEntityUSDT = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
+        AccountAvaBanlaceVo accountAvaBanlaceVo = new AccountAvaBanlaceVo();
+//        accountAvaBanlaceVo.setMemberId(memberId);
+        accountAvaBanlaceVo.setGoldAvailableBalance(memberAccountGold.getAvailableBalance() == null?BigDecimal.ZERO:memberAccountGold.getAvailableBalance());
+        accountAvaBanlaceVo.setCoinAvailableBalance(memberWalletCoinEntityXCT.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityXCT.getAvailableBalance());
+        accountAvaBanlaceVo.setUsdtAvailableBalance(memberWalletCoinEntityUSDT.getAvailableBalance() == null?BigDecimal.ZERO:memberWalletCoinEntityUSDT.getAvailableBalance());
+        return Result.ok(accountAvaBanlaceVo);
+    }
+
     public static void main(String[] args) {
         System.out.println(UUID.randomUUID().toString());
     }

--
Gitblit v1.9.1