fix

Helius

2021-11-10 ad8fc09f3e70b08cd654d38ff9aa9022c2c2c6ec

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

@@ -103,9 +103,18 @@
    public Map<String, Object> queryGoodsList(QueryGoodsListDto model) {
        String name = model.getName() == null ? "":model.getName();
        int delFlag = model.getDelFlag() == null ? 2:model.getDelFlag();
        int namePx = model.getNamePx() == null ? 7:model.getNamePx();
        int typePx = model.getTypePx() == null ? 2:model.getTypePx();
        PageHelper.startPage(model.getPage(), model.getLimit());

        List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag);
        List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag,model.getIsQg(),model.getIsSale(),namePx,typePx);
//        if(CollUtil.isNotEmpty(maps)){
//            for(QueryGoodsListVo queryGoodsListVo : maps){
//                long id = queryGoodsListVo.getId();
//                Integer stock = scoreGoodsSkuMapper.selectScoreGoodsSkuMapperByGoodId(id);
//                queryGoodsListVo.setStock(stock);
//            }
//        }
        PageInfo pageInfo = new PageInfo(maps);
        int count = Convert.toInt(pageInfo.getTotal());
        Map<String, Object> map = new HashMap<>();
@@ -216,6 +225,7 @@
        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
//        ScoreGoods scoreGoods = objectMapper.convertValue(model, ScoreGoods.class);
        ScoreGoods scoreGoods = BeanUtil.copyProperties(model, ScoreGoods.class);
        log.info("抢购时间：{}, {}", scoreGoods.getQgStartTime(), scoreGoods.getQgEndTime());
        scoreGoodsMapper.updateByPrimaryKey(scoreGoods);

        //轮播图
@@ -318,11 +328,18 @@
        PageHelper.startPage(xcxGoodsListDto.getPageNo(), xcxGoodsListDto.getPageSize());
        List<XcxGoodsListVo> data = scoreGoodsMapper.selectXcxGoodsList(xcxGoodsListDto);
        if(StrUtil.isNotEmpty(xcxGoodsListDto.getName())){
            ScoreGoodsSearch scoreGoodsSearch = new ScoreGoodsSearch();
            scoreGoodsSearch.setUserId(xcxGoodsListDto.getUserId());
            scoreGoodsSearch.setContents(xcxGoodsListDto.getName());
            scoreGoodsSearch.setCreatedTime(new Date());
            scoreGoodsSearchMapper.insert(scoreGoodsSearch);
            Example exampleSearch = new Example(ScoreGoodsSearch.class);
            Example.Criteria criteriaSearch = exampleSearch.createCriteria();
            criteriaSearch.andEqualTo("contents",xcxGoodsListDto.getName());
            criteriaSearch.andEqualTo("userId",xcxGoodsListDto.getUserId());
            List<ScoreGoodsSearch> scoreGoodsSearches = scoreGoodsSearchMapper.selectByExample(exampleSearch);
            if(CollUtil.isEmpty(scoreGoodsSearches)){
                ScoreGoodsSearch scoreGoodsSearch = new ScoreGoodsSearch();
                scoreGoodsSearch.setUserId(xcxGoodsListDto.getUserId());
                scoreGoodsSearch.setContents(xcxGoodsListDto.getName());
                scoreGoodsSearch.setCreatedTime(new Date());
                scoreGoodsSearchMapper.insert(scoreGoodsSearch);
            }
        }
        return new PageInfo<>(data);
    }