~structure<>entity:sku~限制名单、限购数量;

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

@@ -132,11 +132,21 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
     }
 
     public void initGoodsSkuInfoVo(GoblinGoodsInfoVo goodsInfoVo, List<GoblinGoodsSkuInfoVo> vos) {
-        for (GoblinStoreMgtGoodsAddSkuParam goodsAddSkuParam : this.getSkuParamList()) {
+        List<GoblinStoreMgtGoodsAddSkuParam> mgtGoodsAddSkuParamList = this.getSkuParamList();
+        int size = mgtGoodsAddSkuParamList.size();
+        for (int i = 0; i < size; i++) {
+            GoblinStoreMgtGoodsAddSkuParam addSkuParam = mgtGoodsAddSkuParamList.get(i);
+
             GoblinGoodsSkuInfoVo vo = GoblinGoodsSkuInfoVo.getNew();
             vo.setSkuId(goodsInfoVo.getSpuId().concat(StringUtils.right(String.valueOf(System.nanoTime()), 5)));
             vo.setSpuId(goodsInfoVo.getSpuId());
-//            vo.setSkuNo();
+            vo.setSkuNo(goodsInfoVo.getSpuNo().concat("-").concat(String.valueOf(i)));
+            vo.setName(goodsInfoVo.getName());
+            vo.setSubtitle(goodsInfoVo.getSubtitle());
+            vo.setSkuPic(addSkuParam.getSkuPic());
+            vo.setSkuIsbn(addSkuParam.getSkuIsbn());
+            vo.setStock(addSkuParam.getStock());
+            vo.setSkuStock(vo.getStock());
         }
     }
 }

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

@@ -25,10 +25,14 @@ public class GoblinStoreMgtGoodsAddSkuParam implements Serializable {
     private BigDecimal priceMember;
     @ApiModelProperty(position = 15, value = "单品的重量[20,2]")
     private BigDecimal weight;
-    @ApiModelProperty(position = 16, value = "ISBN，针对CD/图书等[100]")
+    @ApiModelProperty(position = 16, value = "总库存")
+    private Integer stock;
+    @ApiModelProperty(position = 17, value = "ISBN，针对CD/图书等[100]")
     private String skuIsbn;
-    @ApiModelProperty(position = 17, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    @ApiModelProperty(position = 18, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
     private String buyFactor;
-    @ApiModelProperty(position = 18, value = "购买限制为2-指定用户时必填指定文件地址")
-    private String buyLimit;
+    @ApiModelProperty(position = 19, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
+    private String buyRoster;
+    @ApiModelProperty(position = 20, value = "限量[0-无限制|X:限购数量]")
+    private Integer buyLimit;
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java

@@ -40,23 +40,25 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private BigDecimal weight;
     @ApiModelProperty(position = 23, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
     private String buyFactor;
-    @ApiModelProperty(position = 24, value = "购买限制为2-指定用户时必填指定")
-    private String buyLimit;
-    @ApiModelProperty(position = 25, value = "商品的店铺ID，如果是平台的则为0")
+    @ApiModelProperty(position = 24, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
+    private String buyRoster;
+    @ApiModelProperty(position = 25, value = "限量[0-无限制|X:限购数量]")
+    private Integer buyLimit;
+    @ApiModelProperty(position = 26, value = "商品的店铺ID，如果是平台的则为0")
     private String storeId;
-    @ApiModelProperty(position = 26, value = "单品有效期")
+    @ApiModelProperty(position = 27, value = "单品有效期")
     private LocalDateTime skuValidity;
-    @ApiModelProperty(position = 27, value = "是否是虚拟商品[0-否|1-是]")
+    @ApiModelProperty(position = 28, value = "是否是虚拟商品[0-否|1-是]")
     private String virtualFlg;
-    @ApiModelProperty(position = 28, value = "审核状态[0-初始编辑|1-审核中|2-审核不通过|3-审核通过]")
+    @ApiModelProperty(position = 29, value = "审核状态[0-初始编辑|1-审核中|2-审核不通过|3-审核通过]")
     private String status;
-    @ApiModelProperty(position = 29, value = "审核拒绝原因[256]")
+    @ApiModelProperty(position = 30, value = "审核拒绝原因[256]")
     private String reason;
-    @ApiModelProperty(position = 30, value = "单品上架状态[0-待上架|1-下架|2-违规|3-上架]")
+    @ApiModelProperty(position = 31, value = "单品上架状态[0-待上架|1-下架|2-违规|3-上架]")
     private String shelvesStatus;
-    @ApiModelProperty(position = 31, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    @ApiModelProperty(position = 32, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
     private String skuAppear;
-    @ApiModelProperty(position = 32, value = "上架时间")
+    @ApiModelProperty(position = 33, value = "上架时间")
     private LocalDateTime shelvesAt;
     private String createdBy;
     private LocalDateTime createdAt;

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsSku.java

@@ -88,9 +88,14 @@ public class GoblinGoodsSku implements Serializable {
     private String buyFactor;
 
     /**
-     * 购买限制为2-指定用户时必填指定用户
+     * 购买限制人员名单[购买限制为2-指定用户时必填]
      */
-    private String buyLimit;
+    private String buyRoster;
+
+    /**
+     * 限量[0-无限制|X:限购数量]
+     */
+    private Integer buyLimit;
 
     /**
      * 商品的店铺id，如果是平台的则为0

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -273,11 +273,8 @@ create table goblin_goods
     deleted_at         datetime         null,
     logistics_template varchar(64)      null comment '物流模版id',
     comment
-    varchar
-(
-    500
-)
-    ) engine = InnoDB comment '商品信息';
+                       varchar(500)
+) engine = InnoDB comment '商品信息';
 
 create unique index uidx_gg_spu_id on goblin_goods (spu_id);
 create index idx_gg_store_id on goblin_goods (store_id);
@@ -300,7 +297,8 @@ create table goblin_goods_sku
     price_member       decimal(20, 2)   not null comment '单品会员价格',
     weight             decimal(20, 2)   not null comment '单品的重量',
     buy_factor         char default '0' comment '购买限制[0-全部用户|1-仅会员|2-指定用户]',
-    buy_limit          varchar(256)     null comment '购买限制为2-指定用户时必填',
+    buy_roster         varchar(256)     null comment '购买限制人员名单[购买限制为2-指定用户时必填]',
+    buy_limit          int              null comment '限量[0-无限制|X:限购数量]',
 
     store_id           varchar(64)      null comment '商品的店铺id，如果是平台的则为0',
     sku_validity       datetime         null comment '单品有效期',