update

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -212,11 +212,10 @@ public class OrderServe implements Serializable {
             if (discountRate == null) {
                 price = servePrice;
             } else {
-                price = servePrice.multiply(BigDecimal.ONE.subtract(discountRate));
-                leisurePrice = price;
+                leisurePrice = servePrice.multiply(discountRate);
+                price = leisurePrice;
             }
         } else {
-            //有没有闲时
             if (discountRate == null) {
                 //没有活动价格
                 if (promotionPrice == null) {
@@ -227,7 +226,7 @@ public class OrderServe implements Serializable {
                     price = produceCurrentPrice.min(promotionPrice);
                 }
             } else {
-                leisurePrice = produceBargainPrice.multiply(BigDecimal.ONE.subtract(discountRate));
+                leisurePrice = produceBargainPrice.multiply(discountRate);
                 //没有活动价格
                 if (promotionPrice == null) {
                     price = leisurePrice.min(produceCurrentPrice);