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
043d58f2
Commit
043d58f2
authored
Dec 09, 2019
by
孙磊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
门店分公司和区域信息
Signed-off-by:
sunlei
<
sunlei@romens.cn
>
parent
aa41e653
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
132 additions
and
2 deletions
+132
-2
BranchController.php
backend/controllers/v1/branch/BranchController.php
+104
-2
ShopBranch.php
backend/models/v1/branch/ShopBranch.php
+28
-0
No files found.
backend/controllers/v1/branch/BranchController.php
View file @
043d58f2
...
@@ -168,7 +168,8 @@ class BranchController extends BaseController
...
@@ -168,7 +168,8 @@ class BranchController extends BaseController
* @OA\Property(property="RECIVER_CITY",description="城市编号",type="string"),
* @OA\Property(property="RECIVER_CITY",description="城市编号",type="string"),
* @OA\Property(property="RECIVER_REGION",description="区域编号",type="string"),
* @OA\Property(property="RECIVER_REGION",description="区域编号",type="string"),
* @OA\Property(property="ADDRESS",description="详细地址",type="string"),
* @OA\Property(property="ADDRESS",description="详细地址",type="string"),
* @OA\Property(property="PARENT_GUID",description="上级部门编号",type="string"),
* @OA\Property(property="SUPPROVINCE_GUID",description="上级部门分公司",type="string"),
* @OA\Property(property="PARENT_GUID",description="上级部门区域",type="string"),
* @OA\Property(property="LAT",description="门店坐标LAT",type="string"),
* @OA\Property(property="LAT",description="门店坐标LAT",type="string"),
* @OA\Property(property="LNG",description="门店坐标LNG",type="string"),
* @OA\Property(property="LNG",description="门店坐标LNG",type="string"),
* @OA\Property(property="IS_POINTS_SHOP",description="是否积分门店",type="int"),
* @OA\Property(property="IS_POINTS_SHOP",description="是否积分门店",type="int"),
...
@@ -313,6 +314,106 @@ class BranchController extends BaseController
...
@@ -313,6 +314,106 @@ class BranchController extends BaseController
}
}
return
$info
;
return
$info
;
}
}
/**
* @OA\Get(
* path="/backend/web/v1/branch/branches/branch-sup-company",
* tags={"门店&DC"},
* description="获取所有分公司信息",
* summary="获取所有分公司信息(孙磊)",
* @OA\Response(response="200",description="
* GUID:分公司GUID,
* NAME:分公司名称,
* "),
* security={{"Authorization": {}}}
* )
*/
public
function
actionBranchSupCompany
()
{
$model
=
new
$this
->
modelClass
();
$info
=
$model
->
getAllSupCompany
();
if
(
!
$info
)
{
throw
new
BadRequestHttpException
(
'未找到符合的分公司信息'
);
}
return
$info
;
}
/**
* @OA\Get(
* path="/backend/web/v1/branch/branches/branch-sup-region",
* tags={"门店&DC"},
* description="获取门店区域信息",
* summary="编辑时获取门店区域信息(孙磊)",
* @OA\Parameter(name="SUPPROVINCE_GUID",in="query",description="所属省级公司GUID",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* GUID:门店区域GUID,
* NAME:门店区域名称,
* "),
* security={{"Authorization": {}}}
* )
*/
public
function
actionBranchSupRegion
()
{
//权限信息
$rbac
=
new
ShopRbacUser
();
$userGuid
=
Yii
::
$app
->
user
->
identity
->
GUID
;
$userinfo
=
$rbac
->
getRbacUserInfo
(
$userGuid
);
$auth_role
=
$userinfo
[
'ROLE_ID'
];
$model
=
new
$this
->
modelClass
();
$SUPPROVINCE_GUID
=
$model
->
SUPPROVINCE_GUID
=
Yii
::
$app
->
request
->
get
(
'SUPPROVINCE_GUID'
);
if
(
$model
->
validate
())
{
//所有输入数据都有效 all inputs are valid
$info
=
$model
->
getBranchRegion
(
$SUPPROVINCE_GUID
);
if
(
!
$info
)
{
throw
new
BadRequestHttpException
(
'未找到符合的门店区域信息'
);
}
$info
[
0
][
'ROLE_ID'
]
=
$auth_role
;
return
$info
;
}
else
{
//验证失败:$errors 是一个包含错误信息的数组
Yii
::
$app
->
response
->
statusCode
=
422
;
return
$model
->
errors
;
}
}
/**
* @OA\Get(
* path="/backend/web/v1/branch/branches/sup-company-region",
* tags={"门店&DC"},
* description="获取分公司下区域信息",
* summary="添加时获取分公司下区域信息(孙磊)",
* @OA\Parameter(name="SUPPROVINCE_GUID",in="query",description="所属省级公司GUID",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* GUID:门店区域GUID,
* NAME:门店区域名称,
* "),
* security={{"Authorization": {}}}
* )
*/
public
function
actionSupCompanyRegion
()
{
//权限信息
$rbac
=
new
ShopRbacUser
();
$userGuid
=
Yii
::
$app
->
user
->
identity
->
GUID
;
$userinfo
=
$rbac
->
getRbacUserInfo
(
$userGuid
);
$auth_role
=
$userinfo
[
'ROLE_ID'
];
$model
=
new
$this
->
modelClass
();
$SUPPROVINCE_GUID
=
$model
->
SUPPROVINCE_GUID
=
Yii
::
$app
->
request
->
get
(
'SUPPROVINCE_GUID'
);
if
(
$model
->
validate
())
{
//所有输入数据都有效 all inputs are valid
$info
=
$model
->
getBranchRegion
(
$SUPPROVINCE_GUID
,
1
);
if
(
!
$info
)
{
throw
new
BadRequestHttpException
(
'未找到符合的门店区域信息'
);
}
$info
[
0
][
'ROLE_ID'
]
=
$auth_role
;
return
$info
;
}
else
{
//验证失败:$errors 是一个包含错误信息的数组
Yii
::
$app
->
response
->
statusCode
=
422
;
return
$model
->
errors
;
}
}
/**
/**
* @OA\PUT(
* @OA\PUT(
* path="/backend/web/v1/branch/branches/revise-branch",
* path="/backend/web/v1/branch/branches/revise-branch",
...
@@ -333,7 +434,8 @@ class BranchController extends BaseController
...
@@ -333,7 +434,8 @@ class BranchController extends BaseController
* @OA\Property(property="RECIVER_CITY",description="城市编号",type="string"),
* @OA\Property(property="RECIVER_CITY",description="城市编号",type="string"),
* @OA\Property(property="RECIVER_REGION",description="区域编号",type="string"),
* @OA\Property(property="RECIVER_REGION",description="区域编号",type="string"),
* @OA\Property(property="ADDRESS",description="详细地址",type="string"),
* @OA\Property(property="ADDRESS",description="详细地址",type="string"),
* @OA\Property(property="PARENT_GUID",description="上级部门编号",type="string"),
* @OA\Property(property="SUPPROVINCE_GUID",description="上级部门分公司",type="string"),
* @OA\Property(property="PARENT_GUID",description="上级部门区域",type="string"),
* @OA\Property(property="LAT",description="门店坐标LAT",type="string"),
* @OA\Property(property="LAT",description="门店坐标LAT",type="string"),
* @OA\Property(property="LNG",description="门店坐标LNG",type="string"),
* @OA\Property(property="LNG",description="门店坐标LNG",type="string"),
* @OA\Property(property="IS_POINTS_SHOP",description="是否积分门店",type="int"),
* @OA\Property(property="IS_POINTS_SHOP",description="是否积分门店",type="int"),
...
...
backend/models/v1/branch/ShopBranch.php
View file @
043d58f2
...
@@ -371,6 +371,34 @@ class ShopBranch extends BaseModel
...
@@ -371,6 +371,34 @@ class ShopBranch extends BaseModel
return
$query
;
return
$query
;
}
}
//获取所有分公司信息
public
function
getAllSupCompany
()
{
return
$query
=
static
::
find
()
->
select
(
'GUID,NAME'
)
->
where
([
'BRANCH_TYPE'
=>
1
])
->
all
();
}
//获取门店区域信息或分公司下区域信息
public
function
getBranchRegion
(
$SUPPROVINCE_GUID
,
$flag
=
''
)
{
if
(
empty
(
$flag
)
&&
!
empty
(
$SUPPROVINCE_GUID
)){
return
$query
=
static
::
find
()
->
select
(
'GUID,NAME'
)
->
where
([
'BRANCH_TYPE'
=>
2
])
->
andWhere
([
'PARENT_GUID'
=>
$SUPPROVINCE_GUID
])
->
asArray
()
->
all
();
}
if
(
!
empty
(
$flag
)
&&
!
empty
(
$SUPPROVINCE_GUID
)){
return
$query
=
static
::
find
()
->
select
(
'GUID,NAME'
)
->
andWhere
([
'PARENT_GUID'
=>
$SUPPROVINCE_GUID
])
->
asArray
()
->
all
();
}
return
''
;
}
/**
/**
* 查询DC列表
* 查询DC列表
* @params array $params 查询参数数组
* @params array $params 查询参数数组
...
...
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