From c8a21748f87bc0a23744d9fee5dec3eaaa403fdc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 六月 2024 18:59:51 +0800
Subject: [PATCH] 1.提交【管理后台】-资讯管理相关接口

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 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 1e70310..d5c1267 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
@@ -25,6 +25,7 @@
 import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
 import com.ruoyi.common.core.enums.BidStatusEnum;
 import com.ruoyi.common.core.enums.BondStatusEnum;
+import com.ruoyi.common.core.enums.ClientTypeEnum;
 import com.ruoyi.common.core.enums.ListingStatusEnum;
 import com.ruoyi.common.core.enums.OrderFromEnum;
 import com.ruoyi.common.core.exception.ServiceException;
@@ -567,25 +568,6 @@
         AuctionGoods auctionGoods = this.getById(id);
         if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getListingStatus().equals(
                 ListingStatusEnum.ON_SHELVES) && auctionGoods.getStartStatus()
-                .equals(AuctionStartStatusEnum.IN_PREVIEW)) {
-            this.lambdaUpdate().set(AuctionGoods::getStartStatus, AuctionStartStatusEnum.IN_AUCTION)
-                    .eq(AuctionGoods::getId, id);
-            Map<String, Object> map = new ConcurrentHashMap<>();
-            map.put("notification_type", NotificationTypeConstant.AUCTION_GOODS);
-            map.put("notification_time", LocalDateTime.now());
-            map.put("target_id", id);
-            map.put("message_type", "start");
-            String msg = objectMapper.writeValueAsString(map);
-            WebSocketUsers.sendMessageToUsersByText(msg);
-            log.info("===================>发送websocket通知,消息体{}", msg);
-        }
-    }
-
-    @Override
-    public void startAuctionGoods(Long id) throws JsonProcessingException {
-        AuctionGoods auctionGoods = this.getById(id);
-        if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getListingStatus().equals(
-                ListingStatusEnum.ON_SHELVES) && auctionGoods.getStartStatus()
                 .equals(AuctionStartStatusEnum.IN_AUCTION)) {
             this.lambdaUpdate().set(AuctionGoods::getStartStatus, AuctionStartStatusEnum.ENDED)
                     .eq(AuctionGoods::getId, id);
@@ -595,7 +577,26 @@
             map.put("target_id", id);
             map.put("message_type", "end");
             String msg = objectMapper.writeValueAsString(map);
-            WebSocketUsers.sendMessageToUsersByText(msg);
+            WebSocketUsers.sendMessageToUsersByType(1, msg);
+            log.info("===================>发送websocket通知,消息体{}", msg);
+        }
+    }
+
+    @Override
+    public void startAuctionGoods(Long id) throws JsonProcessingException {
+        AuctionGoods auctionGoods = this.getById(id);
+        if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getListingStatus().equals(
+                ListingStatusEnum.ON_SHELVES) && auctionGoods.getStartStatus()
+                .equals(AuctionStartStatusEnum.IN_PREVIEW)) {
+            this.lambdaUpdate().set(AuctionGoods::getStartStatus, AuctionStartStatusEnum.IN_AUCTION)
+                    .eq(AuctionGoods::getId, id);
+            Map<String, Object> map = new ConcurrentHashMap<>();
+            map.put("notification_type", NotificationTypeConstant.AUCTION_GOODS);
+            map.put("notification_time", LocalDateTime.now());
+            map.put("target_id", id);
+            map.put("message_type", "start");
+            String msg = objectMapper.writeValueAsString(map);
+            WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg);
             log.info("===================>发送websocket通知,消息体{}", msg);
         }
     }

--
Gitblit v1.7.1