From 5b4b266dce808935d58a04d8f2190d3dc773fde9 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 28 May 2021 11:53:32 +0800 Subject: [PATCH] 20210528 --- src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 8dcf79c..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; } /** @@ -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