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

peng

2025-10-11 8fd3db7778b3991810d33ac4dffd2f9031b106fc

 framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -13,6 +13,7 @@
import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
import cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -182,6 +183,13 @@
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String virtualGoodsType;

    @ApiModelProperty(value ="表示虚拟定制商品类型 现有类型：定制商品")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    /**
     * @see CustomizeFlagEnum
     */
    private String customizeFlag;

    public Goods() {
    }

@@ -200,6 +208,7 @@
        this.goodsVideo = goodsOperationDTO.getGoodsVideo();
        this.price = goodsOperationDTO.getPrice();
        this.virtualGoodsType = goodsOperationDTO.getVirtualGoodsType();
        this.customizeFlag = goodsOperationDTO.getCustomizeFlag();

        //不是预售商品预售时间置空
        if (!GoodsSalesModeEnum.PRESALE.name().equals(goodsOperationDTO.getSalesModel())) {
@@ -243,6 +252,13 @@
                sku.remove("couponId");
                sku.remove("couponName");
            }
            Object templateId = sku.get("customizeTemplateId");
            if (templateId == null || StringUtil.isEmpty(templateId.toString())) {
                sku.remove("customizeTemplateId");
                sku.remove("customizeTemplateName");
            }


            sku.values().forEach(i -> {
                if (CharSequenceUtil.isBlank(i.toString())) {
                    throw new ServiceException(ResultCode.MUST_HAVE_GOODS_SKU_VALUE);