Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
40e64829
Commit
40e64829
authored
Mar 17, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
2f45befe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
ScheduleServe.java
...ain/java/com/gogirl/domain/order/serve/ScheduleServe.java
+3
-4
No files found.
src/main/java/com/gogirl/domain/order/serve/ScheduleServe.java
View file @
40e64829
...
@@ -189,9 +189,8 @@ public class ScheduleServe implements Serializable {
...
@@ -189,9 +189,8 @@ public class ScheduleServe implements Serializable {
if
(
discountRate
==
null
)
{
if
(
discountRate
==
null
)
{
price
=
servePrice
;
price
=
servePrice
;
}
else
{
}
else
{
price
=
servePrice
.
multiply
(
BigDecimal
.
ONE
.
subtract
(
discountRate
));
leisurePrice
=
servePrice
.
multiply
(
discountRate
);
leisurePrice
=
price
;
price
=
leisurePrice
;
// leisureDiscountPrice = servePrice.multiply(discountRate);
}
}
}
else
{
}
else
{
if
(
discountRate
==
null
)
{
if
(
discountRate
==
null
)
{
...
@@ -204,7 +203,7 @@ public class ScheduleServe implements Serializable {
...
@@ -204,7 +203,7 @@ public class ScheduleServe implements Serializable {
price
=
produceCurrentPrice
.
min
(
promotionPrice
);
price
=
produceCurrentPrice
.
min
(
promotionPrice
);
}
}
}
else
{
}
else
{
leisurePrice
=
produceBargainPrice
.
multiply
(
BigDecimal
.
ONE
.
subtract
(
discountRate
)
);
leisurePrice
=
produceBargainPrice
.
multiply
(
discountRate
);
//没有活动价格
//没有活动价格
if
(
promotionPrice
==
null
)
{
if
(
promotionPrice
==
null
)
{
price
=
leisurePrice
.
min
(
produceCurrentPrice
);
price
=
leisurePrice
.
min
(
produceCurrentPrice
);
...
...
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