From d4184391fb003776c4d187c4c5a9150b59e378cc Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 26 Jun 2024 15:29:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(CartList.php):=20=E4=BF=AE=E6=AD=A3?=
 =?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 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index a76d8c17b..de0fc8e24 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -73,13 +73,11 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
             if ($find) {
                 if($off_activity==1){
                     $this->activity_price = bcadd(bcmul($find['cost'],$item['cart_num'], 2), $this->activity_price, 2);
-                    $item['price'] = $find['cost'];
-                }else{
-                    $item['price'] = $find['price'];
                 }
                 $item['goods_total_price'] = bcmul($item['cart_num'], $find['price'], 2);
                 $this->total_price = bcadd($this->total_price, $item['goods_total_price'], 2);
                 $item['imgs'] = $find['image'];
+                $item['price'] = $find['price'];
                 $item['cost'] = $find['cost'];
                 $item['goods_name'] = $find['store_name'];
                 $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');