From 65690c80dc209860cd867f8896adfac80fc8a382 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 29 Feb 2024 11:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E5=8D=A1=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/store/product/Product.php           | 12 ++++++++++++
 .../store/order/StoreOrderRepository.php             |  3 +--
 app/controller/merchant/store/order/OrderOther.php   |  2 +-
 crmeb/listens/OrderDeliveryListen.php                |  3 +--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/common/model/store/product/Product.php b/app/common/model/store/product/Product.php
index 805d192c..48fb0728 100755
--- a/app/common/model/store/product/Product.php
+++ b/app/common/model/store/product/Product.php
@@ -589,4 +589,16 @@ class Product extends BaseModel
         return $this->mer_status == 1 && $this->status == 1 && $this->is_del == 0 && $this->is_show == self::IS_SHOW && $this->is_used == 1;
     }
 
+    /**
+     * 判断是否为平台卡商品
+     * @return bool
+     */
+    public function isPlatformCard()
+    {
+        if (!empty($this->merCateId) && in_array(env('PLATFORM_CARD_CATE_ID'), array_column($this->merCateId->toArray(), 'mer_cate_id'))) {
+            return true;
+        }
+        return false;
+    }
+
 }
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 50e76908..2af49fee 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -363,8 +363,7 @@ class StoreOrderRepository extends BaseRepository
                 }
 
                 //判断是否是平台购物卡
-                $merchantCate = $order->orderProduct[0]->product->merCateId;
-                if (!empty($merchantCate) && in_array(env('PLATFORM_CARD_CATE_ID'), array_column($merchantCate->toArray(), 'mer_cate_id'))) {
+                if ($order->orderProduct[0]->product->isPlatformCard()) {
                     //购物卡自动发货
                     $deliveryData = [
                         'delivery_type' => 3,
diff --git a/app/controller/merchant/store/order/OrderOther.php b/app/controller/merchant/store/order/OrderOther.php
index 9781afea..92587a07 100755
--- a/app/controller/merchant/store/order/OrderOther.php
+++ b/app/controller/merchant/store/order/OrderOther.php
@@ -68,7 +68,7 @@ class OrderOther extends BaseController
         }
         $where['paid']=1;
         if($where['source']<=0){
-            $where['source']=105;
+            $where['source']=12;
         }
         return app('json')->success($this->repository->merchantGetList($where, $page, $limit));
     }
diff --git a/crmeb/listens/OrderDeliveryListen.php b/crmeb/listens/OrderDeliveryListen.php
index 6640fc30..67465549 100644
--- a/crmeb/listens/OrderDeliveryListen.php
+++ b/crmeb/listens/OrderDeliveryListen.php
@@ -16,8 +16,7 @@ class OrderDeliveryListen implements ListenerInterface
     {
         $order = $event['order'];
         foreach ($order->orderProduct as $orderProduct) {
-            $merchantCate = $orderProduct->product->merCateId;
-            if (empty($merchantCate) || $merchantCate[0]['mer_cate_id'] != env('PLATFORM_CARD_CATE_ID')) {
+            if (!$orderProduct->product->isPlatformCard()) {
                 continue;
             }
             $consumption = StoreConsumption::where('type', StoreConsumption::TYPE_PULL_CONSUMPTION)->find();