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
a9187d70
Commit
a9187d70
authored
Sep 19, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
memberModel里面find方法废弃
parent
d5248f0d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
27 deletions
+3
-27
Pay.php
application/library/Payment/Pay.php
+1
-1
MemberService.php
application/models/Business/User/MemberService.php
+2
-2
Member.php
application/models/DAO/Member.php
+0
-24
No files found.
application/library/Payment/Pay.php
100755 → 100644
View file @
a9187d70
...
...
@@ -24,7 +24,7 @@ class Pay {
$this
->
channel
=
$data
[
'channel'
];
$this
->
paySn
=
$data
[
'paySn'
];
$this
->
requestData
=
$data
;
$this
->
member
=
\DAO\MemberModel
::
getInstance
()
->
find
(
$this
->
memberId
);
$this
->
member
=
\DAO\MemberModel
::
getInstance
()
->
getInfo
(
$this
->
memberId
);
$return
=
array
();
$orderInfo
=
$this
->
getOrder
();
if
(
$data
[
'channel'
]
==
\Our\NameConst
::
wxAppChannel
){
...
...
application/models/Business/User/MemberService.php
View file @
a9187d70
...
...
@@ -567,12 +567,12 @@ class MemberServiceModel extends \Business\AbstractModel
return
false
;
}
$memberDao
=
\DAO\MemberModel
::
getInstance
(
\Our\DbNameConst
::
masterDBConnectName
);
$existMember
=
$memberDao
->
find
(
$memberMapping
[
'member_id'
]);
$existMember
=
$memberDao
->
getInfo
(
$memberMapping
[
'member_id'
]);
if
(
!
$existMember
){
$memberMappingDao
->
del
(
array
(
'id'
=>
$memberMapping
[
'id'
]));
return
false
;
}
if
(
$existMember
[
'member
_mobile'
]
&&
$existMember
[
'member_mobile_b
ind'
]){
if
(
$existMember
[
'member
Mobile'
]
&&
$existMember
[
'memberMobileB
ind'
]){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
registerMemberInfoFailed
);
}
$member
[
'member_mobile'
]
=
$where
[
'mobile'
];
...
...
application/models/DAO/Member.php
View file @
a9187d70
...
...
@@ -26,30 +26,6 @@ class MemberModel extends \DAO\AbstractModel
$this
->
memberMysql
=
\Mysql\MemberModel
::
getInstance
();
}
/**
* 根据用户编号查找数据
*
* @param int $userId
* @return array
*/
public
function
find
(
$userId
)
{
$redis
=
\Redis\Db0\MemberRedisModel
::
getInstance
();
$user
=
$redis
->
find
(
$userId
);
if
(
!
$user
)
{
$this
->
setDb
(
$this
->
dbName
);
$user
=
$this
->
db
->
select
(
\Our\NameConst
::
allField
)
->
from
(
$this
->
_tableName
)
->
where
(
array
(
'member_id'
=>
$userId
))
->
fetchOne
();
//$mysql = \Mysql\MemberModel::getInstance();
//$user = $mysql->find($userId);
if
(
$user
)
{
$memberAvatarUrl
=
$this
->
getMemberAvatarUrl
(
$user
[
'member_id'
],
$user
[
'member_avatar'
]);
$user
[
'memberAvatarUrl'
]
=
$memberAvatarUrl
;
$redis
->
update
(
$userId
,
$user
);
}
}
return
$user
;
}
/**
* 获取会员头像
...
...
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