From d5a62c975afbaff26d17b61fa7b9fde7e2cb035d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 27 七月 2024 11:44:03 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 ec32e41..72d7a4b 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
@@ -1210,7 +1210,7 @@
.between(StringUtils.isNotNull(query.getStartTime()) && StringUtils.isNotNull(
query.getEndTime()), AuctionSalesroom::getStartTime, query.getStartTime(),
query.getEndTime())
- .orderByAsc(AuctionSalesroom::getCreateTime)
+ .orderByDesc(AuctionSalesroom::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
List<AuctionSalesroom> records = page.getRecords();
if (StringUtils.isNull(records)) {
@@ -1256,7 +1256,7 @@
vo.setAuctionSalesroomGoodsVOS(collect);
if (StringUtils.isNotNull(vo.getCurrentAuctionSalesroomGoods())) {
int index = collect.indexOf(vo.getCurrentAuctionSalesroomGoods());
- if (collect.size() > 1) {
+ if (collect.size() > 1 && index < collect.size() - 1) {
vo.setNextAuctionSalesroomGoods(collect.get(index + 1));
}
// 分页查询当前拍品出价信息
@@ -1371,8 +1371,8 @@
public PageDTO<MgtAuctionSalesroomGoodsVO> backupGoods(MgtAuctionSalesroomGoodsQuery query) {
Page<AuctionSalesroomGoods> page = new Page<>(query.getPageCurr(), query.getPageSize());
Set<Long> goodsSkuIdSet = null;
- if (StringUtils.isNotBlank(query.getGoodsName())) {
- List<GoodsSku> data = goodsSkuClient.getGoodsByName(query.getGoodsName(),
+ if (StringUtils.isNotBlank(query.getGoodsSkuName())) {
+ List<GoodsSku> data = goodsSkuClient.getGoodsByName(query.getGoodsSkuName(),
SecurityConstants.INNER).getData();
if (StringUtils.isNotEmpty(data)) {
goodsSkuIdSet = data.stream().map(GoodsSku::getId)
@@ -1650,7 +1650,6 @@
public void stopCurrentAuctionSalesroom(Long auctionSalesroomId)
throws JsonProcessingException {
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AuctionSalesroomGoods::getStatus, AuctionGoodsStatusEnum.WAITING);
wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId, auctionSalesroomId);
wrapper.orderByDesc(AuctionSalesroomGoods::getSortNum);
List<AuctionSalesroomGoods> auctionSalesroomGoods = auctionSalesroomGoodsMapper.selectList(
@@ -1666,19 +1665,18 @@
auctionSalesroom.setStatus(AuctionStartStatusEnum.ENDED);
auctionSalesroom.setEndTime(LocalDateTime.now());
auctionSalesroomMapper.updateById(auctionSalesroom);
-
+ auctionSalesroomGoods = auctionSalesroomGoods.stream()
+ .filter(goods -> goods.getStatus().equals(AuctionGoodsStatusEnum.WAITING)).collect(
+ Collectors.toList());
if (StringUtils.isNotEmpty(auctionSalesroomGoods)) {
List<GoodsStockUpdDTO> dtoList = new ArrayList<>();
for (AuctionSalesroomGoods salesroomGoods : auctionSalesroomGoods) {
salesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED);
// 等待中的商品退库存
- if (salesroomGoods.getStatus().equals(AuctionGoodsStatusEnum.WAITING)) {
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
- goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock());
- dtoList.add(goodsStockUpdDTO);
- }
-
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
+ goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock());
+ dtoList.add(goodsStockUpdDTO);
}
// 批量更新商品库存
auctionSalesroomGoodsMapper.updateBatchById(auctionSalesroomGoods);
--
Gitblit v1.7.1