From 69d96e4ad5b849cb4ebe2d18805f751d9c7035ca Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 18 Aug 2023 17:36:40 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index dc3d106..95c388a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -2516,6 +2516,22 @@
             BigDecimal divide = avaPackagePoor.divide(packageTotalScore, 8, BigDecimal.ROUND_DOWN);
             packageScorePriceDic.setValue(divide.toString());
             dataDictionaryCustomMapper.updateById(packageScorePriceDic);
+
+            DappFundFlowEntity packageFlow = new DappFundFlowEntity(
+                    AccountFlowEnum.SYSTEM_PACKAGE.getCode(),
+                    1L,
+                    addPoor,
+                    FundFlowEnum.SYSTEM_ORDER_PACKAGE.getCode(),
+                    2,
+                    BigDecimal.ZERO,
+                    null,
+                    orderId);
+            dappFundFlowDao.insert(packageFlow);
+
+            DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
+            dappAKlineEntity.setOpenPrice(divide);
+            dappAKlineEntity.setType(1);
+            dappAKlineMapper.insert(dappAKlineEntity);
         }
 
     }
@@ -3060,15 +3076,22 @@
             dappWalletCoinEntity.setAvailableAmount(availableAmountRelease);
             dappWalletCoinDao.updateById(dappWalletCoinEntity);
 
+            StringBuffer content = new StringBuffer();
+            if(amountMagic.compareTo(localTotalAchieve) > 0){
+                content.append("今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+",实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
+                        "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+",原因消费金额1%加速上" +
+                        "限,增加消费金额可获得更多收益");
+            }else{
+                content.append("今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+",实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
+                        "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN));
+            }
             DappAccountMoneyChangeEntity record = new DappAccountMoneyChangeEntity(
                     memberId,
                     totalAmount,
                     amountMagic,
                     localTotalAchieve,
                     AccountFlowEnum.AMOUNT_RECORD.getCode(),
-                    "今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+",实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
-                            "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+",原因消费金额1%加速上" +
-                            "限,增加消费金额可获得更多收益");
+                    content.toString());
             dappAccountMoneyChangeDao.insert(record);
 
             //实时更新用户等级
@@ -3085,6 +3108,9 @@
         if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlowEntity.getStatus()){
             return;
         }
+        dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+        dappFundFlowDao.updateById(dappFundFlowEntity);
+
         BigDecimal cnt = dappFundFlowEntity.getAmount();
         Long memberId = dappFundFlowEntity.getMemberId();
         DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -3110,6 +3136,7 @@
         BigDecimal realAmount = totalAmount.subtract(poorAmount);
         //生成一条资金流水
         DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
+                AccountFlowEnum.AMOUNT.getCode(),
                 memberId,
                 realAmount,
                 FundFlowEnum.SALE_PACKAGE_AMOUNT.getCode(),
@@ -3118,6 +3145,7 @@
         dappFundFlowDao.insert(scoreFlow);
         dappWalletCoinDao.addTotalAndaddAvailableByMemberId(memberId,realAmount);
         DappFundFlowEntity feeFlow = new DappFundFlowEntity(
+                AccountFlowEnum.AMOUNT.getCode(),
                 memberId,
                 poorAmount.negate(),
                 FundFlowEnum.SALE_PACKAGE_AMOUNT_FEE.getCode(),
@@ -3156,6 +3184,21 @@
         BigDecimal packageAvaCntScore = packageAvaCnt.add(cnt);
         packageAvaCntDic.setValue(packageAvaCntScore.toString());
         dataDictionaryCustomMapper.updateById(packageAvaCntDic);
+
+        DappFundFlowEntity packageFlow = new DappFundFlowEntity(
+                AccountFlowEnum.SYSTEM_PACKAGE.getCode(),
+                memberId,
+                poorAmount.negate(),
+                FundFlowEnum.SYSTEM_SALE_PACKAGE.getCode(),
+                DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+                BigDecimal.ZERO);
+        dappFundFlowDao.insert(packageFlow);
+
+        DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
+        dappAKlineEntity.setOpenPrice(divide);
+        dappAKlineEntity.setType(1);
+        dappAKlineMapper.insert(dappAKlineEntity);
+
     }
 
     @Override

--
Gitblit v1.9.1