Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-25 74a7354764449e8bb602e137a172c5c1593a261e

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

@@ -327,9 +327,14 @@
        }

        if (ScoreGoods.ISQG_YES.equals(data.getIsQg())) {
            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;
    }
}