From ab34ef62429262bcde69186f1e5edecc5f66c001 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 15:53:18 +0800
Subject: [PATCH] 拍卖结果弹窗消息

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 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 44cb11b..736f643 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
@@ -163,7 +163,10 @@
         forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName());
         forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
         forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
-        forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
+        // forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
+        forepartAuctionSalesroomGoodsVO.setBidNum(auctionSalesroomGoods.getBidNum());
+        forepartAuctionSalesroomGoodsVO.setDealQuantity(auctionSalesroomGoods.getDealQuantity());
+        forepartAuctionSalesroomGoodsVO.setMaxAmount(auctionSalesroomGoods.getMaxAmount());
         forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
         forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
         forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getScreenCoverPic());
@@ -392,7 +395,8 @@
 
                 GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                 goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
-                goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock());
+                goodsStockUpdDTO.setAuctionStock(
+                        salesroomGoods.getBidNum() * salesroomGoods.getDealQuantity());
                 goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
                         SecurityConstants.INNER);
 
@@ -519,7 +523,7 @@
             if (auctionBidRecordList.size() > 0) {
                 //判断
                 if (auctionBidRecordList.size() >= auctionSalesroomGoods.getBidNum()) {
-                    for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
+                    for (int i = 0; i < auctionSalesroomGoods.getBidNum(); i++) {
                         AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
                         auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
                         Long orderId = AddOrder(auctionBidRecord.getTargetId(),
@@ -538,7 +542,9 @@
                 } else {
                     GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                     goodsStockUpdDTO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
-                    goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getSalesroomStock()- auctionBidRecordList.size());
+                    goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getBidNum()
+                            * auctionSalesroomGoods.getDealQuantity() - auctionBidRecordList.size()
+                            * auctionSalesroomGoods.getDealQuantity());
                     goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
                             SecurityConstants.INNER);
 
@@ -666,7 +672,10 @@
         AuctionSalesroomGoodsInfoVO.setGoodsSkuId(byId1.getId());
         AuctionSalesroomGoodsInfoVO.setGoodsSkuName(goodsSku.getSkuName());
         AuctionSalesroomGoodsInfoVO.setStartingPrice(byId1.getStartingPrice());
-        AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
+        // AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
+        AuctionSalesroomGoodsInfoVO.setBidNum(byId1.getBidNum());
+        AuctionSalesroomGoodsInfoVO.setMaxAmount(byId1.getMaxAmount());
+        AuctionSalesroomGoodsInfoVO.setDealQuantity(byId1.getDealQuantity());
         AuctionSalesroomGoodsInfoVO.setSalesroomType(byId.getType().getCode());
         AuctionSalesroomGoodsInfoVO.setGoodsSkustatus(byId1.getStatus().getCode());
         AuctionSalesroomGoodsInfoVO.setListingDuration(byId1.getListingDuration());
@@ -898,12 +907,4 @@
         return orderClient.saveOrderOne(order, SecurityConstants.INNER).getData();
     }
 
-    /**
-     * 设置弹窗状态已弹出
-     * @param id
-     */
-    @Override
-    public void setPopup(Long id) {
-
-    }
 }

--
Gitblit v1.7.1