From e74fddfdf5859b9404de71946f90320e611aa51a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 18 Jan 2024 09:53:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/store/order/StoreOrderCreateRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 1fb0eea3..62e98a7d 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -494,7 +494,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository 'is_fail' => 0 ]; $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') - ->filed('uid,coupon_title,coupon_price') + ->field('uid,coupon_title,coupon_price') ->select(); if($platformConsumption){ $consumption=$platformConsumption[0]; From 28265c9d79f3745f9a96a4f4077c7ba91a2007ac Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 18 Jan 2024 09:55:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/store/order/StoreOrderCreateRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 62e98a7d..253ff157 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -496,7 +496,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') ->field('uid,coupon_title,coupon_price') ->select(); - if($platformConsumption){ + if(count($platformConsumption)>1){ $consumption=$platformConsumption[0]; } } From a9177fa2d0abae11c53ec71a3a24141472ca931c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 18 Jan 2024 11:18:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/store/order/StoreOrderCreateRepository.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 253ff157..8ced1098 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -602,7 +602,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository $total_price = $order_total_price; $openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0; $total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2); + $is_self_pickup=true; return compact( + 'is_self_pickup', 'order_type', 'source', 'order_model',