Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 d5bf846770b001cac64ca27a3fe2886a9c5076b3

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java

@@ -32,6 +32,8 @@
import java.util.List;
import java.util.stream.Collectors;

import static com.ruoyi.common.core.utils.PageUtils.startPage;

/**
 * <p>
 * 服务实现类
@@ -66,6 +68,7 @@
        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();