From 884f5c68ac8c738f90f1ca257605cfbb5d7f12db Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 六月 2024 09:09:27 +0800
Subject: [PATCH] 提交【管理后台】-工作台接口
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index d69ae1f..676db97 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -66,7 +66,14 @@
import io.seata.spring.annotation.GlobalTransactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -213,6 +220,15 @@
if (goodsSku.getStock() + auctionGoodsOrg.getAuctionStock() < dto.getAuctionStock()) {
throw new ServiceException("商品库存不足");
}
+ if (!auctionGoodsOrg.getAuctionStock().equals(dto.getAuctionStock())) {
+ // 更新商品库存
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(goodsSkuId);
+ goodsStockUpdDTO.setAuctionStock(
+ auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
+ goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ SecurityConstants.INNER);
+ }
auctionGoodsOrg.setStartingPrice(dto.getStartingPrice());
auctionGoodsOrg.setMinimumMarkupAmount(dto.getMinimumMarkupAmount());
auctionGoodsOrg.setStartTime(dto.getStartTime());
@@ -224,15 +240,8 @@
auctionGoodsOrg.setShareTitle(dto.getShareTitle());
auctionGoodsOrg.setSharePic(dto.getSharePic());
this.updateById(auctionGoodsOrg);
- // 更新商品库存
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setGoodsSkuId(goodsSkuId);
- goodsStockUpdDTO.setAuctionStock(
- auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
- goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
- SecurityConstants.INNER);
- auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
+ auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
/**
@@ -640,7 +649,6 @@
.equals(AuctionStartStatusEnum.IN_AUCTION)) {
auctionGoods.setStartStatus(AuctionStartStatusEnum.ENDED);
this.updateById(auctionGoods);
- // TODO 退保证金
orderClient.returnBondByAuctionGoodsId(id, SecurityConstants.INNER);
Map<String, Object> map = new ConcurrentHashMap<>();
--
Gitblit v1.7.1