fix applyJhy

Helius

2021-06-29 d95f158b9dfa0149e74bc60a0c5a386dbbdad484

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

@@ -1,5 +1,6 @@
package com.xzx.gc.shop.service;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUnit;
@@ -209,7 +210,8 @@
    public void updateGoods(UpdateGoodsDto model) {
        ObjectMapper objectMapper = new ObjectMapper();
        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
        ScoreGoods scoreGoods = objectMapper.convertValue(model, ScoreGoods.class);
//        ScoreGoods scoreGoods = objectMapper.convertValue(model, ScoreGoods.class);
        ScoreGoods scoreGoods = BeanUtil.copyProperties(model, ScoreGoods.class);
        scoreGoodsMapper.updateByPrimaryKey(scoreGoods);

        //轮播图
@@ -251,6 +253,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);
                    }
                }
@@ -327,8 +331,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;
    }