From 357bf93f7fa56e414ad54d4fbfbf6bd97da5b1d2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 26 七月 2024 08:57:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 a0806af..a51b10a 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
@@ -978,6 +978,15 @@
throw new ServiceException("该拍卖场已结束，不能编辑");
}
auctionSalesroom.setId(auctionSalesroomOrg.getId());
+ if (!auctionSalesroomOrg.getType().equals(auctionSalesroom.getType())) {
+ 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(
Wrappers.<AuctionSalesroomGoods>lambdaQuery()
@@ -1197,11 +1206,10 @@
AuctionSalesroom::getSalesroomName, query.getSalesroomName())
.eq(StringUtils.isNotNull(query.getStatus()), AuctionSalesroom::getStatus,
query.getStatus())
- .ne(AuctionSalesroom::getStatus, AuctionStartStatusEnum.ENDED)
.between(StringUtils.isNotNull(query.getStartTime()) && StringUtils.isNotNull(
query.getEndTime()), AuctionSalesroom::getStartTime, query.getStartTime(),
query.getEndTime())
- .orderByAsc(AuctionSalesroom::getStartTime)
+ .orderByAsc(AuctionSalesroom::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
List<AuctionSalesroom> records = page.getRecords();
if (StringUtils.isNull(records)) {
@@ -1446,11 +1454,15 @@
if (auctionBidRecordList.size() >= auctionSalesroomGoods.getSalesroomStock()) {
for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
+ auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
+ auctionBidRecordMapper.updateById(auctionBidRecord);
auctionBidRecords.add(auctionBidRecord);
}
} else {
for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
+ auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
+ auctionBidRecordMapper.updateById(auctionBidRecord);
auctionBidRecords.add(auctionBidRecord);
}
// 没有出价记录，回退库存
--
Gitblit v1.7.1