用户列表页面修改

backend/controllers/v1/shopuser/ShopUserListController.php

@@ -8,6 +8,7 @@ use backend\models\v1\shopuser\ShopUserList;
 use app\models\v1\shopuser\ShopUserMembergrade;
 use backend\models\v1\shopuser\ShopUserMembergrandeRelation;
 use yii\web\BadRequestHttpException;
+use yii\data\ActiveDataProvider;
 class ShopUserListController extends BaseController
 {   
     public $modelClass = 'backend\models\v1\shopuser\ShopUserList';
@@ -17,13 +18,13 @@ class ShopUserListController extends BaseController
      *   tags={"用户&员工接口"},
      *   summary="员工信息(张晓林)",
      *   description="用户列表",
-     *   @OA\Parameter(name="用户名",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="会员卡号",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="创建时间",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="用户组",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="手机号/账号",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="绑定会员",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="page",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="NAME",description="用户名",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="MEMBER_NO",description="会员卡号",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="CREATE_DATE",description="创建时间",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="USER_GROUP_GUID",description="用户组",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="CODE",description="手机号/账号",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="BINDCARD",description="绑定会员",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="page",description="分页页码",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                NAME:用户姓名,
      *                CREATE_DATE:注册时间,
@@ -39,17 +40,41 @@ class ShopUserListController extends BaseController
         
         $param = Yii::$app->request->get();
         $ShopUserList = new ShopUserList();
-        $userList = $ShopUserList->getUserList($param);
-        $data['data'] = $userList;
-        //获取所有用户组
-        $data['memberGradeList'] = $this->getMemberGradeList();
-        if(empty($userList)){
-            throw new BadRequestHttpException('未找到查询数据');
+        $query = $ShopUserList::find()
+        ->select(['GUID','NAME','CREATE_DATE','USER_GROUP_GUID','CODE','WX_NO','LABEL','CONSUMPTION_POINT'])
+        ->orderBy('UPDATE_DATE');
+        if(isset($param['NAME']) && !empty($param['NAME'])){
+            $query->andWhere(['=','NAME',trim($param['NAME'])]);
         }
-        return [
-            'CODE'=>200,
-            'DATA'=>$data
-        ];
+        
+        if(isset($param['MEMBER_NO']) && !empty($param['MEMBER_NO'])){
+            $query->andWhere(['=','MEMBER_NO',trim($param['MEMBER_NO'])]);
+        }
+        if(isset($param['CREATE_DATE']) && !empty($param['CREATE_DATE'])){
+            $query->andWhere(['=','CREATE_DATE',trim($param['CREATE_DATE'])]);
+        }
+        if(isset($param['USER_GROUP_GUID']) && !empty($param['USER_GROUP_GUID'])){
+            $query->andWhere(['like','USER_GROUP_GUID',trim($param['USER_GROUP_GUID'])]);
+        }
+        if(isset($param['CODE']) && !empty($param['CODE'])){
+            $query->andWhere(['=','CODE',trim($param['CODE'])]);
+        }
+        if(isset($param['BINDCARD'])){
+            if($param['BINDCARD'] == 0){
+                $query->andWhere(['=','BINDCARD','']);
+            }elseif($param['BINDCARD'] == 1){
+                $query->andWhere(['!=','BINDCARD','']);
+            }
+        }
+    // echo $query->createCommand()->getRawSql();
+        return new ActiveDataProvider(
+            [
+                'query' => $query,
+                'pagination' => [
+                    'pageSize' => 15,
+                ]
+            ]
+        );
 
     }
 
@@ -59,7 +84,7 @@ class ShopUserListController extends BaseController
      *   tags={"用户&员工接口"},
      *   summary="员工信息(张晓林)",
      *   description="用户详细信息",
-     *   @OA\Parameter(name="GUID",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="GUID",description="用户GUID",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                NAME:用户姓名,
      *                CREATE_DATE:注册时间,
@@ -114,7 +139,7 @@ class ShopUserListController extends BaseController
      *   tags={"用户&员工接口"},
      *   summary="员工删除(张晓林)",
      *   description="员工删除",
-     *   @OA\Parameter(name="GUID",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="GUID",description="用户GUID",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="操作成功"),
      *   security={{"Authorization": {}}}
      * )