From 4112b6ffe3e4560d9bbda59c4443d59802a8d0c7 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 19 Jun 2024 11:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=94=B6=E9=93=B6=E5=B1=95=E7=A4=BA=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/store_order/StoreOrderLogic.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index 85118090..972e4ebe 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -112,8 +112,10 @@ class StoreOrderLogic extends BaseLogic
             }
             if ($user && $user['user_ship'] == 1) {
                 $pay_price = self::$pay_price;
+                $activity_string = '';
             }else{
                 $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
+                $activity_string = '减免';
             }
   
             $vipPrice = 0;
@@ -132,7 +134,7 @@ class StoreOrderLogic extends BaseLogic
                 'cart_id' => implode(',', $cartId),
                 'store_id' => $params['store_id'] ?? 0,
                 'shipping_type' =>3,//配送方式 1=快递 ，2=门店自提
-                'activity' =>'减免',
+                'activity' =>$activity_string,
                 'activity_price' =>self::$activity_price,//活动优惠价
                 'activities' => self::$activity_price>0?1:0,
                 'default_delivery'=>1,