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
84e88f51
Commit
84e88f51
authored
Dec 16, 2019
by
侯贺政
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改模板字段验证类型
Signed-off-by:
houhezheng
<
houhezheng@romens.cn
>
parent
940a8658
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
ShopEmployeeController.php
backend/controllers/v1/shopuser/ShopEmployeeController.php
+4
-4
ShopUser.php
backend/models/v1/shopuser/ShopUser.php
+4
-5
No files found.
backend/controllers/v1/shopuser/ShopEmployeeController.php
View file @
84e88f51
...
@@ -221,10 +221,10 @@ class ShopEmployeeController extends BaseController
...
@@ -221,10 +221,10 @@ class ShopEmployeeController extends BaseController
* @OA\Property(property="EMPLOYEE_CODE",type="string",description="员工编号"),
* @OA\Property(property="EMPLOYEE_CODE",type="string",description="员工编号"),
* @OA\Property(property="MOBILE_PHONE",type="string",description="手机号"),
* @OA\Property(property="MOBILE_PHONE",type="string",description="手机号"),
* @OA\Property(property="CONTACTBIRTH_DATE",type="date",description="出生日期(Y-m-d)",example="2000-01-01"),
* @OA\Property(property="CONTACTBIRTH_DATE",type="date",description="出生日期(Y-m-d)",example="2000-01-01"),
* @OA\Property(property="CONTACT_SEX",type="
string
",description="性别(1:男,0:女)",example="1"),
* @OA\Property(property="CONTACT_SEX",type="
int
",description="性别(1:男,0:女)",example="1"),
* @OA\Property(property="MEMBER_NO",type="string",description="会员卡号"),
* @OA\Property(property="MEMBER_NO",type="string",description="会员卡号"),
* @OA\Property(property="IS_DISTRIBUTOR",type="int",description="分销商标识(默认1:是,0:否)",example="1"),
* @OA\Property(property="IS_DISTRIBUTOR",type="int",description="分销商标识(默认1:是,0:否)",example="1"),
* @OA\Property(property="EMPLOYEE_IS_MANAGER",type="
string
",description="员工是否为门店店长(默认0:否,1:是)",example="0"),
* @OA\Property(property="EMPLOYEE_IS_MANAGER",type="
int
",description="员工是否为门店店长(默认0:否,1:是)",example="0"),
* @OA\Property(property="PASSWORD",type="string",description="员工密码(默认:0000000)",example="000000"),
* @OA\Property(property="PASSWORD",type="string",description="员工密码(默认:0000000)",example="000000"),
* @OA\Property(property="BRANCH_CODE",type="string",description="用户所属门店编号"),
* @OA\Property(property="BRANCH_CODE",type="string",description="用户所属门店编号"),
* )
* )
...
@@ -292,10 +292,10 @@ class ShopEmployeeController extends BaseController
...
@@ -292,10 +292,10 @@ class ShopEmployeeController extends BaseController
* @OA\Property(property="EMPLOYEE_CODE",type="string",description="员工编号"),
* @OA\Property(property="EMPLOYEE_CODE",type="string",description="员工编号"),
* @OA\Property(property="MOBILE_PHONE",type="string",description="手机号"),
* @OA\Property(property="MOBILE_PHONE",type="string",description="手机号"),
* @OA\Property(property="CONTACTBIRTH_DATE",type="date",description="出生日期(Y-m-d)",example="2000-01-01"),
* @OA\Property(property="CONTACTBIRTH_DATE",type="date",description="出生日期(Y-m-d)",example="2000-01-01"),
* @OA\Property(property="CONTACT_SEX",type="
string
",description="性别(1:男,0:女)",example="1"),
* @OA\Property(property="CONTACT_SEX",type="
int
",description="性别(1:男,0:女)",example="1"),
* @OA\Property(property="MEMBER_NO",type="string",description="会员卡号"),
* @OA\Property(property="MEMBER_NO",type="string",description="会员卡号"),
* @OA\Property(property="IS_DISTRIBUTOR",type="int",description="分销商标识(1:是,0:否)",example="1"),
* @OA\Property(property="IS_DISTRIBUTOR",type="int",description="分销商标识(1:是,0:否)",example="1"),
* @OA\Property(property="EMPLOYEE_IS_MANAGER",type="
string
",description="员工是否为门店店长(0:否,1:是)",example="0"),
* @OA\Property(property="EMPLOYEE_IS_MANAGER",type="
int
",description="员工是否为门店店长(0:否,1:是)",example="0"),
* @OA\Property(property="PASSWORD",type="string",description="员工密码(默认:0000000)",example="000000"),
* @OA\Property(property="PASSWORD",type="string",description="员工密码(默认:0000000)",example="000000"),
* @OA\Property(property="BRANCH_CODE",type="string",description="用户所属门店编号"),
* @OA\Property(property="BRANCH_CODE",type="string",description="用户所属门店编号"),
* )
* )
...
...
backend/models/v1/shopuser/ShopUser.php
View file @
84e88f51
...
@@ -86,20 +86,19 @@ class ShopUser extends BaseModel
...
@@ -86,20 +86,19 @@ class ShopUser extends BaseModel
return
[
return
[
[[
'GUID'
,
'CODE'
],
'required'
,
'on'
=>
[
'creation'
]],
[[
'GUID'
,
'CODE'
],
'required'
,
'on'
=>
[
'creation'
]],
[[
'CREATE_DATE'
,
'UPDATE_DATE'
,
'PROTECTED_DATE'
],
'safe'
],
[[
'CREATE_DATE'
,
'UPDATE_DATE'
,
'PROTECTED_DATE'
],
'safe'
],
[[
'CONTACT_SEX'
,
'BELONG'
,
'IS_DISTRIBUTOR'
,
'AGE'
,
'IS_FOCUSON'
,
'EMPLOYEE_IS_MANAGER'
,
'IS_HSDISTRIBUTOR'
,
'IS_HS_DISTRIBUTOR_PARENT'
,
'IS_EMPDISTRIBUTOR'
],
'integer'
],
[[
'BINDCARD'
],
'string'
],
[[
'BINDCARD'
],
'string'
],
[[
'SIGNIN_POINT'
,
'CONSUMPTION_POINT'
],
'number'
],
[[
'SIGNIN_POINT'
,
'CONSUMPTION_POINT'
],
'number'
],
[[
'BELONG'
,
'AGE'
,
'IS_HSDISTRIBUTOR'
,
'IS_HS_DISTRIBUTOR_PARENT'
,
'IS_EMPDISTRIBUTOR'
],
'integer'
],
[[
'GUID'
,
'USER_GROUP_GUID'
,
'CODE'
,
'ORG_GUID'
,
'BRANCH_GUID'
,
'WX_NO'
,
'CREATE_GUID'
,
'UPDATE_GUID'
,
'MOBILE_PHONE'
,
'USER_GUID'
,
'SHARE_NO'
,
'PROMOTEUID'
,
'PROMOTE_CODE'
,
'MEMBER_NO'
,
'REMARK'
,
'ALIPAYU_ID'
,
'UNION_ID'
,
'WXOPEN_ID'
,
'EMPLOYEE_CODE'
,
'EMPLOYEE_BRANCH_GUID'
,
'MEMBER_GRADE_GUID'
,
'NICK_NAME'
,
'POSITION'
,
'DEPARTMENT'
,
'HYBRIS_UID'
,
'MEMBERSHIP_ID'
],
'string'
,
'max'
=>
50
],
[[
'GUID'
,
'USER_GROUP_GUID'
,
'CODE'
,
'ORG_GUID'
,
'BRANCH_GUID'
,
'WX_NO'
,
'CREATE_GUID'
,
'UPDATE_GUID'
,
'MOBILE_PHONE'
,
'USER_GUID'
,
'SHARE_NO'
,
'PROMOTEUID'
,
'PROMOTE_CODE'
,
'MEMBER_NO'
,
'REMARK'
,
'ALIPAYU_ID'
,
'UNION_ID'
,
'WXOPEN_ID'
,
'EMPLOYEE_CODE'
,
'EMPLOYEE_BRANCH_GUID'
,
'MEMBER_GRADE_GUID'
,
'NICK_NAME'
,
'POSITION'
,
'DEPARTMENT'
,
'HYBRIS_UID'
,
'MEMBERSHIP_ID'
],
'string'
,
'max'
=>
50
],
[[
'NAME'
,
'CREATE_NAME'
,
'UPDATE_NAME'
],
'string'
,
'max'
=>
100
],
[[
'NAME'
,
'CREATE_NAME'
,
'UPDATE_NAME'
],
'string'
,
'max'
=>
100
],
[[
'PASSWORD'
,
'DESCRIPTION'
],
'string'
,
'max'
=>
255
],
[[
'PASSWORD'
,
'DESCRIPTION'
],
'string'
,
'max'
=>
255
],
[[
'IS_FORBID'
,
'CONTACT_SEX'
],
'string'
,
'max'
=>
4
],
[[
'IS_FORBID'
],
'string'
,
'max'
=>
4
],
[[
'IS_UPLOADHX'
,
'IS_FROM'
,
'EMPDISTRIBUTO_RCODE'
],
'string'
,
'max'
=>
10
],
[[
'IS_UPLOADHX'
,
'IS_FROM'
,
'EMPDISTRIBUTO_RCODE'
],
'string'
,
'max'
=>
10
],
[[
'IS_DISTRIBUTOR'
,
'EMPLOYEE_IS_MANAGER'
],
'string'
,
'max'
=>
1
],
[[
'IS_FOCUSON'
,
'CRM_CUSTOMER_ID'
,
'USER_REGION_NUMBER'
,
'USER_SELF_NUMBER'
],
'string'
,
'max'
=>
20
],
[[
'LABEL'
,
'SHARE_QRPATH'
,
'HS_SHAREQR_PATH'
,
'HSDIS_PARENT_GUID'
],
'string'
,
'max'
=>
200
],
[[
'LABEL'
,
'SHARE_QRPATH'
,
'HS_SHAREQR_PATH'
,
'HSDIS_PARENT_GUID'
],
'string'
,
'max'
=>
200
],
[[
'ALIPAYAC_COUNT'
],
'string'
,
'max'
=>
30
],
[[
'ALIPAYAC_COUNT'
],
'string'
,
'max'
=>
30
],
[[
'CRM_CUSTOMER_ID'
,
'USER_REGION_NUMBER'
,
'USER_SELF_NUMBER'
],
'string'
,
'max'
=>
20
],
[[
'CODE'
],
'unique'
,
'on'
=>
[
'creation'
]],
[[
'CODE'
],
'unique'
,
'on'
=>
[
'creation'
]],
[[
'GUID'
],
'unique'
,
'on'
=>
[
'creation'
,
'add'
]],
[[
'GUID'
],
'unique'
,
'on'
=>
[
'creation'
,
'add'
]],
[[
'CONTACTBIRTH_DATE'
],
'date'
,
'format'
=>
'Y-m-d'
],
[[
'CONTACTBIRTH_DATE'
],
'date'
,
'format'
=>
'Y-m-d'
],
];
];
}
}
...
...
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