From 3c061a93eb266b05666c9a557b91943fcfba2669 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 16:01:02 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
index ef83a33..6a26bdb 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
@@ -16,7 +16,9 @@
 import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
 import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
 import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import com.xcong.excoin.rabbit.producer.YunDingProducter;
 import com.xcong.excoin.utils.LogRecordUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +26,7 @@
 import java.math.BigDecimal;
 import java.util.*;
 
+@Slf4j
 @Service
 public class XchProfitServiceImpl implements XchProfitService {
 
@@ -41,6 +44,9 @@
 
     @Autowired
     private YdBasicLevelSettingDao ydBasicLevelSettingDao;
+
+    @Autowired
+    private YunDingProducter yunDingProducter;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -145,6 +151,8 @@
     public void usdtProfitDistributorByOrderId(Long id) {
         YdOrderEntity ydOrderEntity = ydOrderDao.selectById(id);
         usdtProfitDistributor(ydOrderEntity);
+
+        yunDingProducter.sendYunDingAutoAgent(ydOrderEntity.getMemberId());
     }
 
     private void usdtProfitDistributor(YdOrderEntity order) {
@@ -203,6 +211,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void xchProfitDistributor(BigDecimal totalProfit) {
         Date currentDate = new Date();
         List<YdProductEntity> products = ydProductDao.selectList(null);
@@ -219,6 +228,7 @@
 
             // 单位XCH收益
             BigDecimal unitProfit = totalProfit.divide(totalCount, 8, BigDecimal.ROUND_DOWN);
+            log.info("单位XCH收益:{}", unitProfit);
 
             List<YdOrderEntity> orders = ydOrderDao.selectAllValidOrders();
             if (CollUtil.isNotEmpty(orders)) {
@@ -253,10 +263,12 @@
                         }
                     }
 
+                    remainProfit = remainProfit.subtract(orderProfit.subtract(orderProfit.multiply(order.getYdProductEntity().getManageExpense())));
                     String content = "XCH收益";
                     LogRecordUtils.insertMemberAccountMoneyChangeWithId(order.getMemberId(), content, remainProfit, "XCH", 1, 4, order.getId());
                     MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(order.getMemberId(), "XCH");
 
+                    ydOrderDao.updateOrderProfit(remainProfit, order.getId());
                     memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), remainProfit, BigDecimal.ZERO, 0);
                 }
             }

--
Gitblit v1.9.1