记得上下班打卡 | git大法好,push需谨慎

Commit 9efaf0d5 authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/hjc_goblin_list' into pre

parents a69093ea 63b2abc4
......@@ -810,7 +810,7 @@ public class GoblinRedisUtils {
public HashMap<String, Object> getGoodsSkuInfoVo(LocalDateTime now, String skuId) {
GoblinGoodsSkuInfoVo vo = getGoodsSkuInfoVo(skuId);
HashMap<String, Object> map = CollectionUtil.mapStringObject();
if (now.isAfter(vo.getSaleStartTime())) {//普通商品已开售
if (null == vo.getSaleStartTime() || now.isAfter(vo.getSaleStartTime())) {//普通商品已开售
lastStockToLastStock(0, getGoblinListCollect(skuId), null, skuId);
map.put("vo", vo);
map.put("tagType", null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment