Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/api/controller/Merchant.php

@@ -137,8 +137,12 @@ class Merchant extends Controller
         $sort = empty($sort) ? "merchant_id" : $sort;
         $params = $this->request->param();
         $params['is_select_mechant'] = 1;
-        $list = $model->getList($params, intval($pageSize), $sort)->toArray();
 
+
+
+        $list = $model->getList($params, intval($pageSize), $sort)->toArray();
+        $param = $this->request->param();
+        $param['storeInfo'] = $this->storeInfo;
         foreach ($list['data'] as $kr => $r) {
             $res[$kr]['licenseImg'] = [];
             if ($r['license_img_id']) {
@@ -148,7 +152,7 @@ class Merchant extends Controller
             }
 
             $modelgoods = new GoodsModel;
-            $param = $this->request->param();
+
             $param['merchantId'] = $r['merchant_id'];
             $listgoods = $modelgoods->getList($param, 3);
             $list['data'][$kr]['goodsInfo'] = $listgoods;

app/common/model/Goods.php

@@ -393,7 +393,8 @@ class Goods extends BaseModel
                 $query = $query->whereRaw('goods_name like ? or goods_no like ?', ["%{$val}%", "%{$val}%"]);
             }
         }
-        $storeIds = [$storeId];
+        $storeIds = [$storeId ? $storeId : ($param['storeInfo']['store_id'] ?? 0)];
+
         if (isset($param['storeInfo']['p_store_id']) && $param['storeInfo']['p_store_id']) {
             $storeIds[] = $param['storeInfo']['p_store_id'];
         }
@@ -437,6 +438,7 @@ class Goods extends BaseModel
             }
             
         } else {
+
             // 执行查询
             $list = $query->with(['images.file'])
                 ->alias($this->name)
@@ -446,6 +448,7 @@ class Goods extends BaseModel
                 ->group("goods.goods_id")
                 ->order($sort)
                 ->paginate($listRows);
+
         }