From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
index 7824684..0fd3d14 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,17 +10,11 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.order.feignClient.OrderClient;
-import com.ruoyi.other.api.domain.Goods;
-import com.ruoyi.other.api.domain.GoodsSeckill;
-import com.ruoyi.other.api.domain.SeckillActivityInfo;
-import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
import com.ruoyi.other.mapper.SeckillActivityInfoMapper;
-import com.ruoyi.other.service.GoodsSeckillService;
-import com.ruoyi.other.service.GoodsService;
-import com.ruoyi.other.service.SeckillActivityInfoService;
-import com.ruoyi.other.service.ShopService;
+import com.ruoyi.other.service.*;
import com.ruoyi.other.vo.SeckillActivityDetailVO;
import com.ruoyi.other.vo.SeckillActivityVO;
import io.swagger.annotations.Api;
@@ -62,6 +57,10 @@
private OrderClient orderClient;
@Resource
private ShopService shopService;
+ @Autowired
+ private GoodsCategoryService goodsCategoryService;
+ @Autowired
+ private GoodsShopService goodsShopService;
/**
@@ -207,20 +206,27 @@
SeckillActivityVO vo = new SeckillActivityVO();
SeckillActivityInfo seckillActivityInfo = seckillActivityInfoService.getById(id);
+ if (seckillActivityInfo==null)return R.fail("秒杀活动不存在");
Goods goods = goodsService.getById(seckillActivityInfo.getGoodId());
+ QueryWrapper<GoodsShop> queryWrapper = new QueryWrapper<GoodsShop>();
+ queryWrapper.eq("goods_id", goods.getId());
+ GoodsShop goodsShop = goodsShopService.getOne(queryWrapper);
GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>()
.eq(GoodsSeckill::getSeckillActivityInfoId, seckillActivityInfo.getId()));
-
+ GoodsCategory category = goodsCategoryService.getById(goods.getGoodsCategoryId());
+ Shop shop = shopService.getById(goodsShop.getShopId());
vo.setId(seckillActivityInfo.getId().toString());
vo.setGoodsId(seckillActivityInfo.getGoodId());
vo.setGoodsName(goods.getName());
- vo.setGoodsCategoryName(goods.getCategoryName());
+ vo.setGoodsCategoryName(category.getName());
vo.setSellingPrice(goods.getSellingPrice());
+ vo.setOriginalPrice(goods.getOriginalPrice());
vo.setActivityPrice(goodsSeckill.getSellingPrice());
vo.setMaxNum(seckillActivityInfo.getMaxNum());//活动限购
vo.setStartTime(seckillActivityInfo.getStartTime());
vo.setEndTime(seckillActivityInfo.getEndTime());
-
+ vo.setShopId(goodsShop.getShopId());
+ vo.setShopName(shop.getName());
return R.ok(vo);
--
Gitblit v1.7.1