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
86ed79a4
Commit
86ed79a4
authored
Apr 23, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
套餐价格重新计算
parent
05ddc21b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
+1
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
View file @
86ed79a4
...
@@ -111,7 +111,7 @@ public class SetMealCalculation {
...
@@ -111,7 +111,7 @@ public class SetMealCalculation {
if
(
StringUtils
.
isEmpty
(
cartGoods
.
getCouponCode
())
if
(
StringUtils
.
isEmpty
(
cartGoods
.
getCouponCode
())
||
(
null
!=
calculationDiscountResult
.
getMonthlyEnjoyCardDiscount
()
||
(
null
!=
calculationDiscountResult
.
getMonthlyEnjoyCardDiscount
()
&&
StringUtils
.
isNotBlank
(
calculationDiscountResult
.
getMonthlyEnjoyCardDiscount
().
getCouponCode
())
&&
StringUtils
.
isNotBlank
(
calculationDiscountResult
.
getMonthlyEnjoyCardDiscount
().
getCouponCode
())
&&
cartGoods
.
equals
(
calculationDiscountResult
.
getMonthlyEnjoyCardDiscount
().
getCoupon
Logo
())))
{
&&
cartGoods
.
equals
(
calculationDiscountResult
.
getMonthlyEnjoyCardDiscount
().
getCoupon
Code
())))
{
Long
amount
=
null
!=
cartGoods
.
getFinalPrice
()
?
cartGoods
.
getFinalPrice
()
*
cartGoods
.
getQty
()
+
productGroupTotalAmount
+
materialPrice
:
Long
amount
=
null
!=
cartGoods
.
getFinalPrice
()
?
cartGoods
.
getFinalPrice
()
*
cartGoods
.
getQty
()
+
productGroupTotalAmount
+
materialPrice
:
productGroupTotalAmount
+
productComboTotalAmount
+
materialPrice
;
productGroupTotalAmount
+
productComboTotalAmount
+
materialPrice
;
cartGoods
.
setAmount
(
amount
);
cartGoods
.
setAmount
(
amount
);
...
...
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