From 896b7d554f484df121d410c3d0953666b4ffc18b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Nov 2021 15:58:51 +0800
Subject: [PATCH] 20211124  fish

---
 src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 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 d13af5a..ee974e7 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
@@ -21,6 +21,8 @@
 import com.xcong.excoin.modules.fish.entity.*;
 import com.xcong.excoin.modules.fish.service.MemberCannonService;
 import com.xcong.excoin.modules.fish.vo.CannonSettingVo;
+import com.xcong.excoin.modules.fish.vo.GoldAccountVo;
+import com.xcong.excoin.modules.fish.vo.OwnCannonVo;
 import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
 import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
 import com.xcong.excoin.utils.RedisUtils;
@@ -77,6 +79,16 @@
             memberCannonService.updateTotalBalanceAndAvailableBalance(memberAccountGold.getId(),balance.negate(),balance.negate(),null);
             //代币账户增加
             coinService.updateWalletBalance(memberWalletCoinEntity.getId(),divide,divide,null);
+
+            CannonAccountMoneyChange cannonAccountMoneyChange = new CannonAccountMoneyChange();
+            cannonAccountMoneyChange.setMemberId(memberId);
+            cannonAccountMoneyChange.setAmount(balance.negate());
+            cannonAccountMoneyChange.setType(2);
+            cannonAccountMoneyChange.setContent("金币兑换");
+            cannonAccountMoneyChange.setChangeBalance(balance);
+            cannonAccountMoneyChange.setChangeBefore(memberAccountGold.getAvailableBalance());
+            cannonAccountMoneyChange.setChangeAfter(memberAccountGold.getAvailableBalance().subtract(balance));
+            cannonAccountMoneyChangeDao.insert(cannonAccountMoneyChange);
         }else if(type == 2){
             MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
             MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
@@ -89,6 +101,16 @@
             memberCannonService.updateTotalBalanceAndAvailableBalance(memberAccountGold.getId(),multiply,multiply,null);
             //代币账户减少
             coinService.updateWalletBalance(memberWalletCoinEntity.getId(),balance.negate(),balance.negate(),null);
+
+            CannonAccountMoneyChange cannonAccountMoneyChange = new CannonAccountMoneyChange();
+            cannonAccountMoneyChange.setMemberId(memberId);
+            cannonAccountMoneyChange.setAmount(balance);
+            cannonAccountMoneyChange.setType(3);
+            cannonAccountMoneyChange.setContent("兑换金币");
+            cannonAccountMoneyChange.setChangeBalance(balance);
+            cannonAccountMoneyChange.setChangeBefore(memberWalletCoinEntity.getAvailableBalance());
+            cannonAccountMoneyChange.setChangeAfter(memberWalletCoinEntity.getAvailableBalance().add(balance));
+            cannonAccountMoneyChangeDao.insert(cannonAccountMoneyChange);
         }
         return Result.ok("兑换成功");
     }
@@ -156,7 +178,8 @@
         CannonAccountMoneyChange cannonAccountMoneyChange = new CannonAccountMoneyChange();
         cannonAccountMoneyChange.setMemberId(memberId);
         cannonAccountMoneyChange.setAmount(exchangePrice);
-        cannonAccountMoneyChange.setType(2);
+        cannonAccountMoneyChange.setType(1);
+        cannonAccountMoneyChange.setContent("购买炮塔");
         cannonAccountMoneyChange.setChangeBalance(exchangePrice);
         cannonAccountMoneyChange.setChangeBefore(memberWalletCoinEntity.getAvailableBalance());
         cannonAccountMoneyChange.setChangeAfter(memberWalletCoinEntity.getAvailableBalance().subtract(exchangePrice));
@@ -191,6 +214,29 @@
         return Result.ok("兑换成功");
     }
 
+    @Override
+    public Result getGoldAccount() {
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
+        if(ObjectUtil.isEmpty(memberAccountGold)){
+            MemberAccountGold memberAccountGoldNew = new MemberAccountGold();
+            memberAccountGoldNew.setMemberId(memberId);
+            memberAccountGoldNew.setTotalBalance(BigDecimal.ZERO);
+            memberAccountGoldNew.setAvailableBalance(BigDecimal.ZERO);
+            memberAccountGoldNew.setFrozenBalance(BigDecimal.ZERO);
+            memberAccountGoldDao.insert(memberAccountGoldNew);
+        }
+        GoldAccountVo goldAccountVo = memberAccountGoldDao.selectAccountGoldVoByMemberId(memberId);
+        return Result.ok(goldAccountVo);
+    }
+
+    @Override
+    public Result getOwnCannon() {
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        List<OwnCannonVo> cannonOwnRecords = cannonOwnRecordDao.selectCannonOwnRecordsByMemberId(memberId);
+        return Result.ok(cannonOwnRecords);
+    }
+
     public static void main(String[] args) {
         System.out.println(UUID.randomUUID().toString());
     }

--
Gitblit v1.9.1