huliguo
2025-06-06 2474cec7f04390c196c0f7c753d4b70f1d53fcac
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());