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

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

@@ -94,7 +94,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
     @Size(max = 50, message = "物流模版ID过长")
     private String logisticsTemplate;
     @ApiModelProperty(position = 26, required = false, value = "商品编码[默认为系统编码，也可手动输入商家自己的编码]")
-    @Size(max = 50, message = "商品编码过长")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, message = "商品编码格式或长度有误")
     private String spuNo;
 
     /**
@@ -263,7 +263,16 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
                 skuInfoVo.setSkuId(skuId);
             }
             skuInfoVo.setSpuId(goodsInfoVo.getSpuId());
-            skuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
+            if (StringUtils.isNotBlank(addSkuParam.getSkuNo())) {
+                skuInfoVo.setSkuNo(addSkuParam.getSkuNo());
+            } else {
+                skuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
+            }
+            if (StringUtils.isNotBlank(addSkuParam.getSkuBarCode())) {
+                skuInfoVo.setSkuBarCode(addSkuParam.getSkuBarCode());
+            } else {
+                skuInfoVo.setSkuBarCode(goodsInfoVo.getSpuNo());
+            }
 //            skuInfoVo.setName(goodsInfoVo.getName());
             skuInfoVo.setSubtitle(goodsInfoVo.getSubtitle());
             skuInfoVo.setSkuPic(addSkuParam.getSkuPic());

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

@@ -7,10 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 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;
@@ -21,6 +18,12 @@ public class GoblinStoreMgtGoodsAddSkuParam implements Serializable {
     private static final long serialVersionUID = 6657596593310537491L;
     @ApiModelProperty(position = 10, required = false, value = "单品ID[编辑时必传]")
     private String skuId;
+    @ApiModelProperty(position = 10, required = false, value = "单品编码[默认为系统编码，也可手动输入商家自己的编码]")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, message = "单品编码格式或长度有误")
+    private String skuNo;
+    @ApiModelProperty(position = 10, required = false, value = "单品条码")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_32, message = "单品条码格式或长度有误")
+    private String skuBarCode;
     @ApiModelProperty(position = 11, required = true, value = "单品默认图片的url[256]")
     @NotBlank(message = "单品图片不能为空")
     private String skuPic;

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

@@ -27,6 +27,12 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     private String spuId;
     @ApiModelProperty(position = 12, required = false, value = "单品ID[编辑时必传]")
     private String skuId;
+    @ApiModelProperty(position = 12, required = false, value = "单品编码[默认为系统编码，也可手动输入商家自己的编码]")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, message = "单品编码格式或长度有误")
+    private String skuNo;
+    @ApiModelProperty(position = 12, required = false, value = "单品条码")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_32, message = "单品条码格式或长度有误")
+    private String skuBarCode;
     @ApiModelProperty(position = 13, required = true, value = "单品默认图片的url[256]")
     @NotNull(message = "单品默认图片不能为空")
     @Size(max = 256, message = "单品默认图片URL过长")
@@ -93,6 +99,8 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
             goodsSkuInfoVo.setSkuSpecList(mgtGoodsSkuInfoVo.getSkuSpecList());
         }
         goodsSkuInfoVo.setSkuId(this.getSkuId());
+        goodsSkuInfoVo.setSkuNo(this.getSkuNo());
+        goodsSkuInfoVo.setSkuBarCode(this.getSkuBarCode());
         goodsSkuInfoVo.setSkuPic(this.getSkuPic());
         goodsSkuInfoVo.setSellPrice(null == this.getSellPrice() ? mgtGoodsSkuInfoVo.getSellPrice() : this.getSellPrice());
         goodsSkuInfoVo.setPrice(this.getPrice());

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java

@@ -59,6 +59,18 @@ public class LnsRegex {
          */
         public static final String CN_PCD = "^[\\u4e00-\\u9fa5]{2,30}$";
 
+        /**
+         * 大小字母 || 数字
+         * 长度：0,50
+         */
+        public static final String ALPHABET_NUMBER_UNDER_50 = "^[a-zA-Z0-9]{0,50}$";
+
+        /**
+         * 大小字母 || 数字
+         * 长度：0,32
+         */
+        public static final String ALPHABET_NUMBER_32 = "^[a-zA-Z0-9]{0,32}$";
+
 
         /* ======================================================================= | 证件类 */
 

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

@@ -6,6 +6,7 @@ import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelDataConvertException;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -45,18 +46,6 @@ public class GoblinStoreMgtGoodsImportService {
     @Autowired
     GoblinMongoUtils goblinMongoUtils;
 
-    /**
-     * 大小字母 || 数字
-     * 长度：0,50
-     */
-    private static final String ALPHABET_NUMBER_UNDER_50 = "^[a-zA-Z0-9]{0,50}$";
-
-    /**
-     * 大小字母 || 数字
-     * 长度：0,32
-     */
-    private static final String ALPHABET_NUMBER_32 = "^[a-zA-Z0-9]{0,32}$";
-
     /**
      * 批量导入SPU.SQL队列入库分批处理数量
      */
@@ -68,7 +57,7 @@ public class GoblinStoreMgtGoodsImportService {
 
     private void goodsInformationDataAnalysisProcessingValid(GoblinGoodsImportDto dto, List<String> skuBarCodeTmpList, Integer rowNum) {
         /* 商品编码校验｜------------------------------------------------------------------------------ */
-        if (StringUtils.isNotEmpty(dto.getSpuCode()) && !Pattern.matches(ALPHABET_NUMBER_UNDER_50, dto.getSpuCode())) {
+        if (StringUtils.isNotEmpty(dto.getSpuCode()) && !Pattern.matches(LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, dto.getSpuCode())) {
             throw new LiquidnetServiceException("-1", String.format("数据内容不规范【第%s行商品编码有误】", rowNum));
         }
         /* 商品名称校验｜------------------------------------------------------------------------------ */
@@ -118,7 +107,7 @@ public class GoblinStoreMgtGoodsImportService {
             dto.setSkuSpecDtos(skuSpecDtos);
         }
         /* 规格编码校验｜------------------------------------------------------------------------------ */
-        if (StringUtils.isNotEmpty(dto.getSkuCode()) && !Pattern.matches(ALPHABET_NUMBER_UNDER_50, dto.getSkuCode())) {
+        if (StringUtils.isNotEmpty(dto.getSkuCode()) && !Pattern.matches(LnsRegex.Valid.ALPHABET_NUMBER_UNDER_50, dto.getSkuCode())) {
             throw new LiquidnetServiceException("-1", String.format("数据内容不规范【第%s行规格编码格式有误】", rowNum));
         }
         /* 价格校验｜------------------------------------------------------------------------------ */
@@ -144,7 +133,7 @@ public class GoblinStoreMgtGoodsImportService {
         }
         /* 规格条码校验｜------------------------------------------------------------------------------ */
         if (StringUtils.isNotEmpty(dto.getSkuBarCode())) {
-            if (Pattern.matches(ALPHABET_NUMBER_32, dto.getSkuBarCode())) {
+            if (Pattern.matches(LnsRegex.Valid.ALPHABET_NUMBER_32, dto.getSkuBarCode())) {
 //                if (skuBarCodeTmpList.contains(dto.getSkuBarCode())) {
 //                    throw new LiquidnetServiceException("-1", String.format("数据内容不规范【第%s行表格内规格条码重复】", rowNum));
 //                }

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

@@ -887,7 +887,16 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         GoblinGoodsSkuInfoVo addSkuInfoVo = mgtGoodsEditSkuParam.initEditAddGoodsSkuInfoVo();
         addSkuInfoVo.setSkuId(skuId);
         addSkuInfoVo.setSpuId(spuId);
-        addSkuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
+        if (StringUtils.isNotBlank(mgtGoodsEditSkuParam.getSkuNo())) {
+            addSkuInfoVo.setSkuNo(mgtGoodsEditSkuParam.getSkuNo());
+        } else {
+            addSkuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
+        }
+        if (StringUtils.isNotBlank(mgtGoodsEditSkuParam.getSkuBarCode())) {
+            addSkuInfoVo.setSkuBarCode(mgtGoodsEditSkuParam.getSkuBarCode());
+        } else {
+            addSkuInfoVo.setSkuBarCode(goodsInfoVo.getSpuNo());
+        }
 //        addSkuInfoVo.setName(goodsInfoVo.getName());
         addSkuInfoVo.setSubtitle(goodsInfoVo.getSubtitle());
         addSkuInfoVo.setVirtualFlg(goodsInfoVo.getVirtualFlg());