From fe04c9455a441c202f6c4590a08f46e16bd34ce3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Jul 2021 16:39:12 +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 | 12 ++++++++++--
1 files changed, 10 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..133dc5b 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
@@ -106,6 +106,13 @@
PageHelper.startPage(model.getPage(), model.getLimit());
List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag);
+ 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 +223,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 +331,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