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
71cc8654
Commit
71cc8654
authored
Sep 30, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单成功优惠券
parent
00796f8b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
OrderService.php
application/models/Business/Order/OrderService.php
+3
-3
No files found.
application/models/Business/Order/OrderService.php
View file @
71cc8654
...
...
@@ -1008,10 +1008,10 @@ class OrderServiceModel extends \Business\AbstractModel
$orderAmount
=
intval
(
$coupon
[
'order_amount'
]);
if
(
$coupon
[
'type'
]
==
\Our\ApiConst
::
noLimitCoupon
)
{
//无门槛优惠券
$temp
[
'type'
]
=
\Our\ApiConst
::
noLimitCouponType
;
$temp
[
'title'
]
=
$coupon
[
'cash_money'
]
;
$temp
[
'title'
]
=
intval
(
$coupon
[
'cash_money'
])
;
$temp
[
'subTitle'
]
=
\Our\DescribeConst
::
noLimitCoupon
;
}
else
if
(
$coupon
[
'coupon_type'
]
==
\Our\ApiConst
::
fullMinusCouponType
)
{
//满额减免券
$temp
[
'title'
]
=
$coupon
[
'cash_money'
]
;
$temp
[
'title'
]
=
intval
(
$coupon
[
'cash_money'
])
;
$temp
[
'subTitle'
]
=
\Our\Common
::
format
(
\Our\DescribeConst
::
couponFullAvailable
,
$orderAmount
);
}
else
if
(
$coupon
[
'coupon_type'
]
==
\Our\ApiConst
::
discountCouponType
)
{
$temp
[
'title'
]
=
$coupon
[
'discount'
];
...
...
@@ -1025,7 +1025,7 @@ class OrderServiceModel extends \Business\AbstractModel
}
$temp
[
'storeId'
]
=
$coupon
[
'store_id'
];
if
(
$temp
[
'storeId'
])
{
$storeInfo
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$temp
[
'storeId'
],
'store_name'
),
\Our\ApiConst
::
oneHour
);
$storeInfo
=
$storeDao
->
get
(
$temp
[
'storeId'
],
false
);
if
(
!
$storeInfo
)
{
continue
;
}
...
...
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