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
b7ad6684
Commit
b7ad6684
authored
Sep 26, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
message
parent
25d2b16c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
ApiConst.php
application/library/Our/ApiConst.php
+1
-0
DescribeConst.php
application/library/Our/DescribeConst.php
+11
-11
MessageService.php
application/models/Business/Message/MessageService.php
+1
-1
No files found.
application/library/Our/ApiConst.php
View file @
b7ad6684
...
...
@@ -81,6 +81,7 @@ class ApiConst
const
storeMessageType
=
4
;
//普通用户消息类型
const
memberMessageType
=
5
;
const
ordinaryMessage
=
0
;
const
onePictureMessage
=
21
;
...
...
application/library/Our/DescribeConst.php
View file @
b7ad6684
<?php
namespace
Our
;
/**
* 这个是路由
定
义 。
* 这个是路由
订
义 。
*
* @author Administrator
*
...
...
@@ -31,9 +31,9 @@ class DescribeConst
const
registerMemberFailed
=
'注册失败'
;
const
cancelBindingSuccess
=
'取消绑
定
成功'
;
const
cancelBindingSuccess
=
'取消绑
订
成功'
;
const
bindingSuccess
=
'绑
定
成功'
;
const
bindingSuccess
=
'绑
订
成功'
;
const
findPasswordSendMsgSuccess
=
'找回密码发送验证码成功'
;
...
...
@@ -45,9 +45,9 @@ class DescribeConst
const
changeMobileSuccess
=
'修改手机号码成功'
;
const
bindMobileForWxSuccess
=
'绑
定
手机成功'
;
const
bindMobileForWxSuccess
=
'绑
订
手机成功'
;
const
thirdPlatformBindSuccess
=
'第三方账号绑
定
成功'
;
const
thirdPlatformBindSuccess
=
'第三方账号绑
订
成功'
;
const
memberNamePrefix
=
'身边店友_'
;
...
...
@@ -106,12 +106,12 @@ class DescribeConst
const
applySuccess
=
'申请成功'
;
const
noLimitCoupon
=
'无门槛'
;
const
specialCoupon
=
'指
定
券'
;
const
specialCoupon
=
'指
订
券'
;
const
giftCoupon
=
'礼品券'
;
const
couponFullAvailable
=
'满{0}可用'
;
const
couponFullDiscount
=
'满{0}享{1}折'
;
const
couponFullForCoupon
=
'满{0}送指
定
券'
;
const
couponFullForCoupon
=
'满{0}送指
订
券'
;
const
couponFullForGift
=
'满{0}送礼品券'
;
const
noLimitGoodsCouponName
=
'元无门槛'
;
const
available
=
'可用'
;
...
...
@@ -148,12 +148,12 @@ class DescribeConst
const
refundRetund
=
'退货'
;
//用户订单送达消息
const
reacheRemindTitle
=
'
你
的订单已经送达'
;
const
reacheRemindContent
=
'
你
有新的订单号为{0}的订单已经送达'
;
const
reacheRemindTitle
=
'
您
的订单已经送达'
;
const
reacheRemindContent
=
'
您
有新的订单号为{0}的订单已经送达'
;
//店铺有新订单
const
recieveWaitTitle
=
'
你有新的定
单'
;
const
recieveWaitContent
=
'
你
有新的订单号为{0}的订单,是否需要接单'
;
const
recieveWaitTitle
=
'
您有新的订
单'
;
const
recieveWaitContent
=
'
您
有新的订单号为{0}的订单,是否需要接单'
;
//消息按钮成功提示信息
const
recieveOrderSuccess
=
'接单成功'
;
...
...
application/models/Business/Message/MessageService.php
View file @
b7ad6684
...
...
@@ -192,7 +192,7 @@ class MessageServiceModel extends \Business\AbstractModel
$member
[
'uid'
]
=
$store
[
'store_id'
];
$member
[
'name'
]
=
$store
[
'store_name'
];
}
if
(
$type
==
ApiConst
::
memberMessageType
)
{
if
(
$type
==
ApiConst
::
memberMessageType
||
$type
==
ApiConst
::
memberMessageType
)
{
$memberDao
=
\DAO\MemberModel
::
getInstance
();
$member
=
$memberDao
->
getOneByMemberId
(
$memberId
,
'member_id,member_name'
);
$member
[
'uid'
]
=
$member
[
'member_id'
];
...
...
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