Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
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
chenchuanwen
my-yaf-project
Commits
f71fd22c
Commit
f71fd22c
authored
Sep 14, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
message
parent
637e5ff2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
User.php
application/controllers/User.php
+0
-0
ApiConst.php
application/library/Our/ApiConst.php
+2
-0
MemberCenterService.php
application/models/Business/User/MemberCenterService.php
+6
-0
Member.php
application/models/DAO/Member.php
+1
-1
No files found.
application/controllers/User.php
100755 → 100644
View file @
f71fd22c
File mode changed from 100755 to 100644
application/library/Our/ApiConst.php
View file @
f71fd22c
...
...
@@ -52,6 +52,8 @@ class ApiConst
const
zero
=
0
;
const
one
=
1
;
const
two
=
2
;
const
cannotSendMsg
=-
1
;
const
canSendMsg
=
1
;
const
favTimeAsc
=
1
;
const
favTimeDesc
=
2
;
...
...
application/models/Business/User/MemberCenterService.php
100755 → 100644
View file @
f71fd22c
...
...
@@ -29,6 +29,12 @@ class MemberCenterServiceModel extends \Business\AbstractModel
$memberInfo
[
'diliverymanId'
]
?
$memberCenter
[
'isDeliveryman'
]
=
1
:
$memberCenter
[
'isDeliveryman'
]
=
0
;
//是否店主
$memberInfo
[
'storeId'
]
?
$memberCenter
[
'isSeller'
]
=
1
:
$memberCenter
[
'isSeller'
]
=
0
;
if
(
$memberInfo
[
'isWxsend'
]
>=
ApiConst
::
zero
){
$memberCenter
[
'canSendMsg'
]
=
ApiConst
::
canSendMsg
;
}
else
{
$memberCenter
[
'canSendMsg'
]
=
ApiConst
::
cannotSendMsg
;
}
$memberInfo
[
'storeId'
]
?
$memberCenter
[
'is'
]
=
1
:
$memberCenter
[
'isSeller'
]
=
0
;
//是否销售员
$saleInstance
=
\DAO\SaleModel
::
getInstance
();
//$sale_act_id = \DAO\SaleModel::getInstance()->getOne(array('member_id'=>$memberId,'is_closing'=>0),'sale_act_id');
...
...
application/models/DAO/Member.php
View file @
f71fd22c
...
...
@@ -19,7 +19,7 @@ class MemberModel extends \DAO\AbstractModel
protected
$_tableName
=
'han_member'
;
//有效用户返回数据
private
$availMemberColumn
=
array
(
'member_id'
,
'member_name'
,
'member_truename'
,
'member_avatar'
,
'member_sex'
,
'member_birthday'
,
'member_mobile'
,
'member_mobile_bind'
,
'member_qq'
,
'member_qqopenid'
,
'member_qqinfo'
,
'member_wxinfo'
,
'member_wxopenid'
,
'member_sinaopenid'
,
'member_sinainfo'
,
'member_points'
,
'member_state'
,
'member_quicklink'
,
'member_exppoints'
,
'store_id'
,
'iswx'
,
'agree_flag'
,
'seller_id'
,
'diliveryman_id'
,
'member_tag_ids'
,
'member_group_ids'
,
'is_teacher'
,
'member_email'
,
'member_email_bind'
);
private
$availMemberColumn
=
array
(
'member_id'
,
'member_name'
,
'member_truename'
,
'member_avatar'
,
'member_sex'
,
'member_birthday'
,
'member_mobile'
,
'member_mobile_bind'
,
'member_qq'
,
'member_qqopenid'
,
'member_qqinfo'
,
'member_wxinfo'
,
'member_wxopenid'
,
'member_sinaopenid'
,
'member_sinainfo'
,
'member_points'
,
'member_state'
,
'member_quicklink'
,
'member_exppoints'
,
'store_id'
,
'iswx'
,
'agree_flag'
,
'seller_id'
,
'diliveryman_id'
,
'member_tag_ids'
,
'member_group_ids'
,
'is_teacher'
,
'member_email'
,
'member_email_bind'
,
'is_wxsend'
);
public
function
init
()
{
...
...
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