refactor(merchant): 优化推荐商品查询逻辑

- 移除原有的 product_list 方法调用，改用直接查询 store_product 表
- 添加对 mer_id、product_id、is_show、status、is_del 的条件筛选
- 通过 pvParm 方法补充 yanglao/pv/jifen/gongxian 等格式化字段
- 移除原有的关键词、排序、分类等筛选条件
- 优化数据匹配逻辑，提升查询效率

app/controller/api/store/merchant/Merchant.php

@@ -230,22 +230,30 @@ class Merchant extends BaseController
                         }
 
                         if (!empty($pageMatchIds)) {
-                            // 4. 通过 productList 获取完整格式的推荐商品数据
-                            $recommendWhere = $where;
-                            unset($recommendWhere['keyword'], $recommendWhere['order'], $recommendWhere['mer_cate_id'], $recommendWhere['cate_id'], $recommendWhere['price_on'], $recommendWhere['price_off'], $recommendWhere['brand_id']);
-                            $recommendResult = $this->repository->productList($id, array_merge($recommendWhere, [
-                                'is_gift_bag' => 0,
-                                'is_used' => 1,
-                                'product_type' => 0,
-                                'is_hide' => 0,
-                            ]), 1, count($pageMatchIds), $this->userInfo, $type439, $is_commercetrade);
+                            // 4. 直接用 pageMatchIds 查询 store_product 表获取基础数据
+                            // 再通过 pvParm 补充 yanglao/pv/jifen/gongxian 等格式化字段
+                            $baseProducts = Db::name('store_product')
+                                ->where('mer_id', $id)
+                                ->whereIn('product_id', $pageMatchIds)
+                                ->where('is_show', 1)
+                                ->where('status', 1)
+                                ->where('is_del', 0)
+                                ->select();
+                            $baseProducts = $baseProducts->toArray();
 
                             $matchList = [];
-                            if (!empty($recommendResult['list'])) {
-                                foreach ($recommendResult['list'] as $rp) {
-                                    if (in_array($rp['product_id'], $pageMatchIds) && !in_array($rp['product_id'], $existIds)) {
-                                        $matchList[] = $rp;
-                                    }
+                            if (!empty($baseProducts)) {
+                                foreach ($baseProducts as $bp) {
+                                    // 补充 pv/yanglao/jifen/gongxian 等字段
+                                    $pvData = app()->make(ProductRepository::class)->pvParm($bp['product_id']);
+                                    $bp['yanglao'] = $pvData['yanglao'] ?? '';
+                                    $bp['pv'] = $pvData['pv'] ?? '';
+                                    $bp['jifen'] = $pvData['jifen'] ?? '';
+                                    $bp['gongxian'] = $pvData['gongxian'] ?? '';
+                                    $bp['jfduihuan'] = $pvData['jfduihuan'] ?? '';
+                                    $bp['jdduihuan'] = $pvData['jdduihuan'] ?? '';
+                                    $bp['fzone_paytype'] = $pvData['fzone_paytype'] ?? '';
+                                    $matchList[] = $bp;
                                 }
                             }