From 9fad62d1689cf8343a32b91e831648dea01db5da Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 24 Apr 2025 16:50:32 +0800
Subject: [PATCH] no message

---
 .../ghy/order/service/impl/OrderDetailServiceImpl.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index 22c720f2..4b63bca0 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -775,12 +775,9 @@ public class OrderDetailServiceImpl implements OrderDetailService {
             divMembers.add(new DivMember(placeTwo, MoneyUtil.toS(placeTwoMoney), !feeFlag));
             workerFee = workerFee.subtract(placeTwoMoney);
         }
-        if (MoneyUtil.gt0(workerFee)) {
-            divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerFee), !feeFlag));
-        }
         masterFee=workerFee.multiply(teamRete).add(teamMoney).setScale(2, RoundingMode.UP);
         if (MoneyUtil.lt(masterFee.add(platformFee), workerFee)) {
-            masterFee = workerFee.multiply(teamRete).setScale(2, RoundingMode.UP);
+            masterFee = workerFee.multiply(workerFee).setScale(2, RoundingMode.UP);
         }
         // 如果是大师傅自己接单,则不需要抽成
         if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){
@@ -792,6 +789,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
             feeFlag = true;
         }
         logger.info("大师傅的扣点{}，最终的扣完之后的金额{}",masterFee,workerFee);
+        if (MoneyUtil.gt0(workerFee)) {
+            divMembers.add(new DivMember(memberId, MoneyUtil.toS(workerFee), !feeFlag));
+        }
+        logger.info("改价单各个金额{}，{}，{}，{}",placeOneMoney,placeTwoMoney,masterFee,workerFee);
         String orderNo = "FCR_" + fcRecord.getId() + "_" + System.currentTimeMillis();
         //调用分账
         logger.info("子订单[{}]的[改价单]发起分账", orderDetailId);