From e497a05ce312d26864b0c23cad97da9eb32c2cc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:01:34 +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 | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 801c6ca..75a4f6a 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
@@ -46,6 +46,8 @@
ScoreGoodsStyleMapper scoreGoodsStyleMapper;
@Resource
ScoreGoodsSearchMapper scoreGoodsSearchMapper;
+ @Resource
+ ScoreOrderMapper scoreOrderMapper;
@Autowired
private MqUtil mqUtil;
@@ -103,9 +105,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 +227,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);
//轮播图
@@ -317,12 +329,32 @@
PageHelper.startPage(xcxGoodsListDto.getPageNo(), xcxGoodsListDto.getPageSize());
List<XcxGoodsListVo> data = scoreGoodsMapper.selectXcxGoodsList(xcxGoodsListDto);
+ if(StrUtil.isNotEmpty(xcxGoodsListDto.getUserId())){
+ if(CollUtil.isNotEmpty(data)){
+ for(XcxGoodsListVo xcxGoodsListVo : data){
+ if(ScoreGoods.ISQG_YES == xcxGoodsListVo.getIsQg()){
+ //抢购时间内，用户购买该商品的数量
+ Integer sumCnt = scoreOrderMapper.selectGoodsQuotaTime(xcxGoodsListDto.getUserId(),xcxGoodsListVo.getId(),xcxGoodsListVo.getQgStartTime(),xcxGoodsListVo.getQgEndTime());
+ xcxGoodsListVo.setAvaQuotaTime(
+ ((xcxGoodsListVo.getQuotaTime() == null?0:xcxGoodsListVo.getQuotaTime()) - sumCnt) > 0?((xcxGoodsListVo.getQuotaTime() == null?0:xcxGoodsListVo.getQuotaTime()) - sumCnt):0
+ );
+ }
+ }
+ }
+ }
if(StrUtil.isNotEmpty(xcxGoodsListDto.getName())){
- ScoreGoodsSearch scoreGoodsSearch = new ScoreGoodsSearch();
- scoreGoodsSearch.setUserId(xcxGoodsListDto.getUserId());
- scoreGoodsSearch.setContents(xcxGoodsListDto.getName());
- scoreGoodsSearch.setCreatedTime(new DateTime());
- scoreGoodsSearchMapper.insert(scoreGoodsSearch);
+ Example exampleSearch = new Example(ScoreGoodsSearch.class);
+ Example.Criteria criteriaSearch = exampleSearch.createCriteria();
+ criteriaSearch.andEqualTo("contents",xcxGoodsListDto.getName());
+ criteriaSearch.andEqualTo("userId",xcxGoodsListDto.getUserId());
+ List<ScoreGoodsSearch> scoreGoodsSearches = scoreGoodsSearchMapper.selectByExample(exampleSearch);
+ if(CollUtil.isEmpty(scoreGoodsSearches)){
+ ScoreGoodsSearch scoreGoodsSearch = new ScoreGoodsSearch();
+ scoreGoodsSearch.setUserId(xcxGoodsListDto.getUserId());
+ scoreGoodsSearch.setContents(xcxGoodsListDto.getName());
+ scoreGoodsSearch.setCreatedTime(new Date());
+ scoreGoodsSearchMapper.insert(scoreGoodsSearch);
+ }
}
return new PageInfo<>(data);
}
--
Gitblit v1.9.1