From ccf8413a33e85589d0ed219bd1a0aff88e6a1e39 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 14:48:58 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 133dc5b..741452c 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,16 +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);
- if(CollUtil.isNotEmpty(maps)){
- for(QueryGoodsListVo queryGoodsListVo : maps){
- long id = queryGoodsListVo.getId();
- Integer stock = scoreGoodsSkuMapper.selectScoreGoodsSkuMapperByGoodId(id);
- queryGoodsListVo.setStock(stock);
- }
- }
+ 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<>();
@@ -325,6 +329,19 @@
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())){
Example exampleSearch = new Example(ScoreGoodsSearch.class);
Example.Criteria criteriaSearch = exampleSearch.createCriteria();
@@ -342,12 +359,25 @@
return new PageInfo<>(data);
}
- public XcxGoodsDetailVo findGoodsDetails(Long id) {
+ public XcxGoodsDetailVo findGoodsDetails(Long id, String userId) {
XcxGoodsDetailVo data = scoreGoodsMapper.selectGoodsDetailsById(id);
+ data.setQuotaTime(data.getQuotaTime() == null ? 0:data.getQuotaTime());
XcxGoodsListDto dto = new XcxGoodsListDto();
dto.setId(id);
List<XcxGoodsListVo> list = scoreGoodsMapper.selectXcxGoodsList(dto);
-
+ if(StrUtil.isNotEmpty(userId)){
+ if(CollUtil.isNotEmpty(list)){
+ for(XcxGoodsListVo xcxGoodsListVo : list){
+ if(ScoreGoods.ISQG_YES == xcxGoodsListVo.getIsQg()){
+ //抢购时间内，用户购买该商品的数量
+ Integer sumCnt = scoreOrderMapper.selectGoodsQuotaTime(userId,xcxGoodsListVo.getId(),xcxGoodsListVo.getQgStartTime(),xcxGoodsListVo.getQgEndTime());
+ data.setAvaQuotaTime(
+ ((xcxGoodsListVo.getQuotaTime() == null?0:xcxGoodsListVo.getQuotaTime()) - sumCnt) > 0?((xcxGoodsListVo.getQuotaTime() == null?0:xcxGoodsListVo.getQuotaTime()) - sumCnt):0
+ );
+ }
+ }
+ }
+ }
List<String> images = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
data.setImages(images);
if (CollUtil.isNotEmpty(list)) {
--
Gitblit v1.9.1