Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
newShopBack
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
newshop
newShopBack
Commits
d2aac708
Commit
d2aac708
authored
Nov 19, 2019
by
侯贺政
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
Signed-off-by:
houhezheng
<
houhezheng@romens.cn
>
parent
198182a3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
BranchScoreController.php
backend/controllers/v1/branch/BranchScoreController.php
+2
-1
ShopUserController.php
backend/controllers/v1/shopuser/ShopUserController.php
+3
-3
ShopBranchScore.php
backend/models/v1/branch/ShopBranchScore.php
+1
-1
No files found.
backend/controllers/v1/branch/BranchScoreController.php
View file @
d2aac708
...
@@ -19,6 +19,7 @@ class BranchScoreController extends BaseController
...
@@ -19,6 +19,7 @@ class BranchScoreController extends BaseController
* tags={"门店&DC"},
* tags={"门店&DC"},
* summary="门店评价列表(侯贺政)",
* summary="门店评价列表(侯贺政)",
* description="门店服务打分列表",
* description="门店服务打分列表",
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* @OA\Parameter(name="BRANCH_CODE",in="query",description="门店编号",@OA\Schema(type="string")),
* @OA\Parameter(name="BRANCH_CODE",in="query",description="门店编号",@OA\Schema(type="string")),
* @OA\Parameter(name="ARTIFICIAL_NUMBER",in="query",description="导入人工号",@OA\Schema(type="string")),
* @OA\Parameter(name="ARTIFICIAL_NUMBER",in="query",description="导入人工号",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* @OA\Response(response="200",description="
...
@@ -123,7 +124,7 @@ class BranchScoreController extends BaseController
...
@@ -123,7 +124,7 @@ class BranchScoreController extends BaseController
* @OA\Property(property="STORE_CONFIGURATION", type="float(12,2)",description="门店配置分数"),
* @OA\Property(property="STORE_CONFIGURATION", type="float(12,2)",description="门店配置分数"),
* @OA\Property(property="ARTIFICIAL_NUMBER", type="string",description="操作人工号"),
* @OA\Property(property="ARTIFICIAL_NUMBER", type="string",description="操作人工号"),
* @OA\Property(property="ARTIFICIAL_NAME", type="string",description="操作人姓名必填"),
* @OA\Property(property="ARTIFICIAL_NAME", type="string",description="操作人姓名必填"),
* example={"GUID":"123","
BASIC_SERVICES":"10
"}
* example={"GUID":"123","
ARTIFICIAL_NUMBER":"0001","ARTIFICIAL_NAME":"李雷
"}
* ),
* ),
* @OA\MediaType(
* @OA\MediaType(
* mediaType="application/x-www-form-urlencoded",
* mediaType="application/x-www-form-urlencoded",
...
...
backend/controllers/v1/shopuser/ShopUserController.php
View file @
d2aac708
...
@@ -37,7 +37,7 @@ class ShopUserController extends BaseController
...
@@ -37,7 +37,7 @@ class ShopUserController extends BaseController
$params
=
Yii
::
$app
->
request
->
queryParams
;
$params
=
Yii
::
$app
->
request
->
queryParams
;
$model
->
attributes
=
$params
;
$model
->
attributes
=
$params
;
if
(
!
$model
->
validate
())
{
if
(
!
$model
->
validate
())
{
throw
new
BadRequestHttpException
(
'Your request probably have some mistake !'
);
throw
new
BadRequestHttpException
(
json_encode
(
$model
->
errors
)
);
}
}
$list
=
$model
->
employeeSearch
(
$params
);
$list
=
$model
->
employeeSearch
(
$params
);
...
@@ -51,7 +51,7 @@ class ShopUserController extends BaseController
...
@@ -51,7 +51,7 @@ class ShopUserController extends BaseController
* @OA\GET(
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-users/employee-info",
* path="/backend/web/v1/shopuser/shop-users/employee-info",
* tags={"用户&员工接口"},
* tags={"用户&员工接口"},
* summary="员工信息(侯贺政)",
* summary="员工信息
详情
(侯贺政)",
* description="某员工的信息详情",
* description="某员工的信息详情",
* @OA\Parameter(name="id",in="query",required=true,description="员工GUID",@OA\Schema(type="string")),
* @OA\Parameter(name="id",in="query",required=true,description="员工GUID",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* @OA\Response(response="200",description="
...
@@ -73,7 +73,7 @@ class ShopUserController extends BaseController
...
@@ -73,7 +73,7 @@ class ShopUserController extends BaseController
$model
=
new
ShopUser
();
$model
=
new
ShopUser
();
$model
->
GUID
=
$id
;
$model
->
GUID
=
$id
;
if
(
!
$model
->
validate
()){
if
(
!
$model
->
validate
()){
throw
new
BadRequestHttpException
(
'Your request probably have some mistake !'
);
throw
new
BadRequestHttpException
(
json_encode
(
$model
->
errors
)
);
}
}
$data
=
$model
->
employeeInfo
(
$id
);
$data
=
$model
->
employeeInfo
(
$id
);
...
...
backend/models/v1/branch/ShopBranchScore.php
View file @
d2aac708
...
@@ -57,7 +57,7 @@ class ShopBranchScore extends BaseModel
...
@@ -57,7 +57,7 @@ class ShopBranchScore extends BaseModel
{
{
$scenarios
=
parent
::
scenarios
();
$scenarios
=
parent
::
scenarios
();
//更新时,防止BRANCH_CODE,BRANCH_NAME被赋值更新
//更新时,防止BRANCH_CODE,BRANCH_NAME被赋值更新
$scenarios
[
'update'
]
=
[
'BASIC_SERVICES'
,
'QUALITY_ASSURANCE'
,
'OPERATION_MANAGEMENT'
,
'STORE_IMAGE'
,
'ELECTRICITY_MANAGEMENT'
,
'CUSTOMERE_VALUATION'
,
'STORE_CONFIGURATION'
,
'ARTIFICIAL_NUMBER'
,
'ARTIFICIAL_NAME'
,
'UPDATE_TIME'
];
$scenarios
[
'update'
]
=
[
'BASIC_SERVICES'
,
'QUALITY_ASSURANCE'
,
'OPERATION_MANAGEMENT'
,
'STORE_IMAGE'
,
'ELECTRICITY_MANAGEMENT'
,
'CUSTOMERE_VALUATION'
,
'STORE_CONFIGURATION'
,
'ARTIFICIAL_NUMBER'
,
'ARTIFICIAL_NAME'
,
'UPDATE_TIME'
];
return
$scenarios
;
return
$scenarios
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment