From e6d01c8312b6adb1db73cebea9e8293a44267ee8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 31 Jul 2023 10:05:33 +0800
Subject: [PATCH] 智能合约

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   81 ++++++++++++++++++++++++----------------
 1 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 70cf983..267094a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -802,6 +802,15 @@
                         1,
                         ausdAmountNeed,
                         transferADto.getTxHash());
+
+
+//                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
+//                        member.getId(),
+//                        transferADto.getAmount(),
+//                        type,
+//                        1,
+//                        new BigDecimal("1"),
+//                        transferADto.getTxHash());
                 dappFundFlowDao.insert(fundFlow);
                 return fundFlow.getId();
             }
@@ -811,44 +820,50 @@
                 if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
                     throw new FebsException("请勿重复提交");
                 }
-                /**
-                 * 生成会员入金买A币的记录
-                 */
-                DappChargeUsdtEntity dappChargeUsdtEntity = new DappChargeUsdtEntity(
-                        member.getId(),
-                        dappMemberEntity.getAddress(),
-                        transferADto.getTxHash(),
-                        2,
-                        transferADto.getAmount(),
-                        BigDecimal.ZERO,
-                        BigDecimal.ZERO);
-                dappChargeUsdtMapper.insert(dappChargeUsdtEntity);
-                /**
-                 * 减少用户的AUSD数量
-                 */
-                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
-                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
-                ausdAmount = ausdAmount.subtract(flow.getFee()).setScale(4,BigDecimal.ROUND_DOWN);
-                dappUsdtPerkEntity.setAusdAmount(ausdAmount);
-                dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
-                /**
-                 * 流水关联用户购买记录
-                 */
-                flow.setSystemProfitId(dappChargeUsdtEntity.getId());
+
                 /**
                  * 链上转账的hash值
                  */
                 flow.setFromHash(transferADto.getTxHash());
-                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
                 dappFundFlowDao.updateById(flow);
-                /**
-                 * 发送消息处理返利逻辑
-                 */
-                chainProducer.sendAntACoinInMsg(flow.getId());
-                /**
-                 * 发送消息处理代理升级
-                 */
-                chainProducer.sendAntMemberLevelMsg(member.getId());
+//                /**
+//                 * 生成会员入金买A币的记录
+//                 */
+//                DappChargeUsdtEntity dappChargeUsdtEntity = new DappChargeUsdtEntity(
+//                        member.getId(),
+//                        dappMemberEntity.getAddress(),
+//                        transferADto.getTxHash(),
+//                        2,
+//                        transferADto.getAmount(),
+//                        BigDecimal.ZERO,
+//                        BigDecimal.ZERO);
+//                dappChargeUsdtMapper.insert(dappChargeUsdtEntity);
+//                /**
+//                 * 减少用户的AUSD数量
+//                 */
+//                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
+//                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
+//                ausdAmount = ausdAmount.subtract(flow.getFee()).setScale(4,BigDecimal.ROUND_DOWN);
+//                dappUsdtPerkEntity.setAusdAmount(ausdAmount);
+//                dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
+//                /**
+//                 * 流水关联用户购买记录
+//                 */
+//                flow.setSystemProfitId(dappChargeUsdtEntity.getId());
+//                /**
+//                 * 链上转账的hash值
+//                 */
+//                flow.setFromHash(transferADto.getTxHash());
+//                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+//                dappFundFlowDao.updateById(flow);
+//                /**
+//                 * 发送消息处理返利逻辑
+//                 */
+//                chainProducer.sendAntACoinInMsg(flow.getId());
+//                /**
+//                 * 发送消息处理代理升级
+//                 */
+//                chainProducer.sendAntMemberLevelMsg(member.getId());
             } else {
                 DappFundFlowEntity flow = dappFundFlowDao.selectById(transferADto.getId());
                 if (flow.getStatus() == 1) {

--
Gitblit v1.9.1