From 9124e4cafcaa2c4a67216b05a102a7a159bf4fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 4 Jan 2023 14:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E6=83=A0=E5=88=B8=E9=97=AE=E9=A2=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/dao/activity/coupon/StoreCouponIssueDao.php     | 8 +++++---
 .../services/activity/coupon/StoreCouponUserServices.php  | 2 +-
 crmeb/app/services/order/StoreOrderComputedServices.php   | 2 +-
 crmeb/app/services/order/StoreOrderCreateServices.php     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/crmeb/app/dao/activity/coupon/StoreCouponIssueDao.php b/crmeb/app/dao/activity/coupon/StoreCouponIssueDao.php
index e97d068b7..b4bf3acfa 100644
--- a/crmeb/app/dao/activity/coupon/StoreCouponIssueDao.php
+++ b/crmeb/app/dao/activity/coupon/StoreCouponIssueDao.php
@@ -101,9 +101,11 @@ class StoreCouponIssueDao extends BaseDao
             }])
             ->where('type', $type)
             ->when($type == 1, function ($query) use ($typeId) {
-                if ($typeId) $query->where('id', 'in', function ($query) use ($typeId) {
-                    $query->name('store_coupon_product')->whereIn('category_id', $typeId)->field(['coupon_id'])->select();
-                })->whereOr('category_id', 'in', $typeId);
+                $query->where(function ($query) use ($typeId) {
+                    $query->where('id', 'in', function ($query) use ($typeId) {
+                        $query->name('store_coupon_product')->whereIn('category_id', $typeId)->field(['coupon_id'])->select();
+                    })->whereOr('category_id', 'in', $typeId);
+                });
             })
             ->when($type == 2, function ($query) use ($typeId) {
                 if ($typeId) $query->whereFindinSet('product_id', $typeId);
diff --git a/crmeb/app/services/activity/coupon/StoreCouponUserServices.php b/crmeb/app/services/activity/coupon/StoreCouponUserServices.php
index 927f50ea0..59f4d35df 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponUserServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponUserServices.php
@@ -145,7 +145,7 @@ class StoreCouponUserServices extends BaseServices
                     case 1://品类券
                         /** @var StoreCategoryServices $storeCategoryServices */
                         $storeCategoryServices = app()->make(StoreCategoryServices::class);
-                        $coupon_category = explode(',', $coupon['category_id']);
+                        $coupon_category = explode(',', (string)$coupon['category_id']);
                         $category_ids = $storeCategoryServices->getAllById($coupon_category);
                         if ($category_ids) {
                             $cateIds = array_column($category_ids, 'id');
diff --git a/crmeb/app/services/order/StoreOrderComputedServices.php b/crmeb/app/services/order/StoreOrderComputedServices.php
index c9020df66..ebd0e6bb4 100644
--- a/crmeb/app/services/order/StoreOrderComputedServices.php
+++ b/crmeb/app/services/order/StoreOrderComputedServices.php
@@ -175,7 +175,7 @@ class StoreOrderComputedServices extends BaseServices
                 case 1://品类券
                     /** @var StoreCategoryServices $storeCategoryServices */
                     $storeCategoryServices = app()->make(StoreCategoryServices::class);
-                    $coupon_category = explode(',', $couponInfo['category_id']);
+                    $coupon_category = explode(',', (string)$couponInfo['category_id']);
                     $category_ids = $storeCategoryServices->getAllById($coupon_category);
                     if ($category_ids) {
                         $cateIds = array_column($category_ids, 'id');
diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php
index c7ebf12d1..b44e59b3e 100644
--- a/crmeb/app/services/order/StoreOrderCreateServices.php
+++ b/crmeb/app/services/order/StoreOrderCreateServices.php
@@ -650,7 +650,7 @@ class StoreOrderCreateServices extends BaseServices
                     case 1://品类券
                         /** @var StoreCategoryServices $storeCategoryServices */
                         $storeCategoryServices = app()->make(StoreCategoryServices::class);
-                        $coupon_category = explode(',', $couponInfo['category_id']);
+                        $coupon_category = explode(',', (string)$couponInfo['category_id']);
                         $category_ids = $storeCategoryServices->getAllById($coupon_category);
                         if ($category_ids) {
                             $cateIds = array_column($category_ids, 'id');