Skip to content

N
newShopBack
Commit 5e165b84 authored by 孙磊's avatar 孙磊
Browse files
Options

冲突

parents 56d3c0f5 e024d08f
Show whitespace changes
Inline Side-by-side
Showing with 279 additions and 7 deletions
backend/config/urlmanager.php
View file @ 5e165b84
...@@ -11,13 +11,14 @@ return [ ...@@ -11,13 +11,14 @@ return [
'class'=>'yii\rest\UrlRule', 'class'=>'yii\rest\UrlRule',
'controller'=>[ 'controller'=>[
'swagger', 'swagger',
'v1/shop/branch/branch', 'v1/branch/branch',
'v1/rbacuser/rbac-user', 'v1/rbacuser/rbac-user',
'v1/shopuser/shop-user-membergrade', 'v1/shopuser/shop-user-membergrade',
'v1/shopuser/user-department', 'v1/shopuser/user-department',
'v1/shopuser/shop-user', 'v1/shopuser/shop-user',
'v1/shopuser/user-complain', 'v1/shopuser/user-complain',
'v1/branch/branch-service-type', 'v1/branch/branch-service-type',
'v1/shopuser/shop-user-list',
], ],
'extraPatterns'=>[ 'extraPatterns'=>[
'GET,OPTIONS test'=>'test', 'GET,OPTIONS test'=>'test',
...@@ -37,6 +38,10 @@ return [ ...@@ -37,6 +38,10 @@ return [
'POST,OPTIONS add-branch-service' => 'add-branch-service', 'POST,OPTIONS add-branch-service' => 'add-branch-service',
'PUT,OPTIONS revise-branch-service' => 'revise-branch-service', 'PUT,OPTIONS revise-branch-service' => 'revise-branch-service',
'DELETE,OPTIONS del-branch-service' => 'del-branch-service', 'DELETE,OPTIONS del-branch-service' => 'del-branch-service',
'GET,OPTIONS user-list' => 'user-list',
'GET,OPTIONS user-detail'=>'user-detail',
'GET,OPTIONS user-update'=>'user-update',
'GET,OPTIONS user-delete'=>'user-delete',
], ],
], ],
'GET swaggers/swagger/<id>'=>'swagger/swagger', 'GET swaggers/swagger/<id>'=>'swagger/swagger',
......
backend/controllers/v1/branch/BranchController.php
View file @ 5e165b84
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
namespace backend\controllers\v1\branch; namespace backend\controllers\v1\branch;
use app\models\v1\shop\branch\ShopBranchScore; use app\models\v1\branch\ShopBranchScore;
use Yii; use Yii;
use backend\controllers\v1\BaseController; use backend\controllers\v1\BaseController;
use yii\web\BadRequestHttpException; use yii\web\BadRequestHttpException;
class BranchController extends BaseController class BranchController extends BaseController
{ {
public $modelClass='app\models\v1\shop\branch\ShopBranch'; public $modelClass='app\models\v1\branch\ShopBranch';
/** /**
* @OA\GET( * @OA\GET(
* path="/backend/web/v1/shop/branch/branches/branch-score-list", * path="/backend/web/v1/branch/branches/branch-score-list",
* tags={"门店&DC"}, * tags={"门店&DC"},
* summary="门店评价管理(侯贺政)", * summary="门店评价管理(侯贺政)",
* description="门店服务打分列表", * description="门店服务打分列表",
......
backend/controllers/v1/shopuser/ShopUserListController.php 0 → 100644
View file @ 5e165b84
<?php
namespace backend\controllers\v1\shopuser;
use Yii;
use backend\controllers\v1\BaseController;
use backend\models\v1\shopuser\ShopUserList;
use app\models\v1\shopuser\ShopUserMembergrade;
use backend\models\v1\shopuser\ShopUserMembergrandeRelation;
use yii\web\BadRequestHttpException;
class ShopUserListController extends BaseController
{
public $modelClass = 'backend\models\v1\shopuser\ShopUserList';
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-lists/user-list",
* 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\Response(response="200",description="
* NAME:用户姓名,
* CREATE_DATE:注册时间,
* USER_GROUP_GUID:推荐工号,
* CODE:电话,
* WX_NO：wecha_id,
* LABEL:用户标签,
* CONSUMPTION_POINT:积分"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserList(){
$param = Yii::$app->request->get();
$ShopUserList = new ShopUserList();
$userList = $ShopUserList->getUserList($param);
$data['userList'] = $userList;
//获取所有用户组
$data['memberGradeList'] = $this->getMemberGradeList();
if(empty($userList)){
throw new BadRequestHttpException('未找到查询数据');
}
return [
'CODE'=>200,
'DATA'=>$data
];
}
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-lists/user-detail",
* tags={"用户&员工接口"},
* summary="员工信息(张晓林)",
* description="用户详细信息",
* @OA\Parameter(name="GUID",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* NAME:用户姓名,
* CREATE_DATE:注册时间,
* USER_GROUP_GUID:推荐工号,
* CREATE_DATE:注册时间,
* CODE:电话,
* WXNO：wecha_id,
* LABEL:用户标签,
* CONSUMPTION_POINT:积分"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserDetail(){
$param = Yii::$app->request->get();
$model = new ShopUserList();
$model->scenario ='userDetail';
$model->setAttributes($param);
$data = array(); //返回的数组
if ($model->validate()) {
//获取用户详细信息
$userColumn = ['GUID','NAME','CODE','CONSUMPTION_POINT','MOBILE_PHONE','CONTACT_SEX','CONTACTBIRTH_DATE','EMPLOYEE_CODE',
'EMPLOYEE_GUID','MEMBER_NO','LABEL','IS_HS_DISTRIBUTOR_PARENT'
];
$data['userInfo'] = $model::find()->select($userColumn)->where(['GUID'=>$param['GUID']])->asArray()->one();
//获取所有用户组
$data['memberGradeList'] = $this->getMemberGradeList();
//获取用户所在用户组
if(!empty($data['userInfo'])){
$data['userMemberGradeList'] = $model::find()
->select('shop_user_membergrade.GUID,shop_user_membergrade.NAME')
->leftJoin('shop_user_membergrade_relation', '`shop_user_membergrade_relation`.`shop_user_guid` = `su`.`GUID`')
->leftJoin('shop_user_membergrade', '`shop_user_membergrade`.`GUID` = `shop_user_membergrade_relation`.`membergrade_guid`')
->from('shop_user su')
->where(['su.GUID'=>$param['GUID']])
->all();
}
} else {
// 验证失败:返回错误信息
$data['MESSAGE'] = $model->errors;
$data['userList'] = '';
}
return [
'CODE'=>'200',
'data'=>$data
];
}
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-lists/user-delete",
* tags={"用户&员工接口"},
* summary="员工删除(张晓林)",
* description="员工删除",
* @OA\Parameter(name="GUID",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="操作成功"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserDelete(){
$param = Yii::$app->request->get();
$model = new $this->modelClass();
$result = $model->userDelete($param);
return $result;
}
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-user-lists/user-update",
* tags={"用户&员工接口"},
* summary="员工信息修改(张晓林)",
* description="用户信息更新",
* @OA\Parameter(name="GUID",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="操作成功"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserUpdate(){
}
public function getMemberGradeList(){
//获取所有用户组
$list = ShopUserMembergrade::find()->select(['GUID','NAME'])->asArray()->all();
return $list;
}
}
backend/models/v1/branch/ShopBranchScore.php
View file @ 5e165b84
<?php <?php
namespace app\models\v1\shop\branch; namespace app\models\v1\branch;
use Yii; use Yii;
use app\models\v1\BaseModel; use app\models\v1\BaseModel;
...@@ -81,8 +81,7 @@ class ShopBranchScore extends BaseModel ...@@ -81,8 +81,7 @@ class ShopBranchScore extends BaseModel
{ {
$query = static::find()->alias('sbs') $query = static::find()->alias('sbs')
->select('sbs.GUID,sb.NAME as BRANCH_NAME,sbs.BRANCH_CODE,sbs.BASIC_SERVICES,sbs.QUALITY_ASSURANCE,sbs.OPERATION_MANAGEMENT,sbs.STORE_IMAGE,sbs.ELECTRICITY_MANAGEMENT,sbs.CUSTOMERE_VALUATION,sbs.STORE_CONFIGURATION,sbs.ARTIFICIAL_NUMBER,sbs.ARTIFICIAL_NAME,sbs.UPDATE_TIME,sb.SCORE') ->select('sbs.GUID,sb.NAME as BRANCH_NAME,sbs.BRANCH_CODE,sbs.BASIC_SERVICES,sbs.QUALITY_ASSURANCE,sbs.OPERATION_MANAGEMENT,sbs.STORE_IMAGE,sbs.ELECTRICITY_MANAGEMENT,sbs.CUSTOMERE_VALUATION,sbs.STORE_CONFIGURATION,sbs.ARTIFICIAL_NUMBER,sbs.ARTIFICIAL_NAME,sbs.UPDATE_TIME,sb.SCORE')
->leftJoin('shop_branch sb', 'sbs.BRANCH_CODE=sb.CODE') ->leftJoin('shop_branch sb', 'sbs.BRANCH_CODE=sb.CODE');
->where('1');
if (isset($params['BRANCH_CODE'])) { if (isset($params['BRANCH_CODE'])) {
$query->andfilterWhere(['like','sbs.BRANCH_CODE',$params['BRANCH_CODE']]); $query->andfilterWhere(['like','sbs.BRANCH_CODE',$params['BRANCH_CODE']]);
......
backend/models/v1/shopuser/ShopUserList.php 0 → 100644
View file @ 5e165b84
<?php
namespace backend\models\v1\shopuser;
use yii\data\ActiveDataProvider;
use app\models\v1\BaseModel;
use backend\models\v1\shopuser\ShopUserMembergradeRelation;
use app\models\v1\shopuser\ShopUserMembergrade;
class ShopUserList extends BaseModel{
public static function tableName()
{
return 'shop_user';
}
// public function scenarios()
// {
// $scenarios = parent::scenarios();
// $scenarios['user-list'] = ['NAME','MEMBER_NO','CREATE_DATE','USER_GROUP_GUID','CODE','BINDCARD'];
// $scenarios['user-detail'] = ['GUID'];
// $scenarios['user-update'] = ['GUID'];
// $scenarios['user-delete'] = ['GUID'];
// return $scenarios;
// }
//重新定义rules
public function rules(){
return [
['GUID','required','on'=>['userUpdate','userDetail','user-delete'],'message'=>'缺少参数GUID'],
[['NAME','MEMBER_NO','CREATE_DATE','USER_GROUP_GUID','CODE','BINDCARD'],'string']
];
}
public function attributeLabels()
{
return [
'GUID'=>'缺少参数GUID'
];
}
public function getUserList($param){
$query = self::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'])]);
}
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();
$provider = new ActiveDataProvider(
[
'query' => $query->asArray(),
'pagination' => [
'pageSize' => 15,
]
]
);
$data = $provider->getModels();
$data['TOTALCOUNT'] = $provider->getTotalCount();
return $data;
}
public function userDelete($param){
$user = self::findOne($param['GUID']);
if($user->delete()){
return [
'CODE'=>200,
'MESSAEGE'=>'操作成功'
];
}else{
return [
'CODE'=>'Error',
'MESSAEGE'=>'操作失败'
];
}
}
}
\ No newline at end of file
backend/models/v1/shopuser/ShopUserMembergradeRelation.php 0 → 100644
View file @ 5e165b84
<?php
namespace backend\models\v1\shopuser;
use app\models\v1\BaseModel;
use backend\models\v1\shopuser\ShopUserList;
class ShopUserMembergradeRelation extends BaseModel{
public static function tableName(){
return 'Shop_user_membergrade_relation';
}
// //声明和shop_user表的关系
// public function getShopUserList()
// {
// return $this->hasOne(ShopUserList::className(), ['GUID' => 'SHOP_USER_GUID']);
// }
}
\ No newline at end of file
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