update

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

@@ -217,8 +217,17 @@ public class OrderServe implements Serializable {
 //                leisureDiscountPrice = servePrice.multiply(discountRate);
             }
         } else {
+            if (discountRate == null) {
+                //没有活动价格
+                if (promotionPrice == null) {
+                    price = produceCurrentPrice;
+                }
+                //有活动价
+                else {
+                    price = produceCurrentPrice.min(promotionPrice);
+                }
+            } else {
                 leisurePrice = produceBargainPrice.multiply(BigDecimal.ONE.subtract(discountRate));
-//            leisureDiscountPrice = produceBargainPrice.multiply(discountRate);
                 //没有活动价格
                 if (promotionPrice == null) {
                     price = leisurePrice.min(produceCurrentPrice);
@@ -228,6 +237,8 @@ public class OrderServe implements Serializable {
                     price = leisurePrice.min(produceCurrentPrice).min(promotionPrice);
                 }
             }
+
+        }
     }
 
     public Boolean isActivity() {

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

@@ -194,8 +194,17 @@ public class ScheduleServe implements Serializable {
 //                leisureDiscountPrice = servePrice.multiply(discountRate);
             }
         } else {
+            if (discountRate == null) {
+                //没有活动价格
+                if (promotionPrice == null) {
+                    price = produceCurrentPrice;
+                }
+                //有活动价
+                else {
+                    price = produceCurrentPrice.min(promotionPrice);
+                }
+            } else {
                 leisurePrice = produceBargainPrice.multiply(BigDecimal.ONE.subtract(discountRate));
-//            leisureDiscountPrice = produceBargainPrice.multiply(discountRate);
                 //没有活动价格
                 if (promotionPrice == null) {
                     price = leisurePrice.min(produceCurrentPrice);
@@ -205,6 +214,8 @@ public class ScheduleServe implements Serializable {
                     price = leisurePrice.min(produceCurrentPrice).min(promotionPrice);
                 }
             }
+
+        }
     }
 
     public Boolean isActivity() {

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -216,7 +216,11 @@ public class Schedule {
                     Customer customer = customerService.getById(scheduleManage.getScheduledUser());
                     StoreManage storeManage = storeManageService.getById(scheduleManage.getDepartmentId());
                     if (customer != null) {
+                        try {
                             subscribeService.sendOverScheduleMsg(customer.getOpenid1(), scheduleServeList.get(0).getServeName(), scheduleManage.getArriveTime(), storeManage.getName(), storeManage.getAddress());
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
             });