update

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

@@ -267,6 +267,7 @@ public class OrderManage implements Serializable {
         this.totalPaymentAmount = this.totalPaymentAmount.subtract(discountPrice);
     }
 
+    @ApiModelProperty("是否发送评论服务通知 0-没有 1-是")
     private Integer isSendCommentMsg;
 
 }

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

@@ -145,7 +145,7 @@ public class ScheduleManage implements Serializable {
     private Customer customer;
 
     public void setRemark(String remark) {
-        this.remark = remark + "," + remark;
+        this.remark = this.remark + "," + remark;
     }
 
     public void addScheduleServeList(Collection<ScheduleServe> scheduleServes) {

src/main/java/com/gogirl/infrastructure/config/MvcInterceptorConfig.java

@@ -32,7 +32,7 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
                 .excludePathPatterns("/customer/message/pageIn")
                 .excludePathPatterns("/customer/message/pageOut")
                 .excludePathPatterns("/customer/message/logoutLog")
-
+                .excludePathPatterns("/customer/leisure/queryMinDiscount")
                 .excludePathPatterns("/customer/xcx/login")
                 .excludePathPatterns("/customer/csrf")
                 .excludePathPatterns("/customer/mallCategory/getCategoryTree")

src/main/java/com/gogirl/infrastructure/config/WxProperties.java

@@ -47,4 +47,10 @@ public class WxProperties {
 
 
     public String testPaperTpl;
+
+    private String shopScheduleTpl;
+
+    private String shopOverScheduleTpl;
+
+    private String shopCancelScheduleTpl;
 }

src/main/java/com/gogirl/infrastructure/subscribe/impl/SubscribeServiceImpl.java

@@ -52,7 +52,6 @@ public class SubscribeServiceImpl implements SubscribeService {
                         .thing9(new MessageValue(tips))
                         .build())
                 .build());
-
     }
 
 

src/main/resources/application-dev.yml

@@ -18,6 +18,15 @@ wechat:
   # 订单支付订阅消息模板id
   order-pay-notify-tpl: s-8lqwTRQSDo_O8t_rYIVt9GNpU_bDuySSE2NU5e10A
 
+  # 预约提醒订阅店铺消息模板id
+  shop-schedule-tpl: mk75H3St_zEs5Cy5llC2bVyfnQX8T0HWy5r3i1ExNXQ
+  # 预约过期订阅店铺消息模板id
+  shop-over-schedule-tpl: g-H8tAAqU3f8YdJzvU7G-fShqIwaytrWZA9gOr4QmnA
+  # 取消预约店铺提醒
+  shop-cancel-schedule-tpl: EyvDd0EwLHPQb9JyAd9607mZu23HaIcgOCCtSxsAyqM
+  #
+  test-paper-tpl: 77cxQdb-U8VgqHSZrXK1wHK0YLMXAypqqYlwLeUy0vo
+
 spring:
   #微服务名称
   application:
@@ -65,8 +74,11 @@ gogirl:
   picture-path: /Users/huluobin/upload/pictures/
 
   end-time: "22:00:00"
+  #
   start-time: "10:00:00"
 
+  test-paper-time: 1
+
 
 server:
   port: 5444

src/main/resources/application-pre.yml

@@ -18,6 +18,15 @@ wechat:
   # 订单支付订阅消息模板id
   order-pay-notify-tpl: s-8lqwTRQSDo_O8t_rYIVt9GNpU_bDuySSE2NU5e10A
 
+  # 预约提醒订阅店铺消息模板id
+  shop-schedule-tpl: mk75H3St_zEs5Cy5llC2bVyfnQX8T0HWy5r3i1ExNXQ
+  # 预约过期订阅店铺消息模板id
+  shop-over-schedule-tpl: g-H8tAAqU3f8YdJzvU7G-fShqIwaytrWZA9gOr4QmnA
+  # 取消预约店铺提醒
+  shop-cancel-schedule-tpl: EyvDd0EwLHPQb9JyAd9607mZu23HaIcgOCCtSxsAyqM
+  #
+  test-paper-tpl: 77cxQdb-U8VgqHSZrXK1wHK0YLMXAypqqYlwLeUy0vo
+
 spring:
   #微服务名称
   application:
@@ -65,7 +74,8 @@ gogirl:
 
   end-time: "22:00:00"
   start-time: "10:00:00"
-
+  #评论延迟时间
+  test-paper-time: 1
 wx:
   pay:
     appId: wxd5e3224465422206

src/main/resources/application-prod.yml

@@ -19,6 +19,15 @@ wechat:
   # 订单支付订阅消息模板id
   order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
 
+  # 预约提醒订阅店铺消息模板id
+  shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
+  # 预约过期订阅店铺消息模板id
+  shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
+  # 取消预约店铺提醒
+  shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
+
+  test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
+
 spring:
   # 微服务名称
   application:
@@ -67,6 +76,10 @@ gogirl:
 
   end-time: "22:00:00"
   start-time: "10:00:00"
+
+  #评论延迟时间
+  test-paper-time: 1
+
 # 注册中心配置
 eureka:
   client:

src/main/resources/application-test.yml

@@ -18,6 +18,15 @@ wechat:
   # 订单支付订阅消息模板id
   order-pay-notify-tpl: s-8lqwTRQSDo_O8t_rYIVt9GNpU_bDuySSE2NU5e10A
 
+  # 预约提醒订阅店铺消息模板id
+  shop-schedule-tpl: mk75H3St_zEs5Cy5llC2bVyfnQX8T0HWy5r3i1ExNXQ
+  # 预约过期订阅店铺消息模板id
+  shop-over-schedule-tpl: g-H8tAAqU3f8YdJzvU7G-fShqIwaytrWZA9gOr4QmnA
+  # 取消预约店铺提醒
+  shop-cancel-schedule-tpl: EyvDd0EwLHPQb9JyAd9607mZu23HaIcgOCCtSxsAyqM
+  #
+  test-paper-tpl: 77cxQdb-U8VgqHSZrXK1wHK0YLMXAypqqYlwLeUy0vo
+
 spring:
   #微服务名称
   application: