update

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

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

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

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

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) {
-                        subscribeService.sendOverScheduleMsg(customer.getOpenid1(), scheduleServeList.get(0).getServeName(), scheduleManage.getArriveTime(), storeManage.getName(), storeManage.getAddress());
+                        try {
+                            subscribeService.sendOverScheduleMsg(customer.getOpenid1(), scheduleServeList.get(0).getServeName(), scheduleManage.getArriveTime(), storeManage.getName(), storeManage.getAddress());
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
             });