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 | 99 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 18 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 bcb6b71..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
@@ -1,26 +1,36 @@
package com.ruoyi.other.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.other.api.domain.Goods;
-import com.ruoyi.other.api.domain.GoodsShop;
-import com.ruoyi.other.api.domain.SeckillActivityInfo;
-import com.ruoyi.other.api.domain.Shop;
+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;
import com.ruoyi.other.mapper.ShopMapper;
+import com.ruoyi.other.service.GoodsSeckillService;
+import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.service.SeckillActivityInfoService;
import com.ruoyi.other.vo.SeckillActivityDetailVO;
import com.ruoyi.other.vo.SeckillActivityVO;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
- * 服务实现类
+ * 服务实现类
* </p>
*
* @author luodangjia
@@ -34,27 +44,80 @@
private GoodsShopMapper goodsShopMapper;
@Resource
private ShopMapper shopMapper;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private GoodsSeckillService goodsSeckillService;
+ @Resource
+ private GoodsService goodsService;
+ @Resource
+ private OrderClient orderClient;
@Override
public List<SeckillActivityVO> listSeckillActivity(Goods goods) {
- return seckillActivityInfoMapper.listSeckillActivity(goods);
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
+ goods.setVipId(appUser.getVipId());
+ List<SeckillActivityVO> seckillActivityVOS = seckillActivityInfoMapper.listSeckillActivity(goods);
+ return seckillActivityVOS;
}
@Override
public SeckillActivityDetailVO detail(Integer seckillActivityId) {
- SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId);
- Long goodsId = seckillActivityDetailVO.getGoodsId();
+ 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();
- List<Integer> shopIdList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()
- .eq(GoodsShop::getGoodsId, goodsId)).stream().map(GoodsShop::getShopId).collect(Collectors.toList());
-
- List<String> shopNames = shopMapper.selectObjs(new LambdaQueryWrapper<Shop>()
- .select(Shop::getName)
- .in(Shop::getId, shopIdList))
- .stream()
- .map(Object::toString)
- .collect(Collectors.toList());
- seckillActivityDetailVO.setShopList(shopNames);
+ 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.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;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
+ this.baseMapper.insert(seckillActivityInfo);
+ List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
+ 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);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
+ this.baseMapper.updateById(seckillActivityInfo);
+ goodsSeckillService.remove(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, seckillActivityInfo.getId()));
+ List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
+ 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