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
534a2266
Commit
534a2266
authored
Dec 29, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
57ee6f45
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
MemberService.php
application/models/Business/User/MemberService.php
+6
-2
Member.php
application/models/DAO/Member.php
+15
-2
No files found.
application/models/Business/User/MemberService.php
View file @
534a2266
...
@@ -328,7 +328,7 @@ class MemberServiceModel extends \Business\AbstractModel
...
@@ -328,7 +328,7 @@ class MemberServiceModel extends \Business\AbstractModel
return
$result
;
return
$result
;
}
}
private
function
saveWxInfoMemberInfo
(
$where
,
$openid
=
null
){
private
function
saveWxInfoMemberInfo
(
$where
,
$openid
=
null
,
$wxappopenid
=
null
){
$memberDao
=
\DAO\MemberModel
::
getInstance
(
\Our\DbNameConst
::
masterDBConnectName
);
$memberDao
=
\DAO\MemberModel
::
getInstance
(
\Our\DbNameConst
::
masterDBConnectName
);
//构造需要保存的会员信息
//构造需要保存的会员信息
...
@@ -336,6 +336,9 @@ class MemberServiceModel extends \Business\AbstractModel
...
@@ -336,6 +336,9 @@ class MemberServiceModel extends \Business\AbstractModel
if
(
$openid
){
if
(
$openid
){
$member
[
'member_mobile'
]
=
$openid
;
$member
[
'member_mobile'
]
=
$openid
;
}
}
if
(
$wxappopenid
)
{
$member
[
'member_wxappopenid'
]
=
$wxappopenid
;
}
$result
=
$memberDao
->
addInfo
(
$member
);
$result
=
$memberDao
->
addInfo
(
$member
);
return
$result
;
return
$result
;
}
}
...
@@ -917,7 +920,8 @@ class MemberServiceModel extends \Business\AbstractModel
...
@@ -917,7 +920,8 @@ class MemberServiceModel extends \Business\AbstractModel
}
}
$db
->
doTransaction
();
$db
->
doTransaction
();
$openid
=
$this
->
getUnionId
(
$where
[
'encryptedData'
],
$where
[
'iv'
],
$where
[
'session_key'
]);
$openid
=
$this
->
getUnionId
(
$where
[
'encryptedData'
],
$where
[
'iv'
],
$where
[
'session_key'
]);
$memberId
=
$this
->
saveWxInfoMemberInfo
(
$where
,
$openid
);
$wxappOpenid
=
$authInfo
[
'session_key'
];
$memberId
=
$this
->
saveWxInfoMemberInfo
(
$where
,
$openid
,
$wxappOpenid
);
if
(
!
$memberId
){
if
(
!
$memberId
){
$db
->
doRollback
();
$db
->
doRollback
();
...
...
application/models/DAO/Member.php
View file @
534a2266
...
@@ -21,7 +21,7 @@ class MemberModel extends \DAO\AbstractModel
...
@@ -21,7 +21,7 @@ class MemberModel extends \DAO\AbstractModel
protected
$_tableName
=
'han_member'
;
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'
,
'is_wxsen
d'
);
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'
,
'member_wxappopeni
d'
);
//有效用户返回数据
//有效用户返回数据
...
@@ -556,7 +556,16 @@ class MemberModel extends \DAO\AbstractModel
...
@@ -556,7 +556,16 @@ class MemberModel extends \DAO\AbstractModel
return
$member
;
return
$member
;
}
}
public
function
getMemberForLogin
(
$memberIds
){
/**
* 获取登录用户
* @param $memberIds
* @param string $wxappopenid
* @return array
* User: King <358887571@qq.com>
* Date: 2018/12/29 0029
* Time: 下午 3:20
*/
public
function
getMemberForLogin
(
$memberIds
,
$wxappopenid
=
''
){
$member
=
array
();
$member
=
array
();
$memberCon
[
'member_id'
]
=
array
(
'in'
,
$memberIds
);
$memberCon
[
'member_id'
]
=
array
(
'in'
,
$memberIds
);
$memberCon
[
'member_state'
]
=
\Our\ApiConst
::
one
;
$memberCon
[
'member_state'
]
=
\Our\ApiConst
::
one
;
...
@@ -574,6 +583,10 @@ class MemberModel extends \DAO\AbstractModel
...
@@ -574,6 +583,10 @@ class MemberModel extends \DAO\AbstractModel
if
(
empty
(
$member
)){
if
(
empty
(
$member
)){
$member
=
$memberList
[
0
];
$member
=
$memberList
[
0
];
}
}
if
(
$wxappopenid
&&
$member
[
'member_wxappopenid'
]
==
''
)
{
$this
->
updateInfo
(
array
(
'member_wxappopenid'
=>
$wxappopenid
),
array
(
'member_id'
=>
$member
[
'member_id'
]));
}
$member
[
'member_wxappopenid'
]
=
$wxappopenid
;
$memberAvatarUrl
=
$this
->
getMemberAvatarUrl
(
$member
[
'member_id'
],
$member
[
'member_avatar'
]);
$memberAvatarUrl
=
$this
->
getMemberAvatarUrl
(
$member
[
'member_id'
],
$member
[
'member_avatar'
]);
$member
[
'memberAvatarUrl'
]
=
$memberAvatarUrl
;
$member
[
'memberAvatarUrl'
]
=
$memberAvatarUrl
;
}
}
...
...
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