From 406fa2831bf815af2595c954c2c1eb44ccf919ef Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 5 Jul 2024 15:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=BB=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/product/ProductLists.php | 16 ++++++++--------
 app/api/logic/order/OrderLogic.php     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 422e96207..81be9bb87 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -117,19 +117,19 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L
     public function extend()
     {
         $off_activity = Config::where('name', 'off_activity')->value('value');
-        if($off_activity==1){
-            $data=[
-                'off_activity' => $off_activity,
-                'price' => 'cost',
-                'op_price' => 'price',
-            ];
-        }else{
+//        if($off_activity==1){
+//            $data=[
+//                'off_activity' => $off_activity,
+//                'price' => 'cost',
+//                'op_price' => 'price',
+//            ];
+//        }else{
             $data=[
                 'off_activity' => $off_activity,
                 'price' => 'price',
                 'op_price' => 'price',
             ];
-        }
+//        }
         return $data;
     }
 }
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index aeec1b149..9f11d63fb 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -91,11 +91,11 @@ class OrderLogic extends BaseLogic
                 }
                 unset($cart_select[$k]['id']);
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
-                if ($off_activity == 1) {
-                    $price = $find['cost'];
-                } else {
+//                if ($off_activity == 1) {
+//                    $price = $find['cost'];
+//                } else {
                     $price = $find['price'];
-                }
+//                }
                 $cart_select[$k]['price'] = $price;
                 $cart_select[$k]['cost'] = $find['cost'];
                 $cart_select[$k]['vip'] = 0;