From d45597e240412870bbb25358c752e3eaf92aee37 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 8 Dec 2023 18:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=A5=96=E5=8A=B1=E5=BD=92=E7=B1=BB=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/admin/TeamAgencyController.php        | 26 +++++++++----------
 .../src/services/TeamReturnService.php        |  6 +++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php
index f49d4e50..655c3820 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(22);
+        // $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/TeamReturnService.php b/plugins/team-dividend/src/services/TeamReturnService.php
index b649449b..918e208a 100644
--- a/plugins/team-dividend/src/services/TeamReturnService.php
+++ b/plugins/team-dividend/src/services/TeamReturnService.php
@@ -541,8 +541,10 @@ class TeamReturnService
             'created_at'    => time(),
         ];
         // 判断：如果当前是 文创生态建设  修改对应的类型值
-        if($this->dividendType == 1 && $dividendData['type'] < 6) $dividendData['type'] = $dividendData['type'] == 1 ? 5 : 4;
-
+        if($this->dividendType == 1 && $dividendData['type'] < 6) {
+            if($dividendData['type'] == 1) $dividendData['type'] = 5;
+            else if($dividendData['type'] == 0) $dividendData['type'] = 4;
+        }
         //取小数点后两位数四舍五入   例如设置独立金额0.003元
         if (round($dividendData['dividend_amount'], 2) <= 0) return;
         if (empty($dividendData['lower_level_rate'])) $dividendData['lower_level_rate'] = 0;