From c37634af7d1b7bac7bf5eb7d3e9f151873c5cfec Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Tue, 25 Feb 2025 12:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/product/ProductLists.php              |  6 ++++--
 .../StoreProductGroupPrice.php                      | 13 +++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 7be46712..05fc6f4f 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -105,7 +105,7 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis
         $user_ship=-1;
         if ($uid > 0) {
             $user_ship = User::where('id', $uid)->value('user_ship');
-            if (in_array($user_ship, [4, 6, 7]) && !empty($this->params['store_id']) && !SystemStore::isSelfOperate($this->params['store_id'])) {
+            if ($user_ship == 4 && !empty($this->params['store_id']) && !SystemStore::isSelfOperate($this->params['store_id'])) {
                 $fields = 'id,id product_id,top_cate_id,cate_id,store_name,cost,vip_price,purchase,cost price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock,is_lack';
             }
         }
@@ -119,6 +119,9 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis
             ->limit($this->limitOffset, $this->limitLength)
             ->order($order)
             ->select()->each(function ($item) use ($tag, $off_activity, $user_ship) {
+                if ($user_ship > 0 && $user_ship != 4) {
+                    $item['price'] = $item['vip_price'];
+                }
                 if ($off_activity == 0 && $user_ship == 5 && $item['top_cate_id'] == 15189) {
                     $item['price'] = $item['cost'];
                 }
@@ -129,7 +132,6 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis
                 return $item;
             })
             ->toArray();
-        $list = StoreProductGroupPrice::resetStoreProductsPrice($list, $user_ship, $this->params['store_id'] ?? 0);
         return $list;
     }
 
diff --git a/app/common/model/store_product_group_price/StoreProductGroupPrice.php b/app/common/model/store_product_group_price/StoreProductGroupPrice.php
index d852047e..ce03256d 100644
--- a/app/common/model/store_product_group_price/StoreProductGroupPrice.php
+++ b/app/common/model/store_product_group_price/StoreProductGroupPrice.php
@@ -42,14 +42,11 @@ class StoreProductGroupPrice extends BaseModel
 
     public static function resetProductPrice($product, $userShip)
     {
-        $groupPrice = StoreProductPrice::whereIn('product_id', $product['id'])->field('product_id,purchase,cost,vip_price,price')->find();
-        if (!empty($groupPrice) && $groupPrice['product_id'] == $product['id']) {
-            if ($userShip > 0) {
-                if ($userShip == 4) {
-                    $product['price'] = $groupPrice['cost'];
-                } else {
-                    $product['price'] = $groupPrice['vip_price'];
-                }
+        if ($userShip > 0) {
+            if ($userShip == 4) {
+                $product['price'] = $product['cost'];
+            } else {
+                $product['price'] = $product['vip_price'];
             }
         }
         return $product;