Commit 40e64829 by huluobin

update

parent 2f45befe
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment