From 2d6a45c98d2a9801c0b5e0f267372ffe89496ad5 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 5 Jul 2024 19:13:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=9C=9F=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E5=86=BB=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index a6d81319..67bbe2a7 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -598,7 +598,7 @@ class PayNotifyLogic extends BaseLogic
         }
 
         //如果是会员需要返回会员金额
-        if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY) {
+        if ($user_ship>0 && $order['pay_type'] != PayEnum::CASH_PAY && $off_activity !=1) {
             $order['dealVipAmount']= self::dealVipAmount($order,  $order['pay_type']);
         }
         if ($order['spread_uid'] > 0 || $user_ship > 0) {

From a6eb80bbd0a3ff725b0f7d10c7c116a6af42000f Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 5 Jul 2024 19:19:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/CartList.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index d46a2133..e71bcf78 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -112,6 +112,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
             'pay_price' => $this->total_price
         ];
         if($this->off_activity==1){
+            $this->activity_price =  $this->total_price;
             $data['pay_price']=$this->activity_price;
             if($this->activity_price<500){
                 $data['msg']='还差'.bcsub(500,$this->activity_price,2).'即可获得10%的品牌礼品兑换券,可到线下门店兑换礼品。';