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
b6a57ad4
Commit
b6a57ad4
authored
Nov 30, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息问题
parent
5bc18e05
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
Message.php
application/controllers/Message.php
+1
-0
MessageService.php
application/models/Business/Message/MessageService.php
+1
-1
No files found.
application/controllers/Message.php
View file @
b6a57ad4
...
...
@@ -29,6 +29,7 @@ class MessageController extends \Our\Controller_AbstractApi {
if
(
empty
(
$this
->
req
[
'data'
][
'toId'
])){
$this
->
req
[
'data'
][
'toId'
]
=
\Our\ApiConst
::
zero
;
}
$returnMessage
=
$this
->
messageService
->
getMemberList
(
$this
->
memberId
,
$this
->
req
[
'data'
][
'fromType'
],
$this
->
req
[
'data'
][
'toId'
],
$otherId
,
$this
->
req
[
'data'
][
'toType'
],
'*'
,
$pageIndex
,
$pageSize
);
// $returnMessage=\Our\RedisHelper::cachedFunction(\Redis\Db15\MessageRedisModel::getInstance(),array(&$this->messageService, 'getMemberList'),array($this->memberId,$this->req['data']['fromType'],$this->req['data']['toId'],$this->req['data']['toType'],'*',$pageIndex,$pageSize),\Our\ApiConst::oneHour,array($this->memberId));
}
else
{
...
...
application/models/Business/Message/MessageService.php
View file @
b6a57ad4
...
...
@@ -155,7 +155,7 @@ class MessageServiceModel extends \Business\AbstractModel
// $avatar = $storeData[ApiConst::one];
}
if
(
$type
==
ApiConst
::
memberMessageType
||
$type
==
ApiConst
::
serviceMessageType
)
{
if
(
$type
==
ApiConst
::
memberMessageType
||
$type
==
ApiConst
::
serviceMessageType
||
$type
==
ApiConst
::
diliveryMessageOrder
||
$type
==
ApiConst
::
deliveryUserMessageType
)
{
$member
=
\DAO\MemberModel
::
getInstance
();
$memerAvatar
=
$member
->
getInfo
(
$userid
,
'member_avatar'
);
$avatar
=
$member
->
getMemberAvatarUrl
(
$userid
,
$memerAvatar
);
...
...
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