取商家列表未完成

biz/base/classes/BaseClass.php

@@ -23,14 +23,12 @@ class BaseClass
 		$get = Yii::$app->request->get();
 		$page = isset($get['page']) ? $get['page'] : 1;
 		Yii::$app->params['page'] = $page;
-		//pageSize 已经在common/params.php定义
 		$pageSize = isset($get['pageSize']) && !empty($get['pageSize']) ? $get['pageSize'] : Yii::$app->params['pageSize'];
-		
 		$model = Yii::createObject(['class' => static::$baseFile]);
 		$return = $model->getList($select, $where, $page, $pageSize, $order, $with);
 		return $return;
 	}
-	
+
 	//查询指定条数 shish 2019.11.30
 	public static function getLimitList($select, $where, $limit = 10, $order = '', $with = '')
 	{
@@ -157,12 +155,12 @@ class BaseClass
 		$model = Yii::createObject(['class' => static::$baseFile]);
 		return $model->getCount($condition);
 	}
-
+	
 	//计数器+1-1 shizq 2019-12-05
 	public static function counters($counters, $condition, $params = [])
 	{
 		$model = Yii::createObject(['class' => static::$baseFile]);
 		return $model->counters($counters, $condition, $params);
 	}
-
+	
 }

biz/merchant/services/MerchantService.php

@@ -84,7 +84,7 @@ class MerchantService extends BaseService
 		$merchantIdList = array_column($list, 'merchantId');
 		$asset = MerchantAssetService::getByIds($merchantIdList, null, 'merchantId');
 		foreach ($list as $key => $val) {
-
+			die;
 		}
 		$data['list'] = $list;
 		return $data;