Skip to content

N
newShopBack
Commit 9599ac1c authored by 郭勇志's avatar 郭勇志
Browse files
Options

Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

parents 770e09ae aff08ebf
Show whitespace changes
Inline Side-by-side
Showing with 557 additions and 5 deletions
backend/config/urlmanager.php
View file @ 9599ac1c
...@@ -17,6 +17,8 @@ return [ ...@@ -17,6 +17,8 @@ return [
'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/shopuser/shop-user-list',
], ],
'extraPatterns'=>[ 'extraPatterns'=>[
'GET,OPTIONS test'=>'test', 'GET,OPTIONS test'=>'test',
...@@ -32,6 +34,14 @@ return [ ...@@ -32,6 +34,14 @@ return [
'POST,OPTIONS add' => 'add', 'POST,OPTIONS add' => 'add',
'DELETE,OPTIONS del' => 'del', 'DELETE,OPTIONS del' => 'del',
'GET,OPTIONS branch-score-list' => 'branch-score-list', 'GET,OPTIONS branch-score-list' => 'branch-score-list',
'GET,OPTIONS branch-service-list' => 'branch-service-list',
'POST,OPTIONS add-branch-service' => 'add-branch-service',
'PUT,OPTIONS revise-branch-service' => 'revise-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/BranchServiceTypeController.php 0 → 100644
View file @ 9599ac1c
<?php
namespace backend\controllers\v1\branch;
use Yii;
use backend\controllers\v1\BaseController;
use yii\web\BadRequestHttpException;
use app\models\v1\branch\BranchServiceType;
use backend\helpers\Func;
class BranchServiceTypeController extends BaseController
{
public $modelClass='app\models\v1\branch\BranchServiceType';
/**
* @OA\Get(
* path="/backend/web/v1/branch/branch-service-types/branch-service-list",
* tags={"门店&DC"},
* description="门店服务类目列表",
* summary="门店服务类目列表(孙磊)",
* operationId="Department",
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* @OA\Parameter(name="code",in="query",description="门店服务类目编号",@OA\Schema(type="string")),
* @OA\Parameter(name="name",in="query",description="门店服务类目名称",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* GUID:服务类目GUID,
* ORG_GUID:组织机构号,
* CODE:服务类目编号,
* NAME:服务类目名称,
* THEME_COLOR:主题颜色,
* DESCRIPTION:服务类目描述,
* CREATE_TIME:创建时间
* "),
* security={{"Authorization": {}}}
* )
*/
public function actionBranchServiceList()
{
$model=new $this->modelClass();
//用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code');
$model->NAME = Yii::$app->request->get('name');
if ($model->validate()) {
//所有输入数据都有效 all inputs are valid
$code = $model->CODE;
$name = $model->NAME;
$info = $model->BranchServiceInfo($code,$name);
if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息');
}
return $info;
} else {
//验证失败：$errors 是一个包含错误信息的数组
$errors = $model->errors;
return $errors;
}
}
/**
* @OA\POST(
* path="/backend/web/v1/branch/branch-service-types/add-branch-service",
* tags={"门店&DC"},
* summary="添加门店服务类目接口(孙磊)",
* description="添加门店服务类目接口",
* @OA\RequestBody(
* required=true,
* @OA\MediaType(
* mediaType="application/x-www-form-urlencoded",
* @OA\Schema(
* type="object",
* @OA\Property(property="CODE",description="服务类目编号",type="string"),
* @OA\Property(property="NAME",description="服务类目名称，最长20字",type="string"),
* @OA\Property(property="DESCRIPTION",description="服务类目描述",type="string"),
* @OA\Property(property="THEME_COLOR",description="主题颜色",type="string"),
* )
* )
* ),
* @OA\Response(response=201,description="服务类目添加成功"),
* security={{"Authorization": {}}}
* )
*/
public function actionAddBranchService()
{
$model = new $this->modelClass();
$model->scenario = 'create';//创建的场景
// $datetime = new \DateTime;
// $create_time = $datetime->format('Y-m-d H:i:s');
$create_time = date('Y-m-d H:i:s',time());
$other_param = array(
'GUID'=>Func::create_guid(),
'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID,
'CREATE_TIME'=>$create_time,
);
$model->setAttributes($other_param);
$model->setAttributes(Yii::$app->getRequest()->post());
if ($model->save()) {
Yii::$app->getResponse()->setStatusCode(201);
} elseif (!$model->hasErrors()) {
throw new ServerErrorHttpException('Failed to create the object for unknown reason.');
}
return $model;
}
/**
* @OA\PUT(
* path="/backend/web/v1/branch/branch-service-types/revise-branch-service",
* tags={"门店&DC"},
* 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\Property(property="CODE",description="服务类目编号",type="string"),
* @OA\Property(property="NAME",description="服务类目名称，最长20字",type="string"),
* @OA\Property(property="DESCRIPTION",description="服务类目描述",type="string"),
* @OA\Property(property="THEME_COLOR",description="主题颜色",type="string"),
* )
* )
* ),
* @OA\Response(response=202,description="服务类目修改成功"),
* security={{"Authorization": {}}}
* )
*/
public function actionReviseBranchService()
{
$guid = Yii::$app->getRequest()->post('GUID');
$model = $this->modelClass::findOne($guid);
if(!$model){
throw new BadRequestHttpException('没有找到要修改的记录');
}
$model->scenario = 'update';//创建的场景
$model->setAttributes(Yii::$app->getRequest()->post());
if ($model->save() === false && !$model->hasErrors()) {
throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
}
Yii::$app->getResponse()->setStatusCode(202);
return $model;
}
/**
* @OA\DELETE(
* path="/backend/web/v1/branch/branch-service-types/del-branch-service",
* tags={"门店&DC"},
* 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=203,description="门店服务类目删除成功"),
* security={{"Authorization": {}}}
* )
*/
public function actionDelBranchService()
{
$guid = Yii::$app->getRequest()->post('GUID');
$model = new $this->modelClass();
$branchservice = $model::findOne($guid);
if(!$branchservice){
throw new BadRequestHttpException('没有找到要删除的记录');
}else if ($branchservice->delete() === false) {
throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
}
Yii::$app->getResponse()->setStatusCode(203);
return $branchservice;
}
}
backend/controllers/v1/shopuser/ShopUserListController.php 0 → 100644
View file @ 9599ac1c
<?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['data'] = $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="昵称",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="出生日期",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\Response(response="200",description="操作成功"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserUpdate(){
}
public function getMemberGradeList(){
//获取所有用户组
$list = ShopUserMembergrade::find()->select(['GUID','NAME'])->asArray()->all();
return $list;
}
}
backend/controllers/v1/shopuser/ShopUserMembergradeController.php
View file @ 9599ac1c
...@@ -43,11 +43,14 @@ class ShopUserMembergradeController extends BaseController ...@@ -43,11 +43,14 @@ class ShopUserMembergradeController extends BaseController
$requestParams = Yii::$app->getRequest()->get(); $requestParams = Yii::$app->getRequest()->get();
$query = $this->modelClass::find(); $query = $this->modelClass::find();
return Yii::createObject([ return new ActiveDataProvider(
'class' => ActiveDataProvider::className(), [
'query' => $query, 'query' => $query,
'pagination' => $requestParams, 'pagination' => [
]); 'pageSize'=>$requestParams['pageSize']??20,
]
]
);
} }
/** /**
......
backend/controllers/v1/shopuser/UserComplainController.php
View file @ 9599ac1c
...@@ -21,6 +21,7 @@ class UserComplainController extends BaseController ...@@ -21,6 +21,7 @@ class UserComplainController extends BaseController
* description="留言信息列表", * description="留言信息列表",
* summary="留言信息列表(孙磊)", * summary="留言信息列表(孙磊)",
* operationId="UserComplain", * operationId="UserComplain",
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")), * @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"), * @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}} * security={{"Authorization": {}}}
......
backend/controllers/v1/shopuser/UserDepartmentController.php
View file @ 9599ac1c
...@@ -21,6 +21,7 @@ class UserDepartmentController extends BaseController ...@@ -21,6 +21,7 @@ class UserDepartmentController extends BaseController
* description="部门信息列表", * description="部门信息列表",
* summary="部门信息列表(孙磊)", * summary="部门信息列表(孙磊)",
* operationId="Department", * operationId="Department",
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* @OA\Parameter(name="code",in="query",description="部门编号",@OA\Schema(type="string")), * @OA\Parameter(name="code",in="query",description="部门编号",@OA\Schema(type="string")),
* @OA\Parameter(name="name",in="query",description="部门名称",@OA\Schema(type="string")), * @OA\Parameter(name="name",in="query",description="部门名称",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"), * @OA\Response(response="200",description="OK。一切正常"),
......
backend/models/v1/branch/BranchServiceType.php 0 → 100644
View file @ 9599ac1c
<?php
namespace app\models\v1\branch;
use Yii;
use app\models\v1\BaseModel;
use yii\data\ActiveDataProvider;
/**
* This is the model class for table "shop_branch_service_type".
*
* @property string $GUID
* @property string $ORG_GUID 组织机构号
* @property string $CODE 服务类目编号
* @property string $NAME 服务类目名称
* @property string $THEME_COLOR 主题颜色
* @property string $DESCRIPTION 服务类目描述
* @property string $CREATE_TIME 创建时间
*/
class BranchServiceType extends BaseModel
{
/**
* {@inheritdoc}
*/
public static function tableName()
{
return 'shop_branch_service_type';
}
/**
* {@inheritdoc}
*/
public function rules()
{
return [
[['GUID'], 'required','on'=>['create','update']],
[['CREATE_TIME'], 'safe'],
[['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
[['THEME_COLOR', 'DESCRIPTION'], 'string', 'max' => 255],
[['GUID'], 'unique'],
];
}
/**
* {@inheritdoc}
*/
public function attributeLabels()
{
return [
'GUID' => 'Guid',
'ORG_GUID' => 'Org Guid',
'CODE' => 'Code',
'NAME' => 'Name',
'THEME_COLOR' => 'Theme Color',
'DESCRIPTION' => 'Description',
'CREATE_TIME' => 'Create Time',
];
}
//门店-门店服务类目信息
public function BranchServiceInfo($code,$name)
{
$query = static::find()->select('GUID,NAME,CODE,THEME_COLOR,DESCRIPTION,CREATE_TIME');
if (isset($name) && !empty($name)) {
$query->andWhere(['like', 'NAME', $name]);
}
if (isset($code) && !empty($code)) {
$query->andWhere(['like', 'CODE', $code]);
}
return new ActiveDataProvider(
[
'query' => $query->asArray(),
'pagination' => [
'pageSize' => 15,
]
]
);
}
}
\ No newline at end of file
backend/models/v1/shopuser/ShopUserList.php 0 → 100644
View file @ 9599ac1c
<?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();
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 @ 9599ac1c
<?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