From aedff1c1fb843ec71b5494cd95e632a1b045dabb Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 8 Dec 2023 10:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=92=8C=E5=88=86=E9=94=80=E5=95=86=E5=88=86=E7=BA=A2?=
 =?UTF-8?q?=E4=BD=A3=E9=87=91=E4=BF=AE=E6=94=B9=20=20=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E5=8F=82=E4=B8=8E=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E7=9B=B8=E5=85=B3=E5=88=86=E7=BA=A2=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E5=88=9B=E5=95=86=E5=93=81=E4=B8=8D=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=A3=E9=87=91=E5=88=86=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/services/CommissionOrderService.php   |  7 +++--
 .../src/services/TeamReturnService.php        | 29 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/plugins/commission/src/services/CommissionOrderService.php b/plugins/commission/src/services/CommissionOrderService.php
index 59d52a9b..73477cbc 100644
--- a/plugins/commission/src/services/CommissionOrderService.php
+++ b/plugins/commission/src/services/CommissionOrderService.php
@@ -9,6 +9,7 @@ use Yunshop\Commission\models\AgentLevel;
 use Yunshop\Commission\models\Commission;
 use Yunshop\Commission\models\Operation;
 use Yunshop\Commission\models\Order;
+use Yunshop\CulturalSpace\models\GoodsCulturalSpace;
 use Yunshop\Hotel\common\models\Hotel;
 use Yunshop\Hotel\common\models\HotelOrder;
 use Yunshop\Hotel\common\models\HotelSetting;
@@ -482,9 +483,11 @@ class CommissionOrderService
             }
         }
 
-
-
         foreach ($orderGoods as $key => $og) {
+            // 判断：如果为文创商品-不参与普通分红；普通商品-不参与文创分红。文创商品&不是文创等级  ||  非文创商品&文创等级  跳出
+            $isOpenCultural = (int)GoodsCulturalSpace::uniacid()->where('goods_id',$og->goods_id)->value('is_open');
+            if(($isOpenCultural && $levelType != 1) || (!$isOpenCultural && $levelType == 1) ) continue;
+
             $payment_amount = $og['payment_amount'];
             //获取商品分销设置信息
             $commissionGoods = Commission::getGoodsById($og->goods_id)->first();
diff --git a/plugins/team-dividend/src/services/TeamReturnService.php b/plugins/team-dividend/src/services/TeamReturnService.php
index eb218e30..b649449b 100644
--- a/plugins/team-dividend/src/services/TeamReturnService.php
+++ b/plugins/team-dividend/src/services/TeamReturnService.php
@@ -11,6 +11,7 @@ namespace Yunshop\TeamDividend\services;
 use app\common\models\MemberShopInfo;
 use app\common\services\finance\PointService;
 use Carbon\Carbon;
+use Yunshop\CulturalSpace\models\GoodsCulturalSpace;
 use Yunshop\SpecialSettlement\common\Recalculate;
 use Yunshop\TeamDividend\models\GoodsTeamDividend;
 use Yunshop\TeamDividend\models\MemberChild;
@@ -80,17 +81,23 @@ class TeamReturnService
     public function handle()
     {
         if (!$this->team_goods) return;
-        // 普通处理
-        $this->init();
-        $this->totalDividend();
-        $this->running();
-        // 文创处理
-        $this->flat_prize_limit = 0;
-        $this->dividendType = 1;
-        $this->init();
-        $this->totalDividend();
-        $this->running();
-
+        // 判断：文创空间商品 不参与普通分红；非文创空间商品不参与文创空间相关分红
+        $isOpenCultural = (int)GoodsCulturalSpace::uniacid()->where('goods_id',$this->order_goods->goods_id)->value('is_open');
+        if($isOpenCultural){
+            // 开启文创空间
+            // 文创处理
+            $this->flat_prize_limit = 0;
+            $this->dividendType = 1;
+            $this->init();
+            $this->totalDividend();
+            $this->running();
+        }else{
+            // 未开启文创空间
+            // 普通处理
+            $this->init();
+            $this->totalDividend();
+            $this->running();
+        }
     }
 
     private function running(){