1

luofl

2025-03-11 b8dedd4e1962cf4f7984b01d500f950fe5e8fea3

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java

@@ -911,6 +911,7 @@
                        AuctionSalesroom::getEndTime, AuctionSalesroom::getType,
                        AuctionSalesroom::getAuthentication, AuctionSalesroom::getStatus,
                        AuctionSalesroom::getQrCode)
                .in(StringUtils.isNotNull(query.getIds()), AuctionSalesroom::getId,query.getIds())
                .like(StringUtils.isNotEmpty(query.getSalesroomName()),
                        AuctionSalesroom::getSalesroomName, query.getSalesroomName())
                .eq(StringUtils.isNotNull(query.getAuthentication()),
@@ -942,7 +943,7 @@
            // 计算每个拍卖场所有拍品数量
            Map<Long, Integer> map = auctionSalesroomGoods.stream()
                    .collect(Collectors.groupingBy(AuctionSalesroomGoods::getAuctionSalesroomId,
                            Collectors.summingInt(AuctionSalesroomGoods::getSalesroomStock)));
                            Collectors.summingInt(AuctionSalesroomGoods::getBidNum)));
            for (MgtAuctionSalesroomVO mgtAuctionSalesroomVO : list) {
                Integer i = map.get(mgtAuctionSalesroomVO.getId());
                if (StringUtils.isNotNull(i)) {
@@ -953,26 +954,6 @@
        return auctionSalesroomVOPageDTO;
    }

    /**
     * 查看二维码
     *
     * @param id 拍卖场id
     * @return 二维码
     */
    @Override
    public String getQrCode(Long id) throws Exception {
        AuctionSalesroom auctionSalesroom = this.getById(id);
        if (StringUtils.isBlank(auctionSalesroom.getQrCode())) {
            AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO();
            vo.setAuctionSalesroomNo(auctionSalesroom.getAuctionSalesroomNo());
            vo.setType(auctionSalesroom.getType().getCode());
            String url = remoteFileService.obsUpload(
                    CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))).getData();
            auctionSalesroom.setQrCode(url);
            this.updateById(auctionSalesroom);
        }
        return auctionSalesroom.getQrCode();
    }

    @Override
    @Transactional
@@ -991,8 +972,8 @@
                if (StringUtils.isNull(data.getMinimumMarkupAmount())) {
                    throw new ServiceException("拍卖商品最低加价金额不能为空");
                }
                if (StringUtils.isNull(data.getSalesroomStock())) {
                    throw new ServiceException("拍卖商品拍品数量不能为空");
                if (StringUtils.isNull(data.getBidNum())) {
                    throw new ServiceException("可中拍人数不能为空");
                }
                if (StringUtils.isNull(data.getListingDuration())) {
                    throw new ServiceException("拍卖商品拍卖时间不能为空");
@@ -1012,15 +993,12 @@
            AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO();
            vo.setAuctionSalesroomNo(nextId.toString());
            vo.setType(auctionSalesroom.getType().getCode());
            String url = remoteFileService.obsUpload(
                    CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))).getData();
            auctionSalesroom.setQrCode(url);
            // 添加
            this.save(auctionSalesroom);
            List<GoodsStockUpdDTO> goodsStockUpdDTOS = auctionSalesroomGoods.stream().map(item -> {
                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(item.getGoodsSkuId());
                goodsStockUpdDTO.setAuctionStock(item.getSalesroomStock() * -1);
                goodsStockUpdDTO.setAuctionStock(item.getBidNum() * -1 * item.getDealQuantity());
                return goodsStockUpdDTO;
            }).collect(Collectors.toList());
            goodsSkuClient.updGoodsStock(goodsStockUpdDTOS, SecurityConstants.INNER);
@@ -1041,10 +1019,6 @@
                AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO();
                vo.setAuctionSalesroomNo(auctionSalesroomOrg.getAuctionSalesroomNo());
                vo.setType(auctionSalesroom.getType().getCode());
                String url = remoteFileService.obsUpload(
                                CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo)))
                        .getData();
                auctionSalesroom.setQrCode(url);
            }
            this.updateById(auctionSalesroom);
            List<AuctionSalesroomGoods> list = auctionSalesroomGoodsMapper.selectList(
@@ -1058,8 +1032,8 @@
                            .map(auctionSalesroomGood -> {
                                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                                goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
                                goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock()
                                        - auctionSalesroomGood.getSalesroomStock());
                                goodsStockUpdDTO.setAuctionStock(salesroomGoods.getBidNum() * salesroomGoods.getDealQuantity()
                                        - auctionSalesroomGood.getBidNum() * auctionSalesroomGood.getDealQuantity());
                                return goodsStockUpdDTO;
                            }))
                    .collect(Collectors.toList());