Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
bd3a5595
Commit
bd3a5595
authored
Mar 15, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
b6d95406
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
+4
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
View file @
bd3a5595
...
@@ -584,7 +584,9 @@ public class CouponServiceImpl implements CouponService {
...
@@ -584,7 +584,9 @@ public class CouponServiceImpl implements CouponService {
usableCoupons
.
add
(
activityCouponBean
);
usableCoupons
.
add
(
activityCouponBean
);
usableCouponNum
=
usableCouponNum
+
1
;
usableCouponNum
=
usableCouponNum
+
1
;
}
else
{
}
else
{
activityCouponBean
.
setUnusedReason
(
"结算页商品券返回提示商品券只能在点餐页"
);
if
(
Objects
.
equals
(
couponStateVo
.
getType
(),
CouponTypeEnum
.
TYPE_0
.
getCode
())
||
Objects
.
equals
(
couponStateVo
.
getType
(),
CouponTypeEnum
.
TYPE_4
.
getCode
())){
activityCouponBean
.
setUnusedReason
(
"商品券只能在点餐页"
);
}
disableCoupons
.
add
(
activityCouponBean
);
disableCoupons
.
add
(
activityCouponBean
);
disableCouponNum
=
disableCouponNum
+
1
;
disableCouponNum
=
disableCouponNum
+
1
;
}
}
...
@@ -594,7 +596,7 @@ public class CouponServiceImpl implements CouponService {
...
@@ -594,7 +596,7 @@ public class CouponServiceImpl implements CouponService {
disableCouponNum
=
disableCouponNum
+
1
;
disableCouponNum
=
disableCouponNum
+
1
;
}
else
if
(
Objects
.
equals
(
couponStateVo
.
getType
(),
CouponTypeEnum
.
TYPE_0
.
getCode
())
||
Objects
.
equals
(
couponStateVo
.
getType
(),
CouponTypeEnum
.
TYPE_4
.
getCode
()))
{
}
else
if
(
Objects
.
equals
(
couponStateVo
.
getType
(),
CouponTypeEnum
.
TYPE_0
.
getCode
())
||
Objects
.
equals
(
couponStateVo
.
getType
(),
CouponTypeEnum
.
TYPE_4
.
getCode
()))
{
activityCouponBean
.
setCouponPic
(
memberCoupon
.
getLogo
());
activityCouponBean
.
setCouponPic
(
memberCoupon
.
getLogo
());
activityCouponBean
.
setUnusedReason
(
"
结算页商品券返回提示
商品券只能在点餐页"
);
activityCouponBean
.
setUnusedReason
(
"商品券只能在点餐页"
);
disableCoupons
.
add
(
activityCouponBean
);
disableCoupons
.
add
(
activityCouponBean
);
disableCouponNum
=
disableCouponNum
+
1
;
disableCouponNum
=
disableCouponNum
+
1
;
}
else
{
}
else
{
...
...
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