wesmiler

app/Http/Controllers/Api/v1/AccountController.php

@@ -52,6 +52,7 @@ class AccountController extends webApp
             ['id'=>10,'name'=>'佣金/提成'],
             ['id'=>11,'name'=>'打赏小费'],
             ['id'=>12,'name'=>'团队奖励'],
+            ['id'=>25,'name'=>'付款给商家'],
             ['id'=>99,'name'=>'其他'],
 //            ['id'=>13,'name'=>'管理奖励'],
 //            ['id'=>14,'name'=>'点对点奖励'],

app/Http/Controllers/Api/v1/MerchantController.php

@@ -34,17 +34,15 @@ class MerchantController extends webApp
 
 
     /**
-     * 管理主页数据
+     * 商家列表
      * @return array
      */
     public function index()
     {
-        $info = MemberService::make()->getInfo($this->userId, 'home');
-        if($info){
-            return showJson(1010, true, $info);
-        }else{
-            return showJson(1004, false, [],'403');
-        }
+        $params = request()->post();
+        $pageSize = request()->post('pageSize', 6);
+        $datas = MerchantService::make()->getDataList($params, $pageSize);
+        return showJson(1010, true, $datas);
     }
 
     /**

app/Services/Api/MerchantService.php

@@ -74,8 +74,12 @@ class MerchantService extends BaseService
                 'pageSize'=>$pageSize
             ];
         }
-        $field = $field ? $field : 'lev_a.id,lev_a.user_id,lev_a.name,lev_a.logo,lev_a.type,lev_a.category_id,lev_a.business_scope,lev_a.service_time,lev_a.deposit,lev_a.service_order_num,lev_a.score_rate,lev_a.city,lev_a.lng,lev_a.lat,lev_a.status';
+        $field = $field ? $field : 'lev_a.id,lev_a.user_id,lev_a.name,lev_a.logo,lev_a.type,lev_a.category_id,lev_a.business_scope,lev_a.service_time,lev_a.city,lev_a.status';
         $order = 'lev_a.id desc';
+        $sortType = isset($params['sort_type'])? $params['sort_type'] : 0;
+        if($sortType == 1){
+            $order = 'lev_a.receive_num desc, lev_a.create_time desc';
+        }
 
         $datas = $this->model->from('merchant as a')
             ->leftJoin('member as b','b.id','=','a.user_id')