From 9969769cd09e0f8046feefa18efebb7951baa936 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 20 Dec 2021 17:36:33 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 21 ++++++++++++++++++---
1 files changed, 18 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 6a97396..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
@@ -335,7 +335,9 @@
if(ScoreGoods.ISQG_YES == xcxGoodsListVo.getIsQg()){
//抢购时间内，用户购买该商品的数量
Integer sumCnt = scoreOrderMapper.selectGoodsQuotaTime(xcxGoodsListDto.getUserId(),xcxGoodsListVo.getId(),xcxGoodsListVo.getQgStartTime(),xcxGoodsListVo.getQgEndTime());
- xcxGoodsListVo.setAvaQuotaTime(xcxGoodsListVo.getQuotaTime() - sumCnt);
+ xcxGoodsListVo.setAvaQuotaTime(
+ ((xcxGoodsListVo.getQuotaTime() == null?0:xcxGoodsListVo.getQuotaTime()) - sumCnt) > 0?((xcxGoodsListVo.getQuotaTime() == null?0:xcxGoodsListVo.getQuotaTime()) - sumCnt):0
+ );
}
}
}
@@ -357,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