zxl
7 天以前 e24ed6e7f6ced9f331e88048df37537d8f1da165
虚拟商品优惠劵
6个文件已修改
1个文件已添加
39 ■■■■■ 已修改文件
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/lmk/enums/general/VirtualGoodsTypeEnum.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -177,6 +177,10 @@
    @ApiModelProperty(value = "商品排序")
    private Integer goodsSort;
    @ApiModelProperty(value ="表示虚拟商品类型 现有类型:COUPON优惠劵")
    private String virtualGoodsType;
    public Goods() {
    }
@@ -194,6 +198,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);
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
@@ -170,6 +170,12 @@
    @ApiModelProperty(value = "预警数量")
    private Integer alertQuantity;
    @ApiModelProperty(value ="优惠劵id")
    private String couponId;
    @ApiModelProperty(value ="优惠劵名")
    private String couponName;
    public Double getWeight() {
        if (weight == null) {
            return 0d;
@@ -223,6 +229,7 @@
        this.storeCategoryPath = goods.getStoreCategoryPath();
        this.freightTemplateId = goods.getTemplateId();
        this.recommend = goods.getRecommend();
    }
}
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
@@ -158,6 +158,14 @@
    private BigDecimal commission;
    @ApiModelProperty(value = "商品排序")
    private Integer goodsSort;
    @ApiModelProperty(value = "优惠劵id")
    private String couponId;
    @ApiModelProperty(value = "优惠劵名")
    private String couponName;
    @ApiModelProperty(value ="表示虚拟商品类型 现有类型:COUPON优惠劵")
    private String virtualGoodsType;
    public String getGoodsName() {
        //对商品对名称做一个极限处理。这里没有用xss过滤是因为xss过滤为全局过滤,影响很大。
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -159,7 +159,7 @@
        // 检查是否需要生成索引
        List<GoodsSku> goodsSkus = GoodsSkuBuilder.buildBatch(goods, goodsOperationDTO.getSkuList());
        renderGoodsSkuList(goodsSkus, goodsOperationDTO);
        System.out.println(goodsSkus);
        if (!goodsSkus.isEmpty()) {
            this.saveOrUpdateBatch(goodsSkus);
            this.updateGoodsStock(goodsSkus);
framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java
@@ -83,6 +83,8 @@
        //规格信息
        goodsSku.setCouponId(Convert.toStr(skuInfo.get("couponId"),""));
        goodsSku.setCouponName(Convert.toStr(skuInfo.get("couponName"),""));
        goodsSku.setId(Convert.toStr(skuInfo.get("id"), ""));
        goodsSku.setSn(Convert.toStr(skuInfo.get("sn")));
        goodsSku.setWeight(Convert.toDouble(skuInfo.get("weight"), 0D));
framework/src/main/java/cn/lili/modules/lmk/enums/general/VirtualGoodsTypeEnum.java
New file
@@ -0,0 +1,13 @@
package cn.lili.modules.lmk.enums.general;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor
@Getter
public enum VirtualGoodsTypeEnum {
    COUPON("虚拟优惠劵");
    private String description;
}
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
@@ -155,6 +155,7 @@
    @ApiOperation(value = "新增商品")
    @PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
    public ResultMessage<GoodsOperationDTO> save(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO) {
        System.err.println(JSONObject.toJSONString(goodsOperationDTO));
        goodsService.addGoods(goodsOperationDTO);
        return ResultUtil.success();