From 9de3c1bde1e8ffaf6bf51e35f8ab887f1de4c4c7 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Thu, 29 Feb 2024 14:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=AD=E7=89=A9=E5=8D=A1?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/StoreOrderCreateRepository.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 3769d88e..f46ae5cd 100755 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -84,10 +84,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $activityProductCount = 0; //判断是否是平台购物卡,购物卡不允许使用任何优惠券 $merchantCate = $merchantCartList[0]['list'][0]->product->merCateId; - $isPlatformCard = false; - if (!empty($merchantCate) && in_array(env('PLATFORM_CARD_CATE_ID'), array_column($merchantCate->toArray(), 'mer_cate_id'))) { - $isPlatformCard = true; - } + $isPlatformCard = $merchantCart['list'][0]['product']->isPlatformCard(); if ($isPlatformCard) { $merchantTypeId = Merchant::where('uid', $uid)->value('type_id'); if (empty($merchantTypeId) || $merchantTypeId != 21) { @@ -552,12 +549,16 @@ class StoreOrderCreateRepository extends StoreOrderRepository 'is_fail' => 0 ]; - $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') - ->field('coupon_user_id,uid,coupon_title,coupon_price,balance,start_time,end_time') - ->select()->each(function ($item) { - $item['describe'] = '仅限平台指定商家商品可使用'; - return $item; - }); + if ($isPlatformCard) { + $platformConsumption = []; + } else { + $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') + ->field('coupon_user_id,uid,coupon_title,coupon_price,balance,start_time,end_time') + ->select()->each(function ($item) { + $item['describe'] = '仅限平台指定商家商品可使用'; + return $item; + }); + } // } $usePlatformCouponId = 0;