Commit b9371c09 authored by 张晓林's avatar 张晓林

获取用户组

parent 689fd6fc
...@@ -51,6 +51,7 @@ return [ ...@@ -51,6 +51,7 @@ return [
'POST,OPTIONS user-update'=>'user-update', 'POST,OPTIONS user-update'=>'user-update',
'GET,OPTIONS user-delete'=>'user-delete', 'GET,OPTIONS user-delete'=>'user-delete',
'GET,OPTIONS licence-list'=>'licence-list', 'GET,OPTIONS licence-list'=>'licence-list',
'GET,OPTIONS get-member-grade-list'=>'get-member-grade-list',
'GET,OPTIONS licence-detail'=>'licence-detail', 'GET,OPTIONS licence-detail'=>'licence-detail',
'GET,OPTIONS branch-list'=>'branch-list', 'GET,OPTIONS branch-list'=>'branch-list',
], ],
......
...@@ -10,6 +10,7 @@ use backend\models\v1\shopuser\ShopUserMembergradeRelation; ...@@ -10,6 +10,7 @@ use backend\models\v1\shopuser\ShopUserMembergradeRelation;
use yii\web\BadRequestHttpException; use yii\web\BadRequestHttpException;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use backend\helpers\Func; use backend\helpers\Func;
use yii\web\Linkable;
class ShopUserListController extends BaseController class ShopUserListController extends BaseController
{ {
public $modelClass = 'backend\models\v1\shopuser\ShopUserList'; public $modelClass = 'backend\models\v1\shopuser\ShopUserList';
...@@ -17,7 +18,7 @@ class ShopUserListController extends BaseController ...@@ -17,7 +18,7 @@ class ShopUserListController extends BaseController
* @OA\GET( * @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-lists/user-list", * path="/backend/web/v1/shopuser/shop-user-lists/user-list",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="员工信息(张晓林)", * summary="用户列表(张晓林)",
* description="用户列表", * description="用户列表",
* @OA\Parameter(name="NAME",description="用户名",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="MEMBER_NO",description="会员卡号",in="query",@OA\Schema(type="string")),
...@@ -67,23 +68,23 @@ class ShopUserListController extends BaseController ...@@ -67,23 +68,23 @@ class ShopUserListController extends BaseController
$query->andWhere(['!=','BINDCARD','']); $query->andWhere(['!=','BINDCARD','']);
} }
} }
// echo $query->createCommand()->getRawSql();
return new ActiveDataProvider( $provider = new ActiveDataProvider(
[ [
'query' => $query, 'query' => $query,
'pagination' => [ 'pagination' => [
'pageSize' => 3, 'pageSize' => 15,
] ],
] ]
); );
return $provider;
} }
/** /**
* @OA\GET( * @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-lists/user-detail", * path="/backend/web/v1/shopuser/shop-user-lists/user-detail",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="员工信息(张晓林)", * summary="用户详细信息(张晓林)",
* description="用户详细信息", * description="用户详细信息",
* @OA\Parameter(name="GUID", description="用户GUID",in="query",@OA\Schema(type="string")), * @OA\Parameter(name="GUID", description="用户GUID",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description=" * @OA\Response(response="200",description="
...@@ -163,7 +164,7 @@ class ShopUserListController extends BaseController ...@@ -163,7 +164,7 @@ class ShopUserListController extends BaseController
* @OA\POST( * @OA\POST(
* path="/backend/web/v1/shopuser/shop-user-lists/user-update", * path="/backend/web/v1/shopuser/shop-user-lists/user-update",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="员工信息修改(张晓林)", * summary="用户信息更新(张晓林)",
* description="用户信息更新", * description="用户信息更新",
* @OA\Parameter(name="USERGUID",description="用户GUID",in="query",@OA\Schema(type="string")), * @OA\Parameter(name="USERGUID",description="用户GUID",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="NAME",description="昵称",in="query",@OA\Schema(type="string")), * @OA\Parameter(name="NAME",description="昵称",in="query",@OA\Schema(type="string")),
...@@ -236,9 +237,5 @@ class ShopUserListController extends BaseController ...@@ -236,9 +237,5 @@ class ShopUserListController extends BaseController
} }
public function getMemberGradeList(){
//获取所有用户组
$list = ShopUserMembergrade::find()->select(['GUID','NAME'])->asArray()->all();
return $list;
}
} }
...@@ -191,5 +191,31 @@ class ShopUserMembergradeController extends BaseController ...@@ -191,5 +191,31 @@ class ShopUserMembergradeController extends BaseController
Yii::$app->getResponse()->setStatusCode(204); Yii::$app->getResponse()->setStatusCode(204);
return $model; return $model;
} }
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-membergrades/get-member-grade-list",
* tags={"用户&员工接口"},
* summary="获取所有用户组(张晓林)",
* description="获取所有用户组",
* @OA\RequestBody(
* required=true,
* @OA\MediaType(
* mediaType="application/x-www-form-urlencoded",
* @OA\Schema(
* type="object",
* @OA\Property(property="GUID",description="要删除的用户组GUID",type="string"),
* )
* )
* ),
* @OA\Response(response=200,description="成功时返回access-token"),
* security={{"Authorization": {}}}
* )
*/
public function actionGetMemberGradeList(){
//获取所有用户组
$model = new $this->modelClass();
$list = $model::find()->select(['GUID','NAME'])->asArray()->all();
return $list;
}
} }
\ No newline at end of file
...@@ -5,8 +5,11 @@ use yii\data\ActiveDataProvider; ...@@ -5,8 +5,11 @@ use yii\data\ActiveDataProvider;
use app\models\v1\BaseModel; use app\models\v1\BaseModel;
use backend\models\v1\shopuser\ShopUserMembergradeRelation; use backend\models\v1\shopuser\ShopUserMembergradeRelation;
use app\models\v1\shopuser\ShopUserMembergrade; use app\models\v1\shopuser\ShopUserMembergrade;
use yii\web\Linkable;
class ShopUserList extends BaseModel{ class ShopUserList extends BaseModel{
public $memberGradeList;
public static function tableName() public static function tableName()
{ {
return 'shop_user'; return 'shop_user';
...@@ -29,7 +32,9 @@ class ShopUserList extends BaseModel{ ...@@ -29,7 +32,9 @@ class ShopUserList extends BaseModel{
[['NAME','MEMBER_NO','CREATE_DATE','USER_GROUP_GUID','CODE','BINDCARD'],'string'] [['NAME','MEMBER_NO','CREATE_DATE','USER_GROUP_GUID','CODE','BINDCARD'],'string']
]; ];
} }
public function getMemberGradeList(){
return $this->memberGradeList;
}
public function attributeLabels() public function attributeLabels()
{ {
return [ return [
...@@ -37,46 +42,6 @@ class ShopUserList extends BaseModel{ ...@@ -37,46 +42,6 @@ class ShopUserList extends BaseModel{
]; ];
} }
public function getUserList($param){
$query = self::find()->from('shop_user')
->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'])]);
}
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->all(),
'pagination' => [
'pageSize' => 15,
]
]
);
}
public function userDelete($param){ public function userDelete($param){
$user = self::findOne($param['GUID']); $user = self::findOne($param['GUID']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment