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 | 23 ++++++++++++++++++++++-
src/main/java/com/xcong/excoin/modules/fish/entity/CannonAccountMoneyChange.java | 2 +-
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/fish/entity/CannonAccountMoneyChange.java b/src/main/java/com/xcong/excoin/modules/fish/entity/CannonAccountMoneyChange.java
index 1c4579d..e770697 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/entity/CannonAccountMoneyChange.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/entity/CannonAccountMoneyChange.java
@@ -16,7 +16,7 @@
private Long memberId;
//金额
private BigDecimal amount;
- //1：USDT兑换金币 2：USDT购买炮台 3:代币兑换记录…
+ //1：USDT购买炮台 2:金币兑换1代币 3：1代币兑换金币
private Integer type;
//内容
private String content;
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 eb9bb9c..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
@@ -79,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());
@@ -91,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("兑换成功");
}
@@ -158,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));
--
Gitblit v1.9.1