From 030e1cca0b8103662a182a4dbe801c063b342630 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 10 Mar 2022 14:44:33 +0800
Subject: [PATCH] 20211201 fish
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 0322221..e55e75c 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -31,7 +31,6 @@
import com.xcong.excoin.modules.member.mapper.MemberMapper;
import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
-import com.xcong.excoin.modules.member.service.EthService;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.modules.member.service.RocService;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
@@ -89,7 +88,7 @@
private final AgentFriendRelationMapper agentFriendRelationMapper;
private final RedisUtils redisUtils;
-
+
@Override
public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity,
QueryRequest request) {
@@ -463,18 +462,22 @@
BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount());
walletCoin.setFrozenBalance(frozen);
- memberWalletCoinMapper.updateById(walletCoin);
+// memberWalletCoinMapper.updateById(walletCoin);
if ("Y".equals(selectById.getIsInside())) {
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("symbol", symbol);
columnMap.put("address", address);
// 如果是内部转账 则需要将币加到内部地址
- List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
- if(selectByMap == null || selectByMap.isEmpty()) {
+ MemberEntity memberIn = memberMapper.selectMemberByAddress(address);
+ if(ObjectUtils.isEmpty(memberIn)){
return new FebsResponse().fail().message("地址有误，请拒绝！");
}
- Long aimMemberId = selectByMap.get(0).getMemberId();
+// List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
+// if(selectByMap == null || selectByMap.isEmpty()) {
+// return new FebsResponse().fail().message("地址有误，请拒绝！");
+// }
+ Long aimMemberId = memberIn.getId();
MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(amount);
@@ -497,6 +500,8 @@
memberAccountMoneyChangeEntity.setUpdateTime(new Date());
memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
}
+
+ memberWalletCoinMapper.updateById(walletCoin);
Map<String, Object> columnMaps = new HashMap<>();
columnMaps.put("withdraw_id", selectById.getId());
@@ -713,48 +718,41 @@
@Override
public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
-// Long memberId = memberEntity.getId();
-// String walletCode = "USDT";
-// BigDecimal amountUsdt = memberEntity.getCoinNumber();
-//
-// MemberEntity selectById = this.baseMapper.selectById(memberId);
-// if(ObjectUtils.isEmpty(selectById)) {
-// return new FebsResponse().message("用户已不存在");
-// }
-// //获取币币钱包
-// MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId,walletCode);
-// BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance();
-// BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance();
-//
-// memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amountUsdt));
-// memberWalletCoinEntity.setTotalBalance(totalBalance.add(amountUsdt));
-// // 更新
-// memberWalletCoinMapper.updateById(memberWalletCoinEntity);
-//
-// //添加币币资金划转历史记录
-// MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
-// memberAccountMoneyChangeEntity.setContent("充值");
-// memberAccountMoneyChangeEntity.setMemberId(memberId);
-// memberAccountMoneyChangeEntity.setAmount(amountUsdt);
-// memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
-// memberAccountMoneyChangeEntity.setSymbol("USDT");
-// memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
-// memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
-// memberAccountMoneyChangeEntity.setCreateTime(new Date());
-// memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
-// memberAccountMoneyChangeEntity.setUpdateTime(new Date());
-//
-// memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
- /**
- * todo
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- String chargeTime = format.format(memberQuickBuySaleEntity.getChargeTime()); // 将当前时间袼式化为指定的格式
- String usdt = memberQuickBuySaleEntity.getAmountUsdt()+"USDT";
- //发送短信提醒
- String smsContent = "【Excoin】尊敬的用户您好！您于"+chargeTime+"充值"+usdt+"已成功到账，请您及时查收！订单号为："+memberChargeUsdt.getOrderCode()+"。";
- SmsUtils.hxSmsSend(member.getPhone(), smsContent);
-
- */
+ Long memberId = memberEntity.getId();
+ String walletCode = "USDT";
+ BigDecimal amountUsdt = memberEntity.getCoinNumber();
+ if(amountUsdt.compareTo(BigDecimal.ZERO) <= 0){
+ return new FebsResponse().fail().message("金额需要大于0");
+ }
+
+ MemberEntity selectById = this.baseMapper.selectById(memberId);
+ if(ObjectUtils.isEmpty(selectById)) {
+ return new FebsResponse().fail().message("用户已不存在");
+ }
+ //获取币币钱包
+ MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId,walletCode);
+ BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance();
+ BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance();
+
+ memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amountUsdt));
+ memberWalletCoinEntity.setTotalBalance(totalBalance.add(amountUsdt));
+ // 更新
+ memberWalletCoinMapper.updateById(memberWalletCoinEntity);
+
+ //添加币币资金划转历史记录
+ MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
+ memberAccountMoneyChangeEntity.setContent("充值");
+ memberAccountMoneyChangeEntity.setMemberId(memberId);
+ memberAccountMoneyChangeEntity.setAmount(amountUsdt);
+ memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
+ memberAccountMoneyChangeEntity.setSymbol("USDT");
+ memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
+ memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
+ memberAccountMoneyChangeEntity.setCreateTime(new Date());
+ memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
+ memberAccountMoneyChangeEntity.setUpdateTime(new Date());
+
+ memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
return new FebsResponse().success();
}
@@ -1370,8 +1368,10 @@
//账户金额
String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+ String bzzNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"BZZ");
memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
+ memberInfoDetailVo.setBzzNum(bzzNum == null ? 0 : Double.parseDouble(bzzNum));
//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
//memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum));
//String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId);
--
Gitblit v1.9.1