From 9e240a5488ade559b124354c818ce816d512cfa8 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 16:44:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(CartList,=20ProductLists):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=B4=BB=E5=8A=A8=E7=89=B9=E4=BB=B7?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/CartList.php       |  8 ++++----
 app/api/lists/product/ProductLists.php | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index 3990c14e..f879555d 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -58,15 +58,15 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
                 return $item;
             })
             ->toArray();
-        $check = DictType::where('type', 'activities')->find();
+        // $check = DictType::where('type', 'activities')->find();
 
         foreach ($list as $key => &$item) {
             $find = StoreBranchProduct::where(['id' => $item['product_id']])
                 ->field('product_id,image,price,cost,store_name,unit')
                 ->find();
-            if (isset($check) && $check['status'] == 1) {
-                $find['price'] = $find['cost'];
-            }
+            // if (isset($check) && $check['status'] == 1) {
+            //     $find['price'] = $find['cost'];
+            // }
             if ($find) {
                 $item['goods_total_price'] = bcmul($item['cart_num'], $find['price'], 2);
                 $this->total_price = bcadd($this->total_price, $item['goods_total_price'], 2);
diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index fa097f08..22da1023 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -140,17 +140,17 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
 
         }
         $check = DictType::where('type','activities')->find();
-        foreach ($data as &$value){
-            if(isset($check) && $check['status'] == 1){
-                // $value['price'] = StoreProduct::where('id',$value['product_id'])->value('ot_price');
-                $value['ot_price'] = $value['price'];
-                $value['price'] = $value['cost'];
-            }
-            $value['is_default'] = 0;
-            if($store_id == 2){
-                $value['is_default'] = 1;
-            }
-        }
+        // foreach ($data as &$value){
+        //     if(isset($check) && $check['status'] == 1){
+        //         // $value['price'] = StoreProduct::where('id',$value['product_id'])->value('ot_price');
+        //         $value['ot_price'] = $value['price'];
+        //         $value['price'] = $value['cost'];
+        //     }
+        //     $value['is_default'] = 0;
+        //     if($store_id == 2){
+        //         $value['is_default'] = 1;
+        //     }
+        // }
         return  $data;
 //        return StoreProduct::where($this->searchWhere)->where($where)
 //            ->field(['id', 'cate_id','store_name','unit', 'ot_price', 'bar_code','image','sales','store_info'])