ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
@@ -29,6 +29,12 @@ private final IAuctionGoodsService auctionGoodsService; /** * 获取拍卖商品列表的分页数据 * * @param query 拍卖商品查询对象 * @return PageDTO<AuctionGoodsVO> */ @ApiOperation(value = "获取拍卖商品列表的分页数据", notes = "获取拍卖商品列表的分页数据") @PostMapping("/page") public R<PageDTO<AuctionGoodsVO>> getAuctionGoodsPage( ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java
@@ -15,6 +15,11 @@ * @since 2024-05-16 */ public interface IAuctionGoodsService extends IService<AuctionGoods> { /** * 获取拍卖商品列表的分页数据 * * @param query 拍卖商品查询对象 * @return PageDTO<AuctionGoodsVO> */ PageDTO<AuctionGoodsVO> getAuctionGoodsPage(AuctionGoodsQuery query); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -33,6 +33,12 @@ private final GoodsSkuClient goodsSkuClient; /** * 获取拍卖商品列表的分页数据 * * @param query 拍卖商品查询对象 * @return PageDTO<AuctionGoodsVO> */ @Override public PageDTO<AuctionGoodsVO> getAuctionGoodsPage(AuctionGoodsQuery query) { Set<Long> goodsSkuIdList = null; @@ -42,7 +48,8 @@ goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId) .collect(Collectors.toSet()); } this.lambdaQuery().select(AuctionGoods::getId, AuctionGoods::getGoodsSkuId, Page<AuctionGoods> page = this.lambdaQuery() .select(AuctionGoods::getId, AuctionGoods::getGoodsSkuId, AuctionGoods::getListingStatus, AuctionGoods::getStartStatus, AuctionGoods::getStartTime, AuctionGoods::getEndTime, AuctionGoods::getAuctionStock, AuctionGoods::getMinimumMarkupAmount).in( @@ -54,6 +61,6 @@ .eq(StringUtils.isNotNull(query.getStartStatus()), AuctionGoods::getStartStatus, query.getStartStatus()) .page(new Page<>(query.getPageCurr(), query.getPageSize())); return null; return PageDTO.of(page, AuctionGoodsVO.class); } } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
@@ -1,6 +1,7 @@ package com.ruoyi.goods.controller.inner; import com.fasterxml.jackson.core.JsonProcessingException; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.goods.service.IGoodsSeckillService; @@ -45,7 +46,12 @@ @InnerAuth @GetMapping("/start/{seckillId}") R<?> startSeckill(@PathVariable("seckillId") Long seckillId) { goodsSeckillService.startSeckill(seckillId); try { goodsSeckillService.startSeckill(seckillId); } catch (JsonProcessingException e) { log.error("秒杀开始异常", e); return R.fail(); } return R.ok(); } @@ -57,7 +63,12 @@ @InnerAuth @GetMapping("/end/{seckillId}") R<?> endSeckill(@PathVariable("seckillId") Long seckillId) { goodsSeckillService.endSeckill(seckillId); try { goodsSeckillService.endSeckill(seckillId); } catch (JsonProcessingException e) { log.error("秒杀结束异常", e); return R.fail(); } return R.ok(); } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java
@@ -13,13 +13,14 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** * @author mitao * @date 2024/5/24 */ @Component @Service @Slf4j @RequiredArgsConstructor public class AsyncMethodService { @@ -28,6 +29,7 @@ private final SysUserClient sysUserClient; @Async @Transactional(rollbackFor = Exception.class) public void seckillScheduleTask(GoodsSeckill goodsSeckill) { LocalDateTime startTime = goodsSeckill.getStartTime(); LocalDateTime endTime = goodsSeckill.getEndTime(); @@ -50,6 +52,7 @@ } @Async @Transactional(rollbackFor = Exception.class) public void groupPurchaseScheduleTask(GoodsGroupPurchase groupPurchase) { LocalDateTime startTime = groupPurchase.getStartTime(); LocalDateTime endTime = groupPurchase.getEndTime();