From b22df417e0bc423c788b013feaad686531d69eed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 09:51:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
index eca535e..4a96d79 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
@@ -5,7 +5,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.mapper.GoodsShopMapper;
import com.ruoyi.other.mapper.SeckillActivityInfoMapper;
@@ -48,34 +52,45 @@
private GoodsSeckillService goodsSeckillService;
@Resource
private GoodsService goodsService;
+ @Resource
+ private OrderClient orderClient;
@Override
public List<SeckillActivityVO> listSeckillActivity(Goods goods) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
goods.setVipId(appUser.getVipId());
- return seckillActivityInfoMapper.listSeckillActivity(goods);
+ List<SeckillActivityVO> seckillActivityVOS = seckillActivityInfoMapper.listSeckillActivity(goods);
+ return seckillActivityVOS;
}
@Override
public SeckillActivityDetailVO detail(Integer seckillActivityId) {
- Long userid = tokenService.getLoginUserApplet().getUserid();
- AppUser appUser = appUserClient.getAppUserById(userid);
- SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId, appUser.getVipId());
+ Integer vipId = 0;
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ if(StringUtils.isNotEmpty(token)){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ AppUser appUser = appUserClient.getAppUserById(userid);
+ vipId = appUser.getVipId();
+ }
+ SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId, vipId);
Integer goodsId = seckillActivityDetailVO.getGoodsId();
Goods goods = goodsService.getById(goodsId);
+ seckillActivityDetailVO.setGoodsName(goods.getName());
+ seckillActivityDetailVO.setGoodsType(goods.getType());
List<Shop> shops;
if(goods.getAppointStore() == 1){
List<Integer> shopIdList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()
.eq(GoodsShop::getGoodsId, goodsId)).stream().map(GoodsShop::getShopId).collect(Collectors.toList());
- shops = shopMapper.selectObjs(new LambdaQueryWrapper<Shop>()
- .select(Shop::getName)
- .in(shopIdList.size() > 0, Shop::getId, shopIdList));
+ shops = shopMapper.selectList(new LambdaQueryWrapper<Shop>()
+ .in(shopIdList.size() > 0, Shop::getId, shopIdList).eq(Shop::getDelFlag, 0));
}else{
shops = shopMapper.selectList(new LambdaUpdateWrapper<Shop>().eq(Shop::getDelFlag, 0));
}
seckillActivityDetailVO.setShopList(shops);
+ Integer integer = orderClient.getGoodsSaleNum(goods.getId(), 2).getData();
+ seckillActivityDetailVO.setSaleNum(integer);
return seckillActivityDetailVO;
}
@@ -84,7 +99,11 @@
public void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
this.baseMapper.insert(seckillActivityInfo);
List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
- goodsSeckills.forEach(goodsSeckill -> goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId()));
+ for (GoodsSeckill goodsSeckill : goodsSeckills) {
+ goodsSeckill.setCashPayment(null == goodsSeckill.getSellingPrice() ? 0 : 1);
+ goodsSeckill.setPointPayment(null == goodsSeckill.getIntegral() ? 0 : 1);
+ goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId());
+ }
goodsSeckillService.saveBatch(goodsSeckills);
}
@@ -94,7 +113,11 @@
this.baseMapper.updateById(seckillActivityInfo);
goodsSeckillService.remove(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, seckillActivityInfo.getId()));
List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
- goodsSeckills.forEach(goodsSeckill -> goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId()));
+ for (GoodsSeckill goodsSeckill : goodsSeckills) {
+ goodsSeckill.setCashPayment(null == goodsSeckill.getSellingPrice() ? 0 : 1);
+ goodsSeckill.setPointPayment(null == goodsSeckill.getIntegral() ? 0 : 1);
+ goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId());
+ }
goodsSeckillService.saveBatch(goodsSeckills);
}
}
--
Gitblit v1.7.1