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
67107658
Commit
67107658
authored
Sep 03, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券
parent
ced4dab9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
DescribeConst.php
application/library/Our/DescribeConst.php
+1
-0
CouponService.php
application/models/Business/Coupon/CouponService.php
+1
-1
No files found.
application/library/Our/DescribeConst.php
View file @
67107658
...
...
@@ -113,6 +113,7 @@ class DescribeConst
const
couponFullForGift
=
'满{0}送礼品券'
;
const
noLimitGoodsCouponName
=
'元无门槛'
;
const
available
=
'可用'
;
const
minus
=
'减'
;
const
couponTitleFullAvailAbleNoAmountLimit
=
'全场减{0}'
;
//无门槛减免券
...
...
application/models/Business/Coupon/CouponService.php
View file @
67107658
...
...
@@ -304,7 +304,7 @@ class CouponServiceModel extends \Business\AbstractModel{
if
(
$coupon
[
'type'
]
==
\Our\ApiConst
::
noLimitCouponType
){
$couponTitles
[]
=
$coupon
[
'title'
]
.
\Our\DescribeConst
::
noLimitGoodsCouponName
;
}
else
if
(
$coupon
[
'type'
]
==
\Our\ApiConst
::
fullMinusCouponType
){
$couponTitles
[]
=
str_replace
(
\Our\DescribeConst
::
available
,
$coupon
[
'title'
],
$coupon
[
'subTitle'
]);
$couponTitles
[]
=
str_replace
(
\Our\DescribeConst
::
available
,
\Our\DescribeConst
::
minus
.
$coupon
[
'title'
],
$coupon
[
'subTitle'
]);
}
else
{
$couponTitles
[]
=
$coupon
[
'subTitle'
];
}
...
...
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