xiaoyong931011
2021-06-24 74a6e1398a437aafa070edca794b3c262735671a
20210624 商品分类
4 files modified
13 ■■■■ changed files
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java 3 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java 2 ●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java 2 ●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java 6 ●●●●● patch | view | raw | blame | history
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
@@ -1,6 +1,7 @@
package com.xzx.gc.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzx.gc.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,8 +45,10 @@
    public static final Integer ISQG_YES = 1;
    public static final Integer ISQG_NO = 2;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date qgStartTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date qgEndTime;
    private Integer isSale;
gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
@@ -71,7 +71,7 @@
    private List<String> goodsImages;
    @ApiModelProperty(value="积分商品样式")
    private List<ScoreGoodsStyleDto> scoreGoodsStyleDtos;
    private List<ScoreGoodsStyleDto> scoreGoodsStyles;
    @ApiModelProperty(value="创建人")
    private String createdBy;
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -118,7 +118,7 @@
        scoreGoods.setDelFlag(Convert.toShort(Constants.DEL_NOT_FLAG));
        scoreGoodsMapper.insert(scoreGoods);
        //样式信息
        List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyleDtos();
        List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyles();
        if(CollUtil.isNotEmpty(scoreGoodsStyleDtos)){
            for(ScoreGoodsStyleDto scoreGoodsStyleDto : scoreGoodsStyleDtos){
                ScoreGoodsStyle scoreGoodsStyle = objectMapper.convertValue(scoreGoodsStyleDto, ScoreGoodsStyle.class);
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
@@ -33,6 +33,12 @@
    @ApiModelProperty(value="商品详情")
    private String details;
    @ApiModelProperty(value="原价",required=true)
    private String originalPrice;
    @ApiModelProperty(value="现价",required=true)
    private String presentPrice;
    /**
     * 是否抢购 1-是 2-否
     */