From 2d1cb8f485363af8fa6b8946f3fd0ab945303e0f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 19:54:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(OrderLogic,=20StoreOrderLogic):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E4=B8=8E=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E6=96=B9=E5=BC=8F=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA=E9=97=A8=E5=BA=97=E8=87=AA=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php               | 2 +-
 app/common/logic/store_order/StoreOrderLogic.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index b6214b8e2..8f84b06a4 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -162,7 +162,7 @@ class OrderLogic extends BaseLogic
                 'reservation_time' => $params['reservation_time'] ?? null,
                 'cart_id' => implode(',', $cartId),
                 'store_id' => $params['store_id'] ?? 0,
-                'shipping_type' => $params['shipping_type'] ?? 1, //配送方式 1=快递 ，2=门店自提
+                'shipping_type' => $params['shipping_type'] ?? 2, //配送方式 1=快递 ，2=门店自提
                 'activity' => '减免',
                 'activity_price' => self::$activity_price,
                 'activities' => $check['status'],
diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index e07ac5b59..efd577288 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -104,7 +104,7 @@ class StoreOrderLogic extends BaseLogic
                 'reservation_time' => $params['reservation_time'] ?? null,
                 'cart_id' => implode(',', $cartId),
                 'store_id' => $params['store_id'] ?? 0,
-                'shipping_type' => $params['shipping_type'] ?? 1,//配送方式 1=快递 ，2=门店自提
+                'shipping_type' => $params['shipping_type'] ?? 2,//配送方式 1=快递 ，2=门店自提
                 'activity' =>'减免',
                 'activity_price' =>self::$activity_price,
                 'activities'=>$check['status'],