From b21f5b5b40b9b45634020380cf03244d46be2df7 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 21 六月 2024 16:07:52 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 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 c193f7b..82f5b98 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
@@ -29,11 +29,23 @@
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
-import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.api.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Member;
+import com.ruoyi.system.api.domain.MemberAddress;
+import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.system.api.domain.WebsocketMessageDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
@@ -47,10 +59,9 @@
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
-import com.ruoyi.system.api.util.WebSocketUsers;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.seata.spring.annotation.GlobalTransactional;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -81,6 +92,7 @@
private final GoodsSkuClient goodsSkuClient;
private final MemberClient memberClient;
private final OrderClient orderClient;
+ private final SysUserClient sysUserClient;
private final AuctionClient auctionClient;
private final IAuctionBidRecordService auctionBidRecordService;
@@ -422,7 +434,7 @@
auctionGoodsinfoVO.setUnit(goodsSkuOne.getUnit());
auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setDescription(goodsSkuOne.getDescription());
- auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
+ auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
GoodsBrand data = goodsSkuClient.getBrandOne(goodsSkuOne.getBrandId(), SecurityConstants.INNER).getData();
GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSkuOne.getCategoryId(), SecurityConstants.INNER).getData();
GoodsSeries data2 = goodsSkuClient.getSeriesOne(goodsSkuOne.getSeriesId(), SecurityConstants.INNER).getData();
@@ -441,7 +453,9 @@
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
auctionGoodsinfoVO.setBond(byId.getBond());
- auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
+ auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
+ auctionGoodsinfoVO.setSharePic(goodsSkuOne.getSharePic());
+ auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionType,1);
@@ -505,7 +519,8 @@
}
-
+ CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+ auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue());
return auctionGoodsinfoVO;
}
@@ -585,13 +600,16 @@
this.lambdaUpdate().set(AuctionGoods::getStartStatus, AuctionStartStatusEnum.ENDED)
.eq(AuctionGoods::getId, id);
// TODO 退保证金
+ orderClient.returnBondByAuctionGoodsId(id, SecurityConstants.INNER);
+
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.AUCTION_GOODS);
- map.put("notification_time", LocalDateTime.now());
+ map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
map.put("target_id", id);
map.put("message_type", "end");
String msg = objectMapper.writeValueAsString(map);
- WebSocketUsers.sendMessageToUsersByType(1, msg);
+ sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
+ .clientType(ClientTypeEnum.MEMBER).build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
}
@@ -606,11 +624,12 @@
.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("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
map.put("target_id", id);
map.put("message_type", "start");
String msg = objectMapper.writeValueAsString(map);
- WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg);
+ sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
+ .clientType(ClientTypeEnum.MEMBER).build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
}
@@ -629,4 +648,14 @@
auctionGoods.setListingStatus(dto.getListingStatus());
this.updateById(auctionGoods);
}
+
+ public static void main(String[] args) throws JsonProcessingException {
+ Map<String, Object> map = new ConcurrentHashMap<>();
+ map.put("notification_type", NotificationTypeConstant.AUCTION_GOODS);
+ map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
+ map.put("target_id", 1);
+ map.put("message_type", "end");
+ String msg = objectMapper.writeValueAsString(map);
+ System.out.println(msg);
+ }
}
--
Gitblit v1.7.1