From 03364edc9d08510d6dfd2a9f79ccd412c43b32e6 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 26 Feb 2024 11:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E5=8D=A1=E4=BD=8E=E4=BA=8E10?= =?UTF-8?q?00=E5=85=83=E4=B8=8D=E8=B5=A0=E9=80=81=E6=8A=B5=E6=89=A3?= =?UTF-8?q?=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/system/config/ConfigRepository.php | 1 + crmeb/listens/OrderDeliveryListen.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/common/repositories/system/config/ConfigRepository.php b/app/common/repositories/system/config/ConfigRepository.php index 9d282366..c5dec9cf 100644 --- a/app/common/repositories/system/config/ConfigRepository.php +++ b/app/common/repositories/system/config/ConfigRepository.php @@ -296,6 +296,7 @@ class ConfigRepository extends BaseRepository { $config = $this->getWhere(['config_key' => 'upload_type']); $rule = $this->getComponent($config, 0)->value(systemConfig('upload_type')); + /** @var ConfigClassifyRepository $make */ $make = app()->make(ConfigClassifyRepository::class); $rule->control([ [ diff --git a/crmeb/listens/OrderDeliveryListen.php b/crmeb/listens/OrderDeliveryListen.php index e3e4b867..5959baf4 100644 --- a/crmeb/listens/OrderDeliveryListen.php +++ b/crmeb/listens/OrderDeliveryListen.php @@ -30,7 +30,7 @@ class OrderDeliveryListen implements ListenerInterface $couponUser = $repo->sendCoupon($coupon, $order['uid'], StoreCouponUserRepository::SEND_TYPE_BUY); StoreCouponDetail::income($order, $couponUser['coupon_user_id'], $coupon->coupon_price, $coupon['title']); - if (!empty($orderProduct->product->give_coupon_ids)) { + if (!empty($orderProduct->product->give_coupon_ids) && $order->total_price >= 1000) { $giveCoupons = $repo->getGiveCoupon($orderProduct->product->give_coupon_ids); foreach ($giveCoupons as $giveCoupon) { if ($giveCoupon['type'] != StoreCouponRepository::TYPE_STORE_COUPON) {