Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtCertificationParam.java

@@ -37,25 +37,35 @@ public class GoblinStoreMgtCertificationParam implements java.io.Serializable {
     @Pattern(regexp = "\\b(0|1)\\b", message = "证件是否长期有效参数无效")
     private String personCertLasting;
     @ApiModelProperty(position = 17, required = true, value = "证件正面照[256]", example = "http://pic.zhengzai.tv/202201/F1/50/1641481155557_6581EB9242485010CE0133147DF5D080.jpg")
+    @Size(max = 256, message = "证件正面照URL过长")
     private String personCertFpic;
     @ApiModelProperty(position = 18, required = true, value = "证件背面照[256]", example = "http://pic.zhengzai.tv/202201/C3/C7/1641361041_5D81A954265418219490CB2538239880.jpg")
+    @Size(max = 256, message = "证件背面照URL过长")
     private String personCertBpic;
     @ApiModelProperty(position = 19, required = true, value = "证件手持照[256]", example = "http://pic.zhengzai.tv/202201/81/30/1641362407_A60B2870D92EAD9B985289382A3ECA3A.jpg")
+    @Size(max = 256, message = "证件手持照URL过长")
     private String personCertSpic;
 
     @ApiModelProperty(position = 19, required = false, value = "省ID[20]", example = "110000")
+    @Size(max = 20, message = "省ID过长")
     private String provinceId;
     @ApiModelProperty(position = 20, required = false, value = "省名称[32]", example = "北京市")
+    @Size(max = 30, message = "省名称过长")
     private String provinceName;
     @ApiModelProperty(position = 21, required = false, value = "市ID[20]", example = "110100")
+    @Size(max = 20, message = "市ID过长")
     private String cityId;
     @ApiModelProperty(position = 22, required = false, value = "市名称[32]", example = "北京")
+    @Size(max = 30, message = "市名称过长")
     private String cityName;
     @ApiModelProperty(position = 23, required = false, value = "县ID[20]", example = "110105")
+    @Size(max = 20, message = "县ID过长")
     private String countyId;
     @ApiModelProperty(position = 24, required = false, value = "县名称[32]", example = "朝阳区")
+    @Size(max = 30, message = "县名称过长")
     private String countyName;
     @ApiModelProperty(position = 25, required = false, value = "详细地址[128]", example = "XXXXX")
+    @Size(max = 128, message = "详细地址过长")
     private String busAddress;
 
     @ApiModelProperty(position = 26, required = false, value = "商户名称[64]", example = "北京XXX服装贸易有限公司")
@@ -72,8 +82,10 @@ public class GoblinStoreMgtCertificationParam implements java.io.Serializable {
     @Pattern(regexp = "\\b(0|1)\\b", message = "证件是否长期有效参数无效")
     private String busCertLasting;
     @ApiModelProperty(position = 30, required = false, value = "营业执照照片[256]", example = "http://pic.zhengzai.tv/202201/3C/00/1641369685_B1673980AE72DBF44E32BE88FCA3EBA2.jpg")
+    @Size(max = 256, message = "营业执照照片URL过长")
     private String busCertPic;
     @ApiModelProperty(position = 31, required = false, value = "资质证书照片[256]")
+    @Size(max = 256, message = "资质证书照片URL过长")
     private String busQualityPic;
 
     public GoblinStoreCertificationVo initStoreCertificationVo() {

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsAddParam.java

@@ -49,6 +49,8 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
     @Size(max = 128, message = "商品名称长度超限")
     private String name;
     @ApiModelProperty(position = 13, required = false, value = "商品名称[128]")
+    @NotBlank(message = "商品副名称不能为空")
+    @Size(max = 128, message = "商品副名称长度超限")
     private String subtitle;
     @ApiModelProperty(position = 14, required = false, value = "商品销售价-原价[20,2]")
     private BigDecimal sellPrice;
@@ -62,6 +64,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
     private String cateTid;
 
     @ApiModelProperty(position = 18, required = false, value = "商品简介[256]", example = "商品简介...")
+    @Size(max = 256, message = "商品简介内容过长")
     private String intro;
 
     @ApiModelProperty(position = 19, required = false, value = "商品标签列表")
@@ -69,8 +72,10 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
     @ApiModelProperty(position = 20, required = true, value = "商品图片列表")
     private List<String> imageList;
     @ApiModelProperty(position = 21, required = false, value = "商品图片封面")
+    @Size(max = 256, message = "商品图片封面URL过长")
     private String coverPic;
     @ApiModelProperty(position = 22, required = false, value = "商品视频地址")
+    @Size(max = 256, message = "商品视频地址URL过长")
     private String video;
 
     /**
@@ -78,14 +83,18 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
      **/
 
     @ApiModelProperty(position = 23, required = true, value = "规格展现方式[1-常规|2-组合]", allowableValues = "1,2", example = "1")
+    @NotBlank(message = "规格展现方式不能为空")
+    @Pattern(regexp = "\\b(1|2)\\b", message = "规格展现方式参数无效")
     private String specMode;
     @ApiModelProperty(position = 24, required = false, value = "SKU规格信息[初次添加商品必填]")
 //    @NotNull(message = "SKU规格信息不能为空")
     @Valid
     private List<GoblinStoreMgtGoodsAddSkuParam> skuParamList;
     @ApiModelProperty(position = 25, required = true, value = "物流模版", example = "松鼠德邦")
+    @Size(max = 50, message = "物流模版ID过长")
     private String logisticsTemplate;
     @ApiModelProperty(position = 26, required = false, value = "商品编码[默认为系统编码，也可手动输入商家自己的编码]")
+    @Size(max = 50, message = "商品编码过长")
     private String spuNo;
 
     /**
@@ -93,6 +102,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
      **/
 
     @ApiModelProperty(position = 27, required = true, value = "商品详情", example = "商品详情...")
+    @Size(max = 5000, message = "商品详情内容过长")
     private String details;
 
     /**
@@ -100,6 +110,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
      **/
 
     @ApiModelProperty(position = 28, required = true, value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]", example = "1")
+    @Pattern(regexp = "\\b(1|2|3)\\b", message = "规格展现方式参数无效")
     private String shelvesHandle;
     @ApiModelProperty(position = 29, required = false, value = "预约上架时间[yyyy-MM-dd HH:mm:ss][上架处理方式为3-预约定时上架时需要指定]")
     @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "预约上架时间格式有误")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsEditSkuParam.java

@@ -10,10 +10,7 @@ import lombok.Data;
 import org.springframework.util.CollectionUtils;
 
 import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -32,6 +29,7 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     private String skuId;
     @ApiModelProperty(position = 13, required = true, value = "单品默认图片的url[256]")
     @NotNull(message = "单品默认图片不能为空")
+    @Size(max = 256, message = "单品默认图片URL过长")
     private String skuPic;
     @ApiModelProperty(position = 14, required = true, value = "单品规格信息")
     @Valid
@@ -66,6 +64,7 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     @Pattern(regexp = "\\b(0|1|2)\\b", message = "购买限制参数无效")
     private String buyFactor;
     @ApiModelProperty(position = 25, required = false, value = "购买限制人员名单，购买限制为2-指定用户时必填")
+    @Size(max = 256, message = "购买限制人员名单URL过长")
     private String buyRoster;
     @ApiModelProperty(position = 26, required = false, value = "购买限制人员名单操作类型[1-添加|2-删除]，购买限制为2-指定用户时有效")
     @Pattern(regexp = "\\b(1|2)\\b", message = "购买限制人员名单操作类型参数无效")

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtController.java

@@ -88,14 +88,14 @@ public class GoblinStoreMgtController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeName", value = "店铺名称[128]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "logoPic", value = "店铺LOGO[256]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backgroundPic", value = "店铺背景图[256]"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "introduce", value = "店铺介绍[500]"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "introduce", value = "店铺介绍[2000]"),
     })
     @GetMapping(value = {"info/edit"})
-    public ResponseDto<Object> infoEdit(@NotBlank(message = "店铺名称不能为空") @Size(max = 128) @RequestParam String storeName,
-                                                      @NotBlank(message = "店铺LOGO不能为空") @Size(max = 256) @RequestParam String logoPic,
-                                                      @NotBlank(message = "店铺背景图不能为空") @Size(max = 256) @RequestParam String backgroundPic,
-                                                      @NotBlank(message = "店铺介绍不能为空") @Size(max = 500) @RequestParam String introduce,
-                                                      @NotBlank(message = "店铺ID不能为空") @Size(max = 64) @RequestParam String storeId) {
+    public ResponseDto<Object> infoEdit(@NotBlank(message = "店铺名称不能为空") @Size(max = 128, message = "店铺名称过长") @RequestParam String storeName,
+                                                      @NotBlank(message = "店铺LOGO不能为空") @Size(max = 256, message = "店铺LOGOURL过长") @RequestParam String logoPic,
+                                                      @NotBlank(message = "店铺背景图不能为空") @Size(max = 256, message = "店铺背景图URL过长") @RequestParam String backgroundPic,
+                                                      @NotBlank(message = "店铺介绍不能为空") @Size(max = 2000, message = "店铺介绍内容过长") @RequestParam String introduce,
+                                                      @NotBlank(message = "店铺ID不能为空") @RequestParam String storeId) {
         String currentUid = CurrentUtil.getCurrentUid();
         if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149002"));