20210628 集物员审核

xiaoyong931011

2021-06-29 13f17e5f0f2bc304dbfbfd62e31786fd5ec26dd9

 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java

@@ -184,6 +184,7 @@
            ObjectMapper objectMapper = new ObjectMapper();
            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
            viewGoodsVo = objectMapper.convertValue(scoreGoods, ViewGoodsVo.class);
//            viewGoodsVo.setCreateTime(scoreGoods.getCreatedTime().toString());
            //轮播图
            List<String> goodsImages = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
            viewGoodsVo.setGoodsImages(goodsImages);
@@ -250,6 +251,8 @@
                if(CollUtil.isNotEmpty(scoreGoodsSkuDtos)){
                    for(ScoreGoodsSkuDto scoreGoodsSkuDto : scoreGoodsSkuDtos){
                        ScoreGoodsSku scoreGoodsSku = objectMapper.convertValue(scoreGoodsSkuDto, ScoreGoodsSku.class);
                        scoreGoodsSku.setGoodsId(scoreGoods.getId());
                        scoreGoodsSku.setStyleId(scoreGoodsStyle.getId());
                        scoreGoodsSkuMapper.insertSelective(scoreGoodsSku);
                    }
                }
@@ -281,6 +284,8 @@
        }else{
            ScoreGoods scoreGoods = new ScoreGoods();
            scoreGoods.setIsQg(ScoreGoods.ISQG_NO);
            scoreGoods.setQgEndTime(null);
            scoreGoods.setQgStartTime(null);
            Example exampleGoods = new Example(ScoreGoods.class);
            Example.Criteria criteriaGoods = exampleGoods.createCriteria();
            criteriaGoods.andEqualTo("id",id);
@@ -324,8 +329,13 @@
        }

        if (ScoreGoods.ISQG_YES.equals(data.getIsQg())) {
            Long remain = DateUtil.between(new Date(), data.getQgEndTime(), DateUnit.SECOND, false);
            data.setRemainTime(remain);
            if (new Date().before(data.getQgStartTime())) {
                data.setIsStartQg(2);
            } else {
                data.setIsStartQg(1);
                Long remain = DateUtil.between(new Date(), data.getQgEndTime(), DateUnit.SECOND, false);
                data.setRemainTime(remain);
            }
        }
        return data;
    }