update:set

application/services/goods/GoodsService.php

@@ -1145,7 +1145,7 @@ class GoodsService
             $where['goods_name'] = $params['goods_name'];
         }
 
-        $list = GoodsSku::getRecordMaster($where);
+        $list = GoodsSku::getRecords($where);
         return $list;
     }
 

application/services/shop/ShopService.php

@@ -123,9 +123,21 @@ class ShopService
     {
         $params['page'] = !empty($params['page']) ? $params['page'] : 1;
         $limit = !empty($params['page_size']) ? $params['page_size'] : 20;
+        $subShopId = !empty($params['sub_shop_id']) ? $params['sub_shop_id'] : '';
+        $lifeAccountId = !empty($params['life_account_id']) ? $params['life_account_id'] : '';
+ 
         $page = ($params['page'] - 1) * $limit;
         $where['ORDER'] = ["create_time" => "DESC"];
         $where['LIMIT'] = [$page, $limit];
+
+        if (!empty($subShopId)) {
+            $where['sub_shop_id'] =  $subShopId;
+        }
+
+        if (!empty($lifeAccountId)) {
+            $where['life_account_id'] =  $lifeAccountId;
+        }
+
         $list = SubShop::getRecords($where);
         unset($where['LIMIT']);
         unset($where['ORDER']);