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
c38d4418
Commit
c38d4418
authored
Dec 11, 2019
by
侯贺政
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
运费详情输出城市所属省
Signed-off-by:
houhezheng
<
houhezheng@romens.cn
>
parent
c7a8f2ec
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
TransportSettingController.php
...d/controllers/v1/transport/TransportSettingController.php
+3
-1
ShopTransportArea.php
backend/models/v1/common/ShopTransportArea.php
+15
-0
No files found.
backend/controllers/v1/transport/TransportSettingController.php
View file @
c38d4418
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
namespace
backend\controllers\v1\transport
;
namespace
backend\controllers\v1\transport
;
use
app\models\v1\branch\ShopBranch
;
use
app\models\v1\branch\ShopBranch
;
use
app\models\v1\common\ShopTransportArea
;
use
app\models\v1\rbacuser\ShopRbacUser
;
use
app\models\v1\rbacuser\ShopRbacUser
;
use
app\models\v1\transport\ShopPackagingcostsBranches
;
use
app\models\v1\transport\ShopPackagingcostsBranches
;
use
app\models\v1\shopuser\ShopUserMembergrade
;
use
app\models\v1\shopuser\ShopUserMembergrade
;
...
@@ -109,6 +110,7 @@ class TransportSettingController extends BaseController
...
@@ -109,6 +110,7 @@ class TransportSettingController extends BaseController
throw
new
BadRequestHttpException
(
'请求信息不存在'
);
throw
new
BadRequestHttpException
(
'请求信息不存在'
);
}
}
$info
[
'SELECT_AREA'
]
=
explode
(
','
,
$info
[
'SELECT_AREA'
]);
$info
[
'SELECT_AREA'
]
=
explode
(
','
,
$info
[
'SELECT_AREA'
]);
$info
[
'PROVINCES'
]
=
(
new
ShopTransportArea
)
->
getProvinces
(
$info
[
'SELECT_AREA'
]);
$info
[
'LIMIT_MEMBER_GROUP_GUID'
]
=
explode
(
','
,
$info
[
'LIMIT_MEMBER_GROUP_GUID'
]);
$info
[
'LIMIT_MEMBER_GROUP_GUID'
]
=
explode
(
','
,
$info
[
'LIMIT_MEMBER_GROUP_GUID'
]);
$transType
=
(
new
ShopTransportType
)
->
BranchTransportInfo
();
$transType
=
(
new
ShopTransportType
)
->
BranchTransportInfo
();
...
@@ -121,7 +123,7 @@ class TransportSettingController extends BaseController
...
@@ -121,7 +123,7 @@ class TransportSettingController extends BaseController
//权限
//权限
$permit
=
1
;
$permit
=
1
;
$userInfo
=
(
new
ShopRbacUser
)
->
getRbacUserInfo
(
Yii
::
$app
->
user
->
identity
->
GUID
);
$userInfo
=
(
new
ShopRbacUser
)
->
getRbacUserInfo
(
Yii
::
$app
->
user
->
identity
->
GUID
);
//总部权限管理员
1,分部管理员权限2
。非权限内不可保存编辑
//总部权限管理员
,分部管理员权限
。非权限内不可保存编辑
if
(
!
in_array
(
$userInfo
[
'ROLE_ID'
],
[
USER_ROLE_REGION_ADMIN
,
USER_ROLE_HEADQUARTERS_ADMIN
]))
{
if
(
!
in_array
(
$userInfo
[
'ROLE_ID'
],
[
USER_ROLE_REGION_ADMIN
,
USER_ROLE_HEADQUARTERS_ADMIN
]))
{
$permit
=
0
;
$permit
=
0
;
}
}
...
...
backend/models/v1/common/ShopTransportArea.php
View file @
c38d4418
...
@@ -52,4 +52,19 @@ class ShopTransportArea extends BaseModel
...
@@ -52,4 +52,19 @@ class ShopTransportArea extends BaseModel
'DESCRIPTION'
=>
'Description'
,
'DESCRIPTION'
=>
'Description'
,
];
];
}
}
/**
* 获取某城市GUID数组里所属的所有省级城市
* @param array $citys 城市数组
* @return array|null 返回查询出的省GUID数组
*/
public
function
getProvinces
(
$citys
=
[])
{
$_citys
=
static
::
findAll
([
'GUID'
=>
$citys
]);
$provinces
=
[];
foreach
(
$_citys
as
$value
)
{
$provinces
[]
=
$value
[
'PARENT_GUID'
];
}
return
array_keys
(
array_flip
(
$provinces
));
}
}
}
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