~商品相关VO;

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

 package com.liquidnet.service.goblin.dto.manage;
 
+import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,26 +15,33 @@ import java.util.List;
 @Data
 public class GoblinStoreMgtGoodsAddSkuParam implements Serializable {
     private static final long serialVersionUID = 6657596593310537491L;
-    /** ---------------------------- 规格信息 ---------------------------- **/
-
-    @ApiModelProperty(position = 11, value = "单品默认图片的url[256]")
+    @ApiModelProperty(position = 10, required = false, value = "单品ID[编辑时必传]")
+    private String skuId;
+    @ApiModelProperty(position = 11, required = true, value = "单品默认图片的url[256]")
     private String skuPic;
-    @ApiModelProperty(position = 12, value = "单品规格信息")
+    @ApiModelProperty(position = 12, required = true, value = "单品规格信息")
     private List<GoblinGoodsSpecDto> skuSpecList;
-    @ApiModelProperty(position = 13, value = "单品价格[20,2]")
+    @ApiModelProperty(position = 13, required = false, value = "单品销售价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(position = 14, required = true, value = "单品价格[20,2]")
     private BigDecimal price;
-    @ApiModelProperty(position = 14, value = "单品会员价格[20,2]")
+    @ApiModelProperty(position = 15, required = true, value = "单品会员价格[20,2]")
     private BigDecimal priceMember;
-    @ApiModelProperty(position = 15, value = "单品的重量[20,2]")
+    @ApiModelProperty(position = 16, required = false, value = "单品的重量[20,2]")
     private BigDecimal weight;
-    @ApiModelProperty(position = 16, value = "总库存")
+    @ApiModelProperty(position = 17, required = true, value = "总库存")
     private Integer stock;
-    @ApiModelProperty(position = 17, value = "ISBN，针对CD/图书等[100]")
+    @ApiModelProperty(position = 18, required = false, value = "预警库存")
+    private Integer warningStock;
+    @ApiModelProperty(position = 19, required = false, value = "ISBN，针对CD/图书等[100]")
     private String skuIsbn;
-    @ApiModelProperty(position = 18, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    @ApiModelProperty(position = 20, required = true, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
     private String buyFactor;
-    @ApiModelProperty(position = 19, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
+    @ApiModelProperty(position = 21, required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
     private String buyRoster;
-    @ApiModelProperty(position = 20, value = "限量[0-无限制|X:限购数量]")
+    @ApiModelProperty(position = 22, required = false, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;
+    @ApiModelProperty(position = 23, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]")
+    @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "单品有效期格式有误")
+    private String skuValidity;
 }

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

@@ -93,6 +93,9 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 55, value = "活动Id")
     private String marketId;
 
+    @ApiModelProperty(position = 55, value = "SPU包含的SKU_ID列表")
+    private List<String> skuIdList;
+
     private static final GoblinGoodsInfoVo obj = new GoblinGoodsInfoVo();
 
     public static GoblinGoodsInfoVo getNew() {

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @ApiModel(value = "GoblinGoodsSkuInfoVo", description = "商品SKU信息")
 @Data
@@ -32,33 +34,35 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private Integer skuStock;
     @ApiModelProperty(position = 19, value = "预警库存")
     private Integer warningStock;
-    @ApiModelProperty(position = 20, value = "单品价格[20,2]")
+    @ApiModelProperty(position = 20, value = "单品销售价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(position = 21, value = "单品价格[20,2]")
     private BigDecimal price;
-    @ApiModelProperty(position = 21, value = "单品会员价格[20,2]")
+    @ApiModelProperty(position = 22, value = "单品会员价格[20,2]")
     private BigDecimal priceMember;
-    @ApiModelProperty(position = 22, value = "单品的重量[20,2]")
+    @ApiModelProperty(position = 23, value = "单品的重量[20,2]")
     private BigDecimal weight;
-    @ApiModelProperty(position = 23, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    @ApiModelProperty(position = 24, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
     private String buyFactor;
-    @ApiModelProperty(position = 24, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
+    @ApiModelProperty(position = 25, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
     private String buyRoster;
-    @ApiModelProperty(position = 25, value = "限量[0-无限制|X:限购数量]")
+    @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;
-    @ApiModelProperty(position = 26, value = "商品的店铺ID，如果是平台的则为0")
+    @ApiModelProperty(position = 27, value = "商品的店铺ID，如果是平台的则为0")
     private String storeId;
-    @ApiModelProperty(position = 27, value = "单品有效期")
+    @ApiModelProperty(position = 28, value = "单品有效期")
     private LocalDateTime skuValidity;
-    @ApiModelProperty(position = 28, value = "是否是虚拟商品[0-否|1-是]")
+    @ApiModelProperty(position = 29, value = "是否是虚拟商品[0-否|1-是]")
     private String virtualFlg;
-    @ApiModelProperty(position = 29, value = "审核状态[0-初始编辑|1-审核中|2-审核不通过|3-审核通过]")
+    @ApiModelProperty(position = 30, value = "审核状态[0-初始编辑|1-审核中|2-审核不通过|3-审核通过]")
     private String status;
-    @ApiModelProperty(position = 30, value = "审核拒绝原因[256]")
+    @ApiModelProperty(position = 31, value = "审核拒绝原因[256]")
     private String reason;
-    @ApiModelProperty(position = 31, value = "单品上架状态[0-待上架|1-下架|2-违规|3-上架]")
+    @ApiModelProperty(position = 32, value = "单品上架状态[0-待上架|1-下架|2-违规|3-上架]")
     private String shelvesStatus;
-    @ApiModelProperty(position = 32, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    @ApiModelProperty(position = 33, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
     private String skuAppear;
-    @ApiModelProperty(position = 33, value = "上架时间")
+    @ApiModelProperty(position = 34, value = "上架时间")
     private LocalDateTime shelvesAt;
     @ApiModelProperty(position = 34, value = "活动Id")
     private String marketId;
@@ -69,6 +73,9 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 35, value = "物流模版ID")
     private String logisticsTemplate;
 
+    @ApiModelProperty(position = 40, value = "单品规格信息")
+    private List<GoblinGoodsSpecDto> skuSpecList;
+
     private static final GoblinGoodsSkuInfoVo obj = new GoblinGoodsSkuInfoVo();
 
     public static GoblinGoodsSkuInfoVo getNew() {

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

@@ -13,7 +13,17 @@ public class GoblinGoodsSpecValueVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 11, value = "规格值的名称")
     private String specVname;
     @ApiModelProperty(position = 12, value = "排序[数值越小排序越前]")
-    private String specVsort;
+    private int specVsort;
+
+    public GoblinGoodsSpecValueVo setSpecVname(String specVname) {
+        this.specVname = specVname;
+        return this;
+    }
+
+    public GoblinGoodsSpecValueVo setSpecVsort(int specVsort) {
+        this.specVsort = specVsort;
+        return this;
+    }
 
     private static final GoblinGoodsSpecValueVo obj = new GoblinGoodsSpecValueVo();
     public static GoblinGoodsSpecValueVo getNew() {

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

@@ -14,10 +14,25 @@ public class GoblinGoodsSpecVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 11, value = "规格名称")
     private String specName;
     @ApiModelProperty(position = 12, value = "排序[数值越小排序越前]")
-    private String specSort;
+    private int specSort;
     @ApiModelProperty(position = 13, value = "规格值列表")
     private List<GoblinGoodsSpecValueVo> specValues;
 
+    public GoblinGoodsSpecVo setSpecName(String specName) {
+        this.specName = specName;
+        return this;
+    }
+
+    public GoblinGoodsSpecVo setSpecSort(int specSort) {
+        this.specSort = specSort;
+        return this;
+    }
+
+    public GoblinGoodsSpecVo setSpecValues(List<GoblinGoodsSpecValueVo> specValues) {
+        this.specValues = specValues;
+        return this;
+    }
+
     private static final GoblinGoodsSpecVo obj = new GoblinGoodsSpecVo();
     public static GoblinGoodsSpecVo getNew() {
         try {

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

@@ -42,6 +42,11 @@ public class GoblinGoodsSku implements Serializable {
      */
     private String subtitle;
 
+    /**
+     * 单品销售价
+     */
+    private BigDecimal sellPrice;
+
     /**
      * 单品默认图片的url
      */

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

@@ -287,6 +287,7 @@ create table goblin_goods_sku
     sku_no             varchar(45)      not null comment '单品的编号',
     name               varchar(100)     not null comment '单品的名称',
     subtitle           varchar(128)     null comment '单品的副标题',
+    sell_price         decimal(20, 2)   null comment '单品销售价',
 
     sku_pic            varchar(256)     null comment '单品默认图片的url',
     sku_isbn           varchar(50)      null comment 'ISBN，针对CD/图书等',

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java

@@ -2,8 +2,7 @@ package com.liquidnet.service.goblin.util;
 
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
 import com.mongodb.BasicDBObject;
 
@@ -15,6 +14,10 @@ public class ObjectUtil {
     private static final ArrayList<GoblinFrontBanner> goblinFrontBannerArrayList = new ArrayList<>();
     private static final ArrayList<GoblinSelfMarketingVo> goblinSelfMarketingVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsSpecVo> goblinGoodsSpecVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsTagVo> goblinGoodsTagVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsServiceSupportVo> goblinGoodsServiceSupportVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsExtagVo> goblinGoodsExtagVoArrayList = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
@@ -34,6 +37,22 @@ public class ObjectUtil {
         return (ArrayList<GoblinGoodsSkuInfoVo>) goblinGoodsSkuInfoVoArrayList.clone();
     }
 
+    public static ArrayList<GoblinGoodsSpecVo> getGoblinGoodsSpecVoArrayList() {
+        return (ArrayList<GoblinGoodsSpecVo>) goblinGoodsSpecVoArrayList.clone();
+    }
+
+    public static ArrayList<GoblinGoodsTagVo> getGoblinGoodsTagVoArrayList() {
+        return (ArrayList<GoblinGoodsTagVo>) goblinGoodsTagVoArrayList.clone();
+    }
+
+    public static ArrayList<GoblinGoodsServiceSupportVo> getGoblinGoodsServiceSupportVoArrayList() {
+        return (ArrayList<GoblinGoodsServiceSupportVo>) goblinGoodsServiceSupportVoArrayList.clone();
+    }
+
+    public static ArrayList<GoblinGoodsExtagVo> getGoblinGoodsExtagVoArrayList() {
+        return (ArrayList<GoblinGoodsExtagVo>) goblinGoodsExtagVoArrayList.clone();
+    }
+
     public static BasicDBObject cloneBasicDBObject() {
         return (BasicDBObject) basicDBObject.clone();
     }