From f3bf2c69494bb78afa098819b742677dd8be6b7c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:01:25 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 4e97305..69b54b3 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -216,6 +216,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);
//轮播图
@@ -323,11 +324,11 @@
criteriaSearch.andEqualTo("contents",xcxGoodsListDto.getName());
criteriaSearch.andEqualTo("userId",xcxGoodsListDto.getUserId());
List<ScoreGoodsSearch> scoreGoodsSearches = scoreGoodsSearchMapper.selectByExample(exampleSearch);
- if(CollUtil.isNotEmpty(scoreGoodsSearches)){
+ if(CollUtil.isEmpty(scoreGoodsSearches)){
ScoreGoodsSearch scoreGoodsSearch = new ScoreGoodsSearch();
scoreGoodsSearch.setUserId(xcxGoodsListDto.getUserId());
scoreGoodsSearch.setContents(xcxGoodsListDto.getName());
- scoreGoodsSearch.setCreatedTime(new DateTime());
+ scoreGoodsSearch.setCreatedTime(new Date());
scoreGoodsSearchMapper.insert(scoreGoodsSearch);
}
}
--
Gitblit v1.9.1