From 6a0e1564efae8aa6069bddedef749bf5c8b9b0c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 15:52:36 +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 | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 ea55732..16eb6ef 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
@@ -103,15 +103,20 @@
if (CollUtil.isNotEmpty(orders)) {
for (YdOrderEntity order : orders) {
if ("P".equals(order.getYdProductEntity().getProUnit())) {
- totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity() * 1024));
+ totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity() * order.getYdProductEntity().getProNum() * 1024));
} else {
- totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity()));
+ totalPower = totalPower.add(BigDecimal.valueOf(order.getQuantity() * order.getYdProductEntity().getProNum()));
}
}
}
- BigDecimal needPower = basicLevelSetting.getCalculationPower().multiply(BigDecimal.valueOf(1024));
- return totalPower.compareTo(needPower) > 0;
+ BigDecimal needPower = BigDecimal.ZERO;
+ if ("P".equals(basicLevelSetting.getUnit())) {
+ needPower = basicLevelSetting.getCalculationPower().multiply(BigDecimal.valueOf(1024));
+ } else {
+ needPower = basicLevelSetting.getCalculationPower();
+ }
+ return totalPower.compareTo(needPower) >= 0;
}
/**
@@ -217,6 +222,7 @@
private Map<Long, BigDecimal> buildReturnRatioObj(List<MemberEntity> agents, int type) {
Map<Long, BigDecimal> returnRatio = new HashMap<Long, BigDecimal>();
Long lastId = null;
+ int i = 0;
for (MemberEntity agent : agents) {
YdBasicLevelSettingEntity settingEntity = agent.getYdBasicLevelSettingEntity();
@@ -228,12 +234,20 @@
}
if(settingEntity.getLevel() == 1) {
if (CollUtil.isNotEmpty(returnRatio)) {
- BigDecimal lastRatio = returnRatio.get(lastId);
- returnRatio.put(agent.getId(), ratio.subtract(lastRatio));
+ if (i != 0) {
+ returnRatio.put(agent.getId(), BigDecimal.valueOf(0.01));
+ } else {
+ BigDecimal lastRatio = returnRatio.get(lastId);
+ returnRatio.put(agent.getId(), ratio.subtract(lastRatio));
+ }
} else {
returnRatio.put(agent.getId(), ratio);
}
- break;
+
+ if (i >= 1) {
+ break;
+ }
+ i++;
}
if (CollUtil.isEmpty(returnRatio)) {
@@ -249,11 +263,11 @@
@Transactional(rollbackFor = Exception.class)
public void xchProfitDistributor(BigDecimal totalProfit) {
Date currentDate = new Date();
- List<YdProductEntity> products = ydProductDao.selectList(null);
+ List<YdProductEntity> products = ydProductDao.selectXchProductList();
if (CollUtil.isNotEmpty(products)) {
BigDecimal totalCount = BigDecimal.ZERO;
for (YdProductEntity product : products) {
- BigDecimal count = product.getTotalT();
+ BigDecimal count = product.getTotalT().multiply(BigDecimal.valueOf(product.getProNum()));
if ("P".equals(product.getProUnit())) {
count = count.multiply(BigDecimal.valueOf(1024));
}
@@ -264,6 +278,9 @@
// 单位XCH收益
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)) {
@@ -277,10 +294,12 @@
List<String> inviteIds = StrUtil.split(memberEntity.getRefererIds(), ',');
List<MemberEntity> agents = memberDao.selectYdParentAgent(inviteIds);
- BigDecimal count = BigDecimal.valueOf(order.getQuantity());
+ BigDecimal count = BigDecimal.valueOf(order.getQuantity() * order.getYdProductEntity().getProNum());
if ("P".equals(order.getYdProductEntity().getProUnit())) {
count = count.multiply(BigDecimal.valueOf(1024));
}
+
+ // 订单总收益
BigDecimal orderProfit = count.multiply(unitProfit);
BigDecimal remainProfit = orderProfit;
if (CollUtil.isNotEmpty(agents)) {
@@ -298,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