From 42f4e3d1d34d30787502d778339c51e0136d8d86 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 26 Jun 2024 11:17:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(CartList):=20=E4=BF=AE=E6=94=B9=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6API=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E6=B4=BB=E5=8A=A8=E8=B0=83=E6=95=B4=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=92=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/CartList.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index 16875867c..342e7bf21 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -122,15 +122,14 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
         $data= [
             'off_activity' => $this->off_activity,
             'total_price' => $this->total_price,
-            'activity_price' => $this->activity_price,
             'msg' => '',
             'pay_price' => bcsub($this->total_price, $this->activity_price, 2)
         ];
         if($this->off_activity==1){
             $data['pay_price']=$this->activity_price;
             if($this->total_price<500){
-                $data['msg']='还差'.bcsub(500,$this->total_price,2).'元可参与满减活动';
-                $data['pay_price']= $this->total_price;
+                $data['msg']='还差'.bcsub(500,$this->total_price,2).'元可获得10%品牌礼品券';
+                $data['pay_price']= $this->activity_price;
             }
         }
         return $data;