From 0deed15194601ebd1d351bf7a3177569099f1fb1 Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Mon, 13 Mar 2023 10:57:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94=E9=93=BE?=
 =?UTF-8?q?=E5=88=86=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php  | 10 +++++-----
 crmeb/jobs/SupplyChainOrderBrokerAgeJob.php            |  9 +++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index c8f2126b..397d2bc9 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -388,16 +388,16 @@ class StoreOrderRepository extends BaseRepository
             if ($groupOrder->user->spread_uid) {
                 
                 // 来源检测，1 服务小组 2 普通商品
-                if($order->source == 2)
+                if($order->source == 1)
                 {
                     \think\facade\Log::record('供应链佣金--开始');
                     Queue::push(SupplyChainOrderBrokerAgeJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
                     \think\facade\Log::record('供应链佣金---结束');
+
+                }else{
+                    Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
+                    Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
                 }
-                
-                Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
-                Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
-                
             }
             app()->make(UserRepository::class)->update($groupOrder->uid, [
                 'pay_count' => Db::raw('pay_count+' . count($groupOrder->orderList)),
diff --git a/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php b/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php
index 40efa280..c99354c2 100644
--- a/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php
+++ b/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php
@@ -30,8 +30,6 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
     {
         try {
             $user = app()->make(UserRepository::class)->get($data['uid']);
-
-            // 供应链服务小组一级返还给服务小组
             if ($user) {
                 $flag = true;
                 if ($data['type'] == 'spread_money') {
@@ -45,10 +43,9 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
                     $user->save();
                 }
             }
-
-            // 执行供应链佣金分账
-            app()->make(UserBrokerageRepository::class)->inc($user, $data['type'], $data['inc']);
-
+            if ($user && $user->is_promoter) {
+                app()->make(UserBrokerageRepository::class)->inc($user, $data['type'], $data['inc']);
+            }
         } catch (\Exception $e) {
             Log::info('分销等级同步失败: ' . var_export($data, 1) . $e->getMessage());
         }