update

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -183,7 +183,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
                     ProducePromotionTime producePromotionTime = producePromotionTimeMapper
                             .queryByProduceId(orderServeParam.getProduceId(),
-                                    orderServeParam.getStartTime().toString());
+                                    new Date().toString());
                     //如果款式有活动价格
                     if (producePromotionTime != null && producePromotionTime.isPromotion()) {
                         builder.producePromotionTimeId(producePromotionTime.getId());
@@ -280,7 +280,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
                     ProducePromotionTime producePromotionTime = producePromotionTimeMapper.queryByProduceId(
                             orderServeParam.getProduceId(),
-                            orderServeParam.getStartTime().toString());
+                            orderServe.getStartTime().toString());
                     //如果款式有活动价格
                     if (producePromotionTime != null && producePromotionTime.isPromotion()) {
                         orderServe.setProducePromotionTimeId(producePromotionTime.getId());

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

@@ -214,9 +214,9 @@ public class OrderServe implements Serializable {
             } else {
                 price = servePrice.multiply(BigDecimal.ONE.subtract(discountRate));
                 leisurePrice = price;
-//                leisureDiscountPrice = servePrice.multiply(discountRate);
             }
         } else {
+            //有没有闲时
             if (discountRate == null) {
                 //没有活动价格
                 if (promotionPrice == null) {