From 7ce97a95ba44b18aa525b2c0540e5162c59d1474 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:51:50 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index 829b3e5..24958b3 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
+import com.ruoyi.auction.service.IAuctionBrowseRecordService;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
@@ -69,7 +70,8 @@
@Resource
private OrderClient orderClient;
-
+ @Resource
+ private IAuctionBrowseRecordService iAuctionBrowseRecordService;
@@ -308,7 +310,7 @@
if (auctionSalesroomGoods.size()>0){
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
salesroomGoods.setStatus(AuctionStartStatusEnum.ENDED);
- iAuctionSalesroomGoodsService.updateById(salesroomGoods);
+ this.updateById(salesroomGoods);
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
@@ -383,7 +385,8 @@
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
AuctionSalesroomGoods auctionSalesroomGood=this.getOne(wrapper2);
- AuctionSalesroom auctionSalesroom=this.getById(auctionSalesroomGood.getAuctionSalesroomId());
+ AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(
+ auctionSalesroomGood.getAuctionSalesroomId());
AuctionSalesroomGoods auctionSalesroomGoods=this.getById(auctionSalesroomGoodsDTO.getGoodsSkuId());
List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();
--
Gitblit v1.7.1