From 83a79b49af2a27f05ba4a65dbe0f5edbf570e1cc Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 7 Dec 2023 18:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E6=97=A0=E6=8F=90=E6=88=90=E4=BD=A3=E9=87=91=E6=97=B6?=
 =?UTF-8?q?=20=E5=B9=B3=E7=BA=A7=E5=A5=96=E7=85=A7=E5=B8=B8=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/admin/TeamAgencyController.php        | 26 +++++++++----------
 .../src/services/GetAmountService.php         |  4 +--
 .../src/services/TeamReturnService.php        |  1 -
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php
index 61f7849d..f49d4e50 100644
--- a/plugins/team-dividend/src/admin/TeamAgencyController.php
+++ b/plugins/team-dividend/src/admin/TeamAgencyController.php
@@ -330,19 +330,19 @@ class TeamAgencyController extends BaseController
         // $set = \Setting::get('plugin.team_dividend');
         // (new NewUpgrateJob($model->uid, $set, $model->uniacid, TeamDividendLevelUpgrade::ORDER_PAY, $model))->handle();
 
-        // $order = Order::find(3);
-        // $TeamReturnService = ReturnConfig::getClass();
-        // if (app('plugins')->isEnabled('team-sideways')) debug('经销商订单创建终止:team-sideways');
-        // $set = $order->getSetting('plugin.team_dividend');
-        // if (!$set['is_team_dividend']) debug('是否开启经销商插件');
-        // $buyMember = $order->belongsToMember;
-        // $agents = GetAgentsService::index($set, $order->uid, $order->create_time);
-        // foreach ($order->hasManyOrderGoods as $order_goods) {
-        //     // 普通经销商提成处理
-        //     $TeamReturnService->setData($order, $set, $buyMember, $order_goods, $agents);
-        //     $TeamReturnService->handle();
-        //     $this->totalDividend += $TeamReturnService->totalDividend;
-        // }
+/*        $order = Order::find(3);
+        $TeamReturnService = ReturnConfig::getClass();
+        if (app('plugins')->isEnabled('team-sideways')) debug('经销商订单创建终止:team-sideways');
+        $set = $order->getSetting('plugin.team_dividend');
+        if (!$set['is_team_dividend']) debug('是否开启经销商插件');
+        $buyMember = $order->belongsToMember;
+        $agents = GetAgentsService::index($set, $order->uid, $order->create_time);
+        foreach ($order->hasManyOrderGoods as $order_goods) {
+            // 普通经销商提成处理
+            $TeamReturnService->setData($order, $set, $buyMember, $order_goods, $agents);
+            $TeamReturnService->handle();
+            $this->totalDividend += $TeamReturnService->totalDividend;
+        }*/
 
         debug("结束");
     }
diff --git a/plugins/team-dividend/src/services/GetAmountService.php b/plugins/team-dividend/src/services/GetAmountService.php
index 771aa58f..ea383e84 100644
--- a/plugins/team-dividend/src/services/GetAmountService.php
+++ b/plugins/team-dividend/src/services/GetAmountService.php
@@ -199,11 +199,11 @@ class GetAmountService
             if ($this->hasDividendRates()) {
                 $dividend_rates = $this->getDividendRates();
                 $ratio = $dividend_rates['level_' . ($this->dividendType == 1 ? $this->agent['cultural_level_id'] : $this->agent['level'])];
-                if (isset($ratio) && $ratio > 0) {
+                // if (isset($ratio) && $ratio > 0) {
                     // 提成结算金额
                     $amount = $this->order_goods->payment_amount;
                     return $amount;
-                }
+                // }
             }
 
             // 商城商品设置奖励固定金额
diff --git a/plugins/team-dividend/src/services/TeamReturnService.php b/plugins/team-dividend/src/services/TeamReturnService.php
index f9c6f48b..eb218e30 100644
--- a/plugins/team-dividend/src/services/TeamReturnService.php
+++ b/plugins/team-dividend/src/services/TeamReturnService.php
@@ -342,7 +342,6 @@ class TeamReturnService
             'hierarchy' => $dividend_level['hierarchy'] + 1,
             'dividend_amount' => $dividend_amount
         ];
-
         // 是否开启平级奖下级获得经销商奖励计算方式
         if ($this->set['calculate_formula'] == 1) {
             $finishPrice = $this->obtainInfos[$this->dividendType == 1 ? $agent['cultural_level_id'] : $agent['level']];