From b8dedd4e1962cf4f7984b01d500f950fe5e8fea3 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 三月 2025 10:47:19 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 468ee6d..dc8f061 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -943,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)) {
@@ -954,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
@@ -992,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("拍卖商品拍卖时间不能为空");
@@ -1013,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);
@@ -1042,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(
@@ -1059,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());
--
Gitblit v1.7.1