From 444b011d0f5dc89e39d5b28805cb4cd5ae4491ad Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\Administrator" <604446095@qq.com>
Date: Thu, 5 Dec 2024 17:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/store_product/StoreProductLists.php    | 10 +++++++++-
 .../store_product_price/StoreProductPriceLists.php     |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php
index 7af3427e6..2a505cc47 100644
--- a/app/admin/lists/store_product/StoreProductLists.php
+++ b/app/admin/lists/store_product/StoreProductLists.php
@@ -9,8 +9,10 @@ use app\common\model\store_product\StoreProduct;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_category\StoreCategory;
+use app\common\model\store_product_group_price\StoreProductGroupPrice;
 use app\common\model\store_product_unit\StoreProductUnit;
 use app\common\model\system_store\SystemStore;
+use app\common\model\user\User;
 use app\common\model\warehouse_product_storege\WarehouseProductStorege;
 use app\common\lists\ListsExcelInterface;
 
@@ -62,10 +64,11 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
             }
         }
         $is_warehouse=$this->request->get('is_warehouse',0);
-        return StoreProduct::where($this->searchWhere)
+        $list = StoreProduct::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) use($is_warehouse) {
+                $item['product_id'] = $item['id'];
                 $item['bar_code_two'] = '';
                 if (in_array($item['unit'], [2, 21])) {
                     $item['bar_code_two'] = $item['bar_code'];
@@ -110,6 +113,11 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
                 }
                 return $item;
             })?->toArray();
+        if (!empty($this->params['user_id'])) {
+            $userShip = User::where('id', $this->params['user_id'])->value('user_ship');
+            $list = StoreProductGroupPrice::resetProductsPrice($list, $userShip);
+        }
+        return $list;
     }
 
 
diff --git a/app/admin/lists/store_product_price/StoreProductPriceLists.php b/app/admin/lists/store_product_price/StoreProductPriceLists.php
index f5eb769df..7995c7d81 100644
--- a/app/admin/lists/store_product_price/StoreProductPriceLists.php
+++ b/app/admin/lists/store_product_price/StoreProductPriceLists.php
@@ -52,8 +52,9 @@ class StoreProductPriceLists extends BaseAdminDataLists implements ListsSearchIn
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
-                $find = StoreProduct::where('id', $item['product_id'])->field('image,store_name')->find();
+                $find = StoreProduct::where('id', $item['product_id'])->field('image,store_name,store_info')->find();
                 $item['store_name']=$find['store_name'];
+                $item['store_info']=$find['store_info'];
                 $item['image']=$find['image'];
                 $item['status_name']=$item['status']==0?"未设置":"已设置";
             })