From 995443f6667c386b77d0d720e58d2d20150baf54 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 25 Jun 2024 10:24:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(CartList.php):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index 76e9ddf34..16875867c 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -74,7 +74,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
 
             if ($find) {
                 if($off_activity==1){
-                    $this->activity_price = bcadd(bcmul($find['cost'],$find['cart_num'], 2), $this->activity_price, 2);
+                    $this->activity_price = bcadd(bcmul($find['cost'],$item['cart_num'], 2), $this->activity_price, 2);
                 }else{
                     if ($user && $user['user_ship'] == 1) {
                         //更新 会员为1的时候原价减去会员价
@@ -128,8 +128,9 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
         ];
         if($this->off_activity==1){
             $data['pay_price']=$this->activity_price;
-            if($this->activity_price<500){
-                $data['msg']='还差'.bcsub(500,$this->activity_price,2).'元可参与满减活动';
+            if($this->total_price<500){
+                $data['msg']='还差'.bcsub(500,$this->total_price,2).'元可参与满减活动';
+                $data['pay_price']= $this->total_price;
             }
         }
         return $data;