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
419d69d9
Commit
419d69d9
authored
Nov 27, 2019
by
郭勇志
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下载上传门店
parent
8cba6786
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
317 additions
and
34 deletions
+317
-34
urlmanager.php
backend/config/urlmanager.php
+1
-0
BaseController.php
backend/controllers/v1/BaseController.php
+5
-5
BranchController.php
backend/controllers/v1/branch/BranchController.php
+232
-0
ShopBranch.php
backend/models/v1/branch/ShopBranch.php
+79
-29
import_branch.xls
template/import_branch.xls
+0
-0
No files found.
backend/config/urlmanager.php
View file @
419d69d9
...
...
@@ -46,6 +46,7 @@ return [
'PUT,OPTIONS revise-branch'
=>
'revise-branch'
,
'DELETE,OPTIONS del-branch'
=>
'del-branch'
,
'POST,OPTIONS branch-img-upload'
=>
'branch-img-upload'
,
'GET,OPTIONS export-branch'
=>
'export-branch'
,
],
],
//门店评分
...
...
backend/controllers/v1/BaseController.php
View file @
419d69d9
...
...
@@ -68,7 +68,7 @@ class BaseController extends ActiveController
'cors'
=>
[
'class'
=>
Cors
::
className
(),
'cors'
=>
[
'Origin'
=>
[
'http://localhost:80
80'
,
'http://192.168.188.207:808
0'
],
'Origin'
=>
[
'http://localhost:80
00'
,
'http://192.168.188.207:800
0'
],
'Access-Control-Request-Method'
=>
[
'GET'
,
'POST'
,
'PUT'
,
'PATCH'
,
'DELETE'
,
'HEAD'
,
'OPTIONS'
],
'Access-Control-Request-Headers'
=>
[
'*'
],
'Access-Control-Allow-Credentials'
=>
true
,
...
...
@@ -85,10 +85,10 @@ class BaseController extends ActiveController
'optional'
=>
[
'login'
],
];
// 授权
$behaviors
[
'authorizationFilter'
]
=
[
'class'
=>
authorizationFilter
::
className
(),
'optional'
=>
[
'login'
],
//过滤不需要验证的action
];
//
$behaviors['authorizationFilter']=[
//
'class' => authorizationFilter::className(),
//
'optional' => ['login'],//过滤不需要验证的action
//
];
return
$behaviors
;
}
}
backend/controllers/v1/branch/BranchController.php
View file @
419d69d9
This diff is collapsed.
Click to expand it.
backend/models/v1/branch/ShopBranch.php
View file @
419d69d9
...
...
@@ -92,6 +92,16 @@ class ShopBranch extends BaseModel
return
'shop_branch'
;
}
public
$IS_BRANCH_SELF_MENTION
;
//是否门店自提
public
$IS_BRANCH_EXPRESS_DELIVERY
;
//是否门店快递配送
public
$IS_DELIVERS_GOODS
;
//是否送货上门
public
$IS_EXPRESS_DELIVERY
;
//是否快递配送
public
$IS_BRANCH_SELF_DELIVERY
;
//是否门店自配送
public
$IS_HAFL_HOUR_DELIVERY
;
//是否半小时达
public
$IS_ONE_HOUR_DELIVERY
;
//是否1小时达
public
$IS_TWO_HOUR_DELIVERY
;
//是否2小时达
public
$IS_DAY_DELIVERY
;
//是否当日定时达
public
$SERVICE_TYPE_CODE
;
//服务门店CODE
/**
* {@inheritdoc}
*/
...
...
@@ -99,43 +109,83 @@ class ShopBranch extends BaseModel
{
return
[
[[
'GUID'
,
'ORG_GUID'
,
'CODE'
,
'NAME'
],
'required'
,
'on'
=>
[
'create'
,
'update'
]],
[[
'ADDRESS'
,
'BRANCH_IMAGE_PATH'
,
'LICENCE_IMAGE_PATH'
,
'NOTICE_USER'
,
'CONTACTS_WXID'
,
'TRANSPORT_TYPE'
,
'RETURN_ADDRESS'
],
'string'
],
[[
'IS_DELIVERY'
,
'IS_CARE'
,
'IS_RESERV'
,
'IS_O2O'
,
'IS_BOIL_MEDICINE'
,
'IS_POINTS_SHOP'
,
'IS_PICK_UP_STATION'
,
'IS_VIRTUAL_BRANCH'
,
'IS_SHELVE'
,
'BRANCH_TYPE'
,
'IS_DELIVERY_CODECHAIN_GOODS'
,
'SCORE'
,
'GOODS_TYPE'
,
'IS_B2C'
,
'TOTAL_VOLUME'
],
'integer'
],
[[
'DELIVERY_LIMIT'
,
'PICKUP_LIMIT'
,
'TRANSFERS_RATE'
],
'number'
],
//
[['ADDRESS', 'BRANCH_IMAGE_PATH', 'LICENCE_IMAGE_PATH', 'NOTICE_USER', 'CONTACTS_WXID', 'TRANSPORT_TYPE', 'RETURN_ADDRESS'], 'string'],
//
[['IS_DELIVERY', 'IS_CARE', 'IS_RESERV', 'IS_O2O', 'IS_BOIL_MEDICINE', 'IS_POINTS_SHOP', 'IS_PICK_UP_STATION', 'IS_VIRTUAL_BRANCH', 'IS_SHELVE', 'BRANCH_TYPE', 'IS_DELIVERY_CODECHAIN_GOODS', 'SCORE', 'GOODS_TYPE', 'IS_B2C', 'TOTAL_VOLUME'], 'integer'],
//
[['DELIVERY_LIMIT', 'PICKUP_LIMIT', 'TRANSFERS_RATE'], 'number'],
[[
'LICENCE_DATE'
,
'UPDATE_TIME'
],
'safe'
],
[[
'GUID'
,
'ORG_GUID'
,
'CODE'
,
'PARENT_GUID'
,
'PHONE'
,
'CONTACT_NAME'
,
'LAT'
,
'LNG'
,
'RECIVER_PROVINCE'
,
'RECIVER_CITY'
,
'RECIVER_REGION'
,
'DELIVERY_TIME'
,
'WORK_TIME'
,
'PASSWORD'
,
'TRANSFERS_OPENID'
,
'SUPPROVINCE_GUID'
,
'OPERATING_AREA'
,
'DRUGS'
,
'HEALTH_PRODUCTS'
,
'CHINESE_MEDICINE'
,
'MEDICAL_APPARATUS'
,
'PANHEALTH'
,
'SMALL_SHOP'
,
'TOWNSHIP_SHOP'
,
'OUTSIDE_SHOP'
,
'PRESCRIPTION'
,
'SHOP_TYPE'
,
'THIRD_CODE'
,
'COMP_CODE'
,
'SALESDIST'
,
'ZCBZIRK'
],
'string'
,
'max'
=>
50
],
[[
'NAME'
,
'DESCRIPTION'
],
'string'
,
'max'
=>
100
],
[[
'PRIMARY_LAT'
,
'PRIMARY_LNG'
],
'string'
,
'max'
=>
20
],
[[
'SUPPORT_SEND_PLATFORM'
],
'string'
,
'max'
=>
10
],
[[
'HY_CODE'
,
'STATUS'
,
'BRANCH_NAME'
],
'string'
,
'max'
=>
30
],
[[
'COMP_TEXT'
,
'SALESDIST_TEXT'
,
'ZCBZIRK_TEXT'
],
'string'
,
'max'
=>
200
],
[[
'GUID'
],
'unique'
],
// [['GUID', 'ORG_GUID', 'CODE', 'PARENT_GUID', 'PHONE', 'CONTACT_NAME', 'LAT', 'LNG', 'RECIVER_PROVINCE', 'RECIVER_CITY', 'RECIVER_REGION', 'DELIVERY_TIME', 'WORK_TIME', 'PASSWORD', 'TRANSFERS_OPENID', 'SUPPROVINCE_GUID', 'OPERATING_AREA', 'DRUGS', 'HEALTH_PRODUCTS', 'CHINESE_MEDICINE', 'MEDICAL_APPARATUS', 'PANHEALTH', 'SMALL_SHOP', 'TOWNSHIP_SHOP', 'OUTSIDE_SHOP', 'PRESCRIPTION', 'SHOP_TYPE', 'THIRD_CODE', 'COMP_CODE', 'SALESDIST', 'ZCBZIRK'], 'string', 'max' => 50],
// [['NAME', 'DESCRIPTION'], 'string', 'max' => 100],
// [['PRIMARY_LAT', 'PRIMARY_LNG'], 'string', 'max' => 20],
// [['SUPPORT_SEND_PLATFORM'], 'string', 'max' => 10],
// [['HY_CODE', 'STATUS', 'BRANCH_NAME'], 'string', 'max' => 30],
// [['COMP_TEXT', 'SALESDIST_TEXT', 'ZCBZIRK_TEXT'], 'string', 'max' => 200],
// [['GUID'], 'unique'],
[[
'CODE'
,
'DESCRIPTION'
,
'CONTACT_NAME'
,
'PHONE'
,
'NAME'
,
'LAT'
,
'LNG'
,
'IS_DELIVERY'
,
'DELIVERY_TIME'
,
'WORK_TIME'
,
'IS_CARE'
,
'IS_RESERV'
,
'IS_O2O'
,
'IS_BOIL_MEDICINE'
,
'IS_POINTS_SHOP'
,
'IS_VIRTUAL_BRANCH'
,
'IS_DELIVERY_CODECHAIN_GOODS'
,
'IS_SHELVE'
,
'IS_BRANCH_SELF_MENTION'
,
'IS_BRANCH_EXPRESS_DELIVERY'
,
'IS_DELIVERS_GOODS'
,
'IS_EXPRESS_DELIVERY'
,
'IS_BRANCH_SELF_DELIVERY'
,
'IS_HAFL_HOUR_DELIVERY'
,
'IS_ONE_HOUR_DELIVERY'
,
'IS_TWO_HOUR_DELIVERY'
,
'IS_DAY_DELIVERY'
],
'required'
,
'on'
=>
[
'import'
]
,
'message'
=>
'{attribute}不能为空'
],
[[
'DESCRIPTION'
,
'NAME'
],
'string'
,
'max'
=>
100
,
'on'
=>
[
'import'
],
'tooLong'
=>
'最大长度不能超过100'
],
[[
'CONTACT_NAME'
,
'PHONE'
,
'DELIVERY_TIME'
,
'WORK_TIME'
,
'LAT'
,
'LNG'
],
'string'
,
'max'
=>
50
,
'on'
=>
[
'import'
],
'tooLong'
=>
'{attribute}最大长度不能超过50'
],
[[
'IS_CARE'
,
'IS_DELIVERY'
,
'IS_RESERV'
,
'IS_O2O'
,
'IS_BOIL_MEDICINE'
,
'IS_POINTS_SHOP'
,
'IS_VIRTUAL_BRANCH'
,
'IS_DELIVERY_CODECHAIN_GOODS'
,
'IS_SHELVE'
,
'IS_BRANCH_SELF_MENTION'
,
'IS_BRANCH_EXPRESS_DELIVERY'
,
'IS_DELIVERS_GOODS'
,
'IS_EXPRESS_DELIVERY'
,
'IS_BRANCH_SELF_DELIVERY'
,
'IS_HAFL_HOUR_DELIVERY'
,
'IS_ONE_HOUR_DELIVERY'
,
'IS_TWO_HOUR_DELIVERY'
,
'IS_DAY_DELIVERY'
],
'validateExistence'
,
'on'
=>
[
'import'
]],
[[
'SERVICE_TYPE_CODE'
],
'validateEffective'
],
//如果影响性能就注释掉
];
}
//验证这几个标志量只能为0或1
public
function
validateExistence
(
$attribute
){
if
(
!
in_array
(
$this
->
$attribute
,[
'0'
,
'1'
]))
{
$this
->
addError
(
$attribute
,
$this
->
attributeLabels
()[
$attribute
]
.
'只能为0或1.'
);
}
}
//验证服务类目的有效性
public
function
validateEffective
(
$attribute
){
$importArr
=
explode
(
','
,
$this
->
$attribute
);
$codeArr
=
$this
::
find
()
->
select
(
'CODE'
)
->
from
(
'SHOP_BRANCH_SERVICE_TYPE'
)
->
where
([
'CODE'
=>
$importArr
])
->
asArray
()
->
all
();
$tempArr
=
[];
foreach
(
$codeArr
as
$value
)
{
$tempArr
[]
=
$value
[
'CODE'
];
}
$diff
=
array_diff
(
$importArr
,
$tempArr
);
if
(
!
empty
(
$diff
))
{
$this
->
addError
(
$attribute
,
'服务类目CODE为'
.
implode
(
','
,
$diff
)
.
'不存在.'
);
}
}
/**
* {@inheritdoc}
*/
public
function
attributeLabels
()
{
return
[
'GUID'
=>
'
Guid
'
,
'ORG_GUID'
=>
'
Org Guid
'
,
'CODE'
=>
'
Code
'
,
'NAME'
=>
'
Name
'
,
'PARENT_GUID'
=>
'
Parent Guid
'
,
'DESCRIPTION'
=>
'
Description
'
,
'ADDRESS'
=>
'
Address
'
,
'PHONE'
=>
'
Phone
'
,
'CONTACT_NAME'
=>
'
Contact Name
'
,
'LAT'
=>
'
Lat
'
,
'LNG'
=>
'
Lng
'
,
'GUID'
=>
'
主键
'
,
'ORG_GUID'
=>
'
组织机构号
'
,
'CODE'
=>
'
门店编码
'
,
'NAME'
=>
'
门店简称
'
,
'PARENT_GUID'
=>
'
上级GUID
'
,
'DESCRIPTION'
=>
'
描述
'
,
'ADDRESS'
=>
'
地址
'
,
'PHONE'
=>
'
手机号
'
,
'CONTACT_NAME'
=>
'
联系人姓名
'
,
'LAT'
=>
'
纬度
'
,
'LNG'
=>
'
经度
'
,
'PRIMARY_LAT'
=>
'Primary Lat'
,
'PRIMARY_LNG'
=>
'Primary Lng'
,
'RECIVER_PROVINCE'
=>
'Reciver Province'
,
'RECIVER_CITY'
=>
'Reciver City'
,
'RECIVER_REGION'
=>
'Reciver Region'
,
'IS_DELIVERY'
=>
'
Is Delivery
'
,
'IS_DELIVERY'
=>
'
是否支持配送
'
,
'DELIVERY_TIME'
=>
'Delivery Time'
,
'WORK_TIME'
=>
'Work Time'
,
'DELIVERY_LIMIT'
=>
'Delivery Limit'
,
...
...
@@ -143,18 +193,18 @@ class ShopBranch extends BaseModel
'BRANCH_IMAGE_PATH'
=>
'Branch Image Path'
,
'LICENCE_IMAGE_PATH'
=>
'Licence Image Path'
,
'PASSWORD'
=>
'Password'
,
'IS_RESERV'
=>
'
Is Reserv
'
,
'IS_O2O'
=>
'
Is O2
O'
,
'IS_BOIL_MEDICINE'
=>
'
Is Boil Medicine
'
,
'IS_POINTS_SHOP'
=>
'
Is Points Shop
'
,
'IS_PICK_UP_STATION'
=>
'
Is Pick Up Station
'
,
'IS_RESERV'
=>
'
是否预约门店
'
,
'IS_O2O'
=>
'
是否O2
O'
,
'IS_BOIL_MEDICINE'
=>
'
是否熬药门店
'
,
'IS_POINTS_SHOP'
=>
'
是否积分兑换门店
'
,
'IS_PICK_UP_STATION'
=>
'
是否自提门店
'
,
'NOTICE_USER'
=>
'Notice User'
,
'CONTACTS_WXID'
=>
'Contacts Wxid'
,
'IS_VIRTUAL_BRANCH'
=>
'Is Virtual Branch'
,
'PICKUP_LIMIT'
=>
'Pickup Limit'
,
'TRANSFERS_RATE'
=>
'Transfers Rate'
,
'TRANSFERS_OPENID'
=>
'Transfers Openid'
,
'IS_SHELVE'
=>
'
Is Shelve
'
,
'IS_SHELVE'
=>
'
是否营业
'
,
'LICENCE_DATE'
=>
'Licence Date'
,
'BRANCH_TYPE'
=>
'Branch Type'
,
'SUPPORT_SEND_PLATFORM'
=>
'Support Send Platform'
,
...
...
template/import_branch.xls
0 → 100644
View file @
419d69d9
File added
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