From ad8fc09f3e70b08cd654d38ff9aa9022c2c2c6ec Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 10:26:40 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..69b6199 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
@@ -103,9 +103,18 @@
public Map<String, Object> queryGoodsList(QueryGoodsListDto model) {
String name = model.getName() == null ? "":model.getName();
int delFlag = model.getDelFlag() == null ? 2:model.getDelFlag();
+ int namePx = model.getNamePx() == null ? 7:model.getNamePx();
+ int typePx = model.getTypePx() == null ? 2:model.getTypePx();
PageHelper.startPage(model.getPage(), model.getLimit());
- List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag);
+ List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag,model.getIsQg(),model.getIsSale(),namePx,typePx);
+// 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 +225,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 +333,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