peng
16 小时以前 7ae6893e2746869f879d270544b7804a82ea88a9
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -177,6 +177,11 @@
    @ApiModelProperty(value = "商品排序")
    private Integer goodsSort;
    @ApiModelProperty(value ="表示虚拟商品类型 现有类型:COUPON优惠劵")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String virtualGoodsType;
    public Goods() {
    }
@@ -194,6 +199,8 @@
        this.mobileIntro = goodsOperationDTO.getMobileIntro();
        this.goodsVideo = goodsOperationDTO.getGoodsVideo();
        this.price = goodsOperationDTO.getPrice();
        this.virtualGoodsType = goodsOperationDTO.getVirtualGoodsType();
        //不是预售商品预售时间置空
        if (!GoodsSalesModeEnum.PRESALE.name().equals(goodsOperationDTO.getSalesModel())) {
            goodsOperationDTO.setPreSaleBeginDate(null);
@@ -230,6 +237,12 @@
            if (!sku.containsKey("quantity") || StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt(sku.get("quantity").toString()) < 0) {
                throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_ERROR);
            }
            //没有优惠卷的商品需要移除优惠卷信息
            Object couponId = sku.get("couponId");
            if (couponId == null || StringUtil.isEmpty(couponId.toString())) {
                sku.remove("couponId");
                sku.remove("couponName");
            }
            sku.values().forEach(i -> {
                if (CharSequenceUtil.isBlank(i.toString())) {
                    throw new ServiceException(ResultCode.MUST_HAVE_GOODS_SKU_VALUE);