From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:58:12 +0800
Subject: [PATCH] 修改

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 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 8e3e024..9cab3b5 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
@@ -14,6 +14,7 @@
 import com.ruoyi.other.mapper.GoodsShopMapper;
 import com.ruoyi.other.mapper.SeckillActivityInfoMapper;
 import com.ruoyi.other.mapper.ShopMapper;
+import com.ruoyi.other.service.GoodsEvaluateService;
 import com.ruoyi.other.service.GoodsSeckillService;
 import com.ruoyi.other.service.GoodsService;
 import com.ruoyi.other.service.SeckillActivityInfoService;
@@ -30,6 +31,8 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import static com.ruoyi.common.core.utils.PageUtils.startPage;
 
 /**
  * <p>
@@ -57,12 +60,15 @@
     private GoodsService goodsService;
     @Resource
     private OrderClient orderClient;
+    @Resource
+    private GoodsEvaluateService goodsEvaluateService;
 
     @Override
     public List<SeckillActivityVO> listSeckillActivity(Goods goods) {
         LoginUser loginUserApplet = tokenService.getLoginUserApplet();
         AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
         goods.setVipId(appUser.getVipId());
+        startPage();
         List<SeckillActivityVO> seckillActivityVOS = seckillActivityInfoMapper.listSeckillActivity(goods);
         for (SeckillActivityVO seckillActivityVO : seckillActivityVOS) {
             Integer data = orderClient.getGoodsSaleNum(seckillActivityVO.getGoodsId(), 2).getData();
@@ -89,6 +95,16 @@
             Long userid = tokenService.getLoginUserApplet().getUserid();
             AppUser appUser = appUserClient.getAppUserById(userid);
             vipId = appUser.getVipId();
+        }
+        SeckillActivityInfo activityInfo = this.getById(seckillActivityId);
+        if(null == activityInfo || activityInfo.getDelFlag() == 1){
+            throw new RuntimeException("活动不存在");
+        }
+        if(activityInfo.getIsShelves() == 0){
+            throw new RuntimeException("活动已下架");
+        }
+        if(!activityInfo.getVipIds().contains(vipId.toString())){
+            throw new RuntimeException("权限不足");
         }
         SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId, vipId);
         Integer goodsId = seckillActivityDetailVO.getGoodsId();
@@ -121,12 +137,29 @@
         seckillActivityDetailVO.setShopList(shops);
         Integer integer = orderClient.getGoodsSaleNum(goods.getId(), 2).getData();
         seckillActivityDetailVO.setSaleNum(integer);
+        GoodsEvaluate goodsEvaluate = goodsEvaluateService.lambdaQuery().eq(GoodsEvaluate::getGoodsId, goodsId).isNotNull(GoodsEvaluate::getComment).ne(GoodsEvaluate::getComment, "")
+                .orderByDesc(GoodsEvaluate::getGrade).eq(GoodsEvaluate::getStatus, 2).eq(GoodsEvaluate::getDelFlag, 0).last(" limit 0, 1").one();
+        if (null != goodsEvaluate) {
+            AppUser appUserById = appUserClient.getAppUserById(goodsEvaluate.getAppUserId());
+            if(null != appUserById){
+                goodsEvaluate.setUserName(appUserById.getName());
+                goodsEvaluate.setAvatar(appUserById.getAvatar());
+                goodsEvaluate.setIdStr(String.valueOf(goodsEvaluate.getId()));
+            }
+        }
+        seckillActivityDetailVO.setGoodsEvaluate(goodsEvaluate);
         return seckillActivityDetailVO;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
+        Integer goodId = seckillActivityInfo.getGoodId();
+        long count = this.count(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, goodId).eq(SeckillActivityInfo::getDelFlag, 0)
+                .eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time"));
+        if(0 < count){
+            throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
+        }
         this.baseMapper.insert(seckillActivityInfo);
         List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
         for (GoodsSeckill goodsSeckill : goodsSeckills) {
@@ -140,6 +173,12 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
+        Integer goodId = seckillActivityInfo.getGoodId();
+        long count = this.count(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, goodId).eq(SeckillActivityInfo::getDelFlag, 0)
+                .eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time"));
+        if(1 < count){
+            throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
+        }
         this.baseMapper.updateById(seckillActivityInfo);
         goodsSeckillService.remove(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, seckillActivityInfo.getId()));
         List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();

--
Gitblit v1.7.1