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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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..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
@@ -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