From 3db83ef4add286feabba2d5db4eabfa27d5fc5f1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 17:13:24 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 ad88844..595f030 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
@@ -116,7 +116,7 @@
} else {
needPower = basicLevelSetting.getCalculationPower();
}
- return totalPower.compareTo(needPower) > 0;
+ return totalPower.compareTo(needPower) >= 0;
}
/**
@@ -279,6 +279,9 @@
BigDecimal unitProfit = totalProfit.divide(totalCount, 8, BigDecimal.ROUND_DOWN);
log.info("单位XCH收益:{}", unitProfit);
+ List<MemberEntity> partners = memberDao.selectPartnerMemberList();
+ YdBasicSettingEntity setting = ydBasicSettingDao.selectById(1L);
+
List<YdOrderEntity> orders = ydOrderDao.selectAllValidOrders();
if (CollUtil.isNotEmpty(orders)) {
for (YdOrderEntity order : orders) {
@@ -314,6 +317,17 @@
}
}
+ BigDecimal partnerAmount = orderProfit.multiply(setting.getPartnerXchRatio());
+ remainProfit = remainProfit.subtract(partnerAmount);
+ // 合伙人收益
+ if (CollUtil.isNotEmpty(partners)) {
+ BigDecimal unitPartnerAmount = partnerAmount.divide(BigDecimal.valueOf(partners.size()), 8, BigDecimal.ROUND_DOWN);
+ for (MemberEntity partner : partners) {
+ String conent = "合伙人XCH分红";
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(partner.getId(), conent, unitPartnerAmount, "XCH", 1, 10, order.getId());
+ }
+ }
+
remainProfit = remainProfit.subtract(orderProfit.multiply(order.getYdProductEntity().getManageExpense()));
String content = "XCH收益";
LogRecordUtils.insertMemberAccountMoneyChangeWithId(order.getMemberId(), content, remainProfit, "XCH", 1, 4, order.getId());
--
Gitblit v1.9.1