入参注解修改

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/BatchOperateCartGoodsRequestVo.java

@@ -4,14 +4,15 @@ import cn.freemud.service.impl.mcoffee.entity.BatchGoodsInfoVo;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data
 public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
 
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
 
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/BatchUpdateGoodsQtyRequestVo.java

@@ -3,15 +3,16 @@ package cn.freemud.entities.vo;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data
 public class BatchUpdateGoodsQtyRequestVo extends BaseRequestVo{
 
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
 
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
 
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/QueryCartInfoRequestVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -21,23 +22,27 @@ import javax.validation.constraints.NotNull;
 @Data
 public class QueryCartInfoRequestVo {
     @ApiModelProperty(value = "用户Id",required = true)
-    @NotEmpty(message = "用户Id不可为空")
+    @NotBlank(message = "用户Id不可为空")
     private String userId;
+
     @ApiModelProperty(value = "商户Id",required = true)
-    @NotEmpty(message = "商户Id不可为空")
+    @NotBlank(message = "商户Id不可为空")
     private String partnerId;
+
     @ApiModelProperty(value = "门店id",required = true)
-    @NotEmpty(message = "门店id不可为空")
+    @NotBlank(message = "门店id不可为空")
     private String storeId;
+
     @ApiModelProperty(value = "sessionId",required = true)
-    @NotEmpty(message = "用户sessionId不可为空")
+    @NotBlank(message = "用户sessionId不可为空")
     private String sessionId;
 
     @ApiModelProperty(value = "appId",required = true)
-    @NotEmpty(message = "appId不可为空")
+    @NotBlank(message = "appId不可为空")
     private String appId;
+
     @ApiModelProperty(value = "menuType",notes = "业务类型： 0 : 自提 1：外卖 2：微商城",required = true)
-    @NotEmpty(message ="业务类型不可为空")
+    @NotBlank(message ="业务类型不可为空")
     private String menuType ;
 
     @ApiModelProperty(value = "订单类型")

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -18,6 +18,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -27,7 +28,7 @@ import java.util.List;
 @Builder
 public class ShoppingCartInfoRequestVo extends BaseRequestVo {
 
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
 
     private String version;
@@ -47,7 +48,7 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private Integer type;
 
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
     /**
      * 是否为结算页

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -15,20 +15,21 @@ package cn.freemud.entities.vo;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
 public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
 
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
 
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
     /**
      * 购物车一行的ID
      */
-    @NotEmpty(message = "cartGoodsUid不能为空")
+    @NotBlank(message = "cartGoodsUid不能为空")
     private String cartGoodsUid;
 
     /**

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CopyShoppingCartRequestVo.java

@@ -3,6 +3,8 @@ package cn.freemud.service.impl.mcoffee.entity;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -18,18 +20,18 @@ import org.hibernate.validator.constraints.NotEmpty;
 @Data
 public class CopyShoppingCartRequestVo {
 
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
     /**
      * 商户Id
      */
-    @NotEmpty(message = "partnerId不能为空")
+    @NotBlank(message = "partnerId不能为空")
     private String partnerId;
 
     /**
      * 微信appId
      */
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
 
     /**
@@ -41,7 +43,7 @@ public class CopyShoppingCartRequestVo {
     /**
      * 订单号
      */
-    @NotEmpty(message = "orderId不能为空")
+    @NotBlank(message = "orderId不能为空")
     private String orderId;
 
     /**

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java

@@ -4,6 +4,7 @@ import cn.freemud.entities.vo.*;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -23,18 +24,18 @@ import java.util.List;
 public class MCoffeeAddGoodsRequestVo {
 
 
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
     /**
      * 商户Id
      */
-    @NotEmpty(message = "partnerId不能为空")
+    @NotBlank(message = "partnerId不能为空")
     private String partnerId;
 
     /**
      * 微信appId
      */
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
     /**
      * 门店Id
@@ -53,7 +54,7 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String channelType;
 
-    @NotEmpty(message = "spuId不能为空")
+    @NotBlank(message = "spuId不能为空")
     private String spuId;
 
     private String skuId;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeBatchAddGoodsRequestVo.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -20,18 +21,18 @@ import java.util.List;
 @Getter
 @Setter
 public class MCoffeeBatchAddGoodsRequestVo {
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
     /**
      * 商户Id
      */
-    @NotEmpty(message = "partnerId不能为空")
+    @NotBlank(message = "partnerId不能为空")
     private String partnerId;
 
     /**
      * 微信appId
      */
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
     /**
      * 门店Id

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/SwitchShoppingCartRequestVo.java

@@ -4,6 +4,7 @@ import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -21,25 +22,25 @@ import java.util.List;
 @Data
 public class SwitchShoppingCartRequestVo {
 
-    @NotEmpty(message = "sessionId不能为空")
+    @NotBlank(message = "sessionId不能为空")
     private String sessionId;
 
-    @NotEmpty(message = "appId不能为空")
+    @NotBlank(message = "appId不能为空")
     private String appId;
 
     /**
      * 商户Id
      */
-    @NotEmpty(message = "partnerId不能为空")
+    @NotBlank(message = "partnerId不能为空")
     private String partnerId;
 
     /**
      * 门店Id
      */
-    @NotEmpty(message = "fromShopId不能为空")
+    @NotBlank(message = "fromShopId不能为空")
     private String fromShopId;
 
-    @NotEmpty(message = "toShopId不能为空")
+    @NotBlank(message = "toShopId不能为空")
     private String toShopId;
     /**
      * 下单类型 CreateOrderType 外卖、到店、商城