From 7048613cd1994d3dfc08db8879ed157f86b12e8a Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 9 Mar 2024 09:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8E=A8=E5=B9=BF=E4=BD=A3?=
 =?UTF-8?q?=E9=87=91=E5=8F=91=E6=94=BE=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/system/merchant/Merchant.php                   | 2 +-
 app/common/repositories/store/order/StoreOrderRepository.php    | 2 ++
 .../repositories/store/order/StoreOtherOrderRepository.php      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/common/model/system/merchant/Merchant.php b/app/common/model/system/merchant/Merchant.php
index d11a256c..a1fa913e 100755
--- a/app/common/model/system/merchant/Merchant.php
+++ b/app/common/model/system/merchant/Merchant.php
@@ -319,7 +319,7 @@ class Merchant extends BaseModel
 
     public function promoter()
     {
-        return User::where('uid', $this->uid)->value('spread_uid');
+        return User::where('uid', $this->uid)->field('spread_uid,nickname')->find();
     }
 
 }
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 3049228d..bd241375 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -360,10 +360,12 @@ class StoreOrderRepository extends BaseRepository
                 $promoter = $order->merchant->promoter();
                 $promoterCommission = bcmul($orderValidAmount, 0.003, 2);
                 if (!empty($promoter) && $promoterCommission > 0) {
+                    $financeDao->user = $promoter;
                     $financeDao->platformOut($promoterCommission, 'commission_to_promoter');
                 }
 
                 // 平台收入手续费
+                $financeDao->user = $groupOrder->user;
                 $commission_rate = bcdiv((string)$order['commission_rate'],'100',6);
                 $platformCommission = bcmul($orderValidAmount, (string)$commission_rate, 2);
                 if ($commission_rate > 0 && $platformCommission > 0) {
diff --git a/app/common/repositories/store/order/StoreOtherOrderRepository.php b/app/common/repositories/store/order/StoreOtherOrderRepository.php
index c3f808ff..cfe75943 100755
--- a/app/common/repositories/store/order/StoreOtherOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php
@@ -237,10 +237,12 @@ class StoreOtherOrderRepository extends BaseRepository
                 $promoter = $order->merchant->promoter();
                 $promoterCommission = bcmul($orderValidAmount, 0.003, 2);
                 if (!empty($promoter) && $promoterCommission > 0) {
+                    $financeDao->user = $promoter;
                     $financeDao->platformOut($promoterCommission, 'commission_to_promoter');
                 }
 
                 // 平台收入手续费
+                $financeDao->user = $groupOrder->user;
                 $commission_rate = bcdiv((string)$order['commission_rate'],'100',6);
                 $platformCommission = bcmul($orderValidAmount, (string)$commission_rate, 2);
                 if ($commission_rate > 0 && $platformCommission > 0) {