From f95df31ceef45cf6486a1bf5be90e5e4075fdb1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 01 Jun 2021 17:21:13 +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 | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 6efda0a..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,9 +103,9 @@
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()));
}
}
}
@@ -263,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));
}
@@ -294,7 +294,7 @@
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));
}
@@ -317,10 +317,10 @@
}
}
+ BigDecimal partnerAmount = orderProfit.multiply(setting.getPartnerXchRatio());
+ remainProfit = remainProfit.subtract(partnerAmount);
// 合伙人收益
if (CollUtil.isNotEmpty(partners)) {
- BigDecimal partnerAmount = orderProfit.multiply(setting.getPartnerXchRatio());
- remainProfit = remainProfit.subtract(partnerAmount);
BigDecimal unitPartnerAmount = partnerAmount.divide(BigDecimal.valueOf(partners.size()), 8, BigDecimal.ROUND_DOWN);
for (MemberEntity partner : partners) {
String conent = "合伙人XCH分红";
--
Gitblit v1.9.1