From 41c77533b8778a6cb66c9143fd6f85a9726afbe2 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 26 Jun 2024 15:28:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(CartList):=20=E6=A0=B9=E6=8D=AE=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=92=8C=E6=94=AF=E4=BB=98=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=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  | 9 +++++----
 app/store/lists/cart/CartList.php | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index c7c4ed8be..a76d8c17b 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -65,7 +65,6 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
         $off_activity = Config::where('name', 'off_activity')->value('value');
         $this->off_activity=$off_activity;
         foreach ($list as $key => &$item) {
-
             $find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']])
                 ->field('product_id,image,price,cost,store_name,unit,delete_time,vip_price')
                 ->withTrashed()
@@ -74,11 +73,13 @@ 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');
@@ -114,8 +115,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
         ];
         if($this->off_activity==1){
             $data['pay_price']=$this->activity_price;
-            if($this->total_price<500){
-                $data['msg']='还差'.bcsub(500,$this->total_price,2).'元可获得10%品牌礼品券';
+            if($this->activity_price<500){
+                $data['msg']='还差'.bcsub(500,$this->activity_price,2).'元可获得10%品牌礼品券';
                 $data['pay_price']= $this->activity_price;
             }
         }
diff --git a/app/store/lists/cart/CartList.php b/app/store/lists/cart/CartList.php
index 36d01580f..47ab41107 100644
--- a/app/store/lists/cart/CartList.php
+++ b/app/store/lists/cart/CartList.php
@@ -64,13 +64,15 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
                 ->find();
 
             if ($find) {
-                if ($off_activity == 1) {
-                    $this->activity_price = bcadd(bcmul($find['cost'], $item['cart_num'], 2), $this->activity_price, 2);
+                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['image'] = $find['image'];
-                $item['price'] = $find['price'];
                 $item['cost'] = $find['cost'];
                 $item['store_name'] = $find['store_name'];
                 $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');