bugfix;

share-front/src/main/java/share/web/interceptor/FrontTokenInterceptor.java

@@ -62,14 +62,14 @@ public class FrontTokenInterceptor implements HandlerInterceptor {
         SConsumer userEntry = frontTokenComponent.getLoginSConsumerEntry(request);
         if(userEntry!=null){
             FrontTokenComponent.loginSConsumerEntryThreadLocal.set(userEntry);
-        }else {
+        }/*else {
             token = "f788beab1ea14f0ab3a369e4c66ee627";
             userEntry = new SConsumer();
             userEntry.setId(1714160213741535234L);
             userEntry.setAccount("15527462530");
             userEntry.setPhone("15527462530");
             FrontTokenComponent.loginSConsumerEntryThreadLocal.set(userEntry);
-        }
+        }*/
        if(token == null || token.isEmpty() || userEntry == null){
             //判断路由，部分路由不管用户是否登录都可以访问
             boolean result = frontTokenComponent.checkRouter(RequestUtil.getUri(request));

share-system/src/main/java/share/system/request/OrderComputedPriceRequest.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -19,11 +20,11 @@ import java.util.Date;
 @ApiModel(value="OrderComputedPriceRequest对象", description="计算订单价格请求对象")
 public class OrderComputedPriceRequest {
     @ApiModelProperty(value = "门店ID", required = true)
-    @NotBlank(message = "门店ID不能为空")
+    @NotNull(message = "门店ID不能为空")
     private Long storeId;
 
     @ApiModelProperty(value = "房间ID", required = true)
-    @NotBlank(message = "房间ID不能为空")
+    @NotNull(message = "房间ID不能为空")
     private Long roomId;
 
     @ApiModelProperty(value = "优惠券id")
@@ -33,20 +34,20 @@ public class OrderComputedPriceRequest {
     private Long packId;
 
     @ApiModelProperty(value = "订单类型(0:订房订单，1：续房订单，2：充值订单)", required = true)
-    @NotBlank(message = "订单类型不能为空")
+    @NotNull(message = "订单类型不能为空")
     private Integer orderType;
 
     @ApiModelProperty(value = "购买方式(1：小时，2：套餐)", required = true)
-    @NotBlank(message = "购买方式不能为空")
+    @NotNull(message = "购买方式不能为空")
     private Integer buyType;
 
     /** 预约开始时间 */
     @ApiModelProperty(value = "预约开始时间 yyyy-MM-dd HH:mm", required = true)
-    @NotBlank(message = "预约开始时间不能为空")
+    @NotNull(message = "预约开始时间不能为空")
     private Date preStartDate;
 
     /** 预约结束时间 */
     @ApiModelProperty(value = "预约结束时间 yyyy-MM-dd HH:mm", required = true)
-    @NotBlank(message = "预约结束时间不能为空")
+    @NotNull(message = "预约结束时间不能为空")
     private Date preEndDate;
 }