From 88adbada822c2e3d18235374c176c1b9201358cb Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 06 六月 2025 19:17:19 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java index ac388e0..6a5b1d2 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java @@ -225,7 +225,9 @@ public PageInfo<ShopBalanceStatementVO> getShopBalanceStatementList(Integer shopId, LocalDateTime startTime, LocalDateTime endTime, Integer type, Integer pageCurr, Integer pageSize) { PageInfo<ShopBalanceStatementVO> pageInfo = new PageInfo<>(pageCurr, pageSize); List<ShopBalanceStatementVO> ShopBalanceStatementList = shopBalanceStatementMapper.getShopBalanceStatementList(pageInfo, shopId, startTime, endTime, type); + for (ShopBalanceStatementVO shopBalanceStatementVO : ShopBalanceStatementList) { + log.error(shopBalanceStatementVO.toString()); BigDecimal historicalBalance = shopBalanceStatementVO.getHistoricalBalance(); BigDecimal balance = shopBalanceStatementVO.getBalance(); if (historicalBalance != null && balance != null) { @@ -319,6 +321,7 @@ //一个商品只有一个秒杀活动 SeckillActivityInfo seckillActivityInfo = seckillActivityInfoService.getOne(new LambdaQueryWrapper<SeckillActivityInfo>() .eq(SeckillActivityInfo::getGoodId, goodsId) + .eq(SeckillActivityInfo::getIsShelves,1) .eq(SeckillActivityInfo::getDelFlag, 0)); //商品是否开启秒杀活动 goodsVO.setIsSkillActivity(0); @@ -357,6 +360,9 @@ goodsShop.setGoodsId(goods.getId()); goodsShop.setShopId(addGoodsDTO.getShopId()); Shop shop = shopMapper.selectById(addGoodsDTO.getShopId()); + if(shop==null){ + throw new ServiceException("门店不存在"); + } goodsShop.setShopName(shop.getName()); goodsShop.setOwnerName(shop.getShopManager()); goodsShop.setPhone(shop.getPhone()); @@ -454,6 +460,17 @@ return goods.getId(); } + @Override + public PageInfo<ShopBalanceListVO> getBalanceList(String name, Integer pageCurr, Integer pageSize) { + PageInfo<ShopBalanceListVO> pageInfo = new PageInfo<>(pageCurr, pageSize); + + List<ShopBalanceListVO> list = shopMapper.getBalanceList(pageInfo,name); + + + pageInfo.setRecords(list); + return pageInfo; + } + /** * 获取商品当前的价格,就是看当前商品是否在秒杀活动中 */ -- Gitblit v1.7.1