From 42f795894094c4d9541381da31357d4bbf93fea0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 09:36:44 +0800
Subject: [PATCH] 修改循环注入
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 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 22742c2..5973f5b 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsQuery;
@@ -16,16 +18,20 @@
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionBrowseRecordService;
import com.ruoyi.auction.service.IAuctionGoodsService;
+import com.ruoyi.auction.service.IMemberAuctionCollectionService;
+import com.ruoyi.auction.service.async.AuctionAsyncMethodService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
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.ListingStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.exception.ServiceException;
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.AuctionGoods;
import com.ruoyi.system.api.domain.GoodsBrand;
import com.ruoyi.system.api.domain.GoodsCategory;
@@ -46,6 +52,7 @@
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 io.seata.spring.annotation.GlobalTransactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -54,6 +61,7 @@
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;
import lombok.RequiredArgsConstructor;
@@ -78,12 +86,11 @@
private final MemberClient memberClient;
private final OrderClient orderClient;
private final IAuctionBidRecordService auctionBidRecordService;
-
+ private final AuctionAsyncMethodService auctionAsyncMethodService;
+ // 创建一个静态共享的ObjectMapper实例以重用
+ private static final ObjectMapper objectMapper = new ObjectMapper();
@Resource
- private MemberAuctionCollectionServiceImpl memberAuctionCollectionServiceImpl;
-
- @Resource
- private IAuctionGoodsService auctionGoodsService;
+ private IMemberAuctionCollectionService memberAuctionCollectionService;
@Resource
private AuctionGoodsMapper auctionGoodsMapper;
@@ -188,6 +195,7 @@
auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
SecurityConstants.INNER);
+ auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
}
@@ -360,6 +368,7 @@
auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName());
auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic());
+ auctionGoodsVO.setYears(String.valueOf(goodsSkuOne.getYears()));
auctionGoodsVOS.add(auctionGoodsVO);
}
@@ -369,7 +378,7 @@
@Override
public AuctionGoodsinfoVO getAuctionGoodsInfo(AuctionGoodsListDTO auctionGoodsListDTO) {
- AuctionGoods byId = auctionGoodsService.getById(auctionGoodsListDTO.getGoodsSkuId());
+ AuctionGoods byId = auctionGoodsMapper.selectById(auctionGoodsListDTO.getGoodsSkuId());
GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(byId.getGoodsSkuId(), SecurityConstants.INNER).getData();
AuctionGoodsinfoVO auctionGoodsinfoVO=new AuctionGoodsinfoVO();
auctionGoodsinfoVO.setGoodsSkuId(byId.getGoodsSkuId());
@@ -381,7 +390,7 @@
auctionGoodsinfoVO.setEndTime(byId.getEndTime());
auctionGoodsinfoVO.setUnit(goodsSkuOne.getUnit());
auctionGoodsinfoVO.setDescription(goodsSkuOne.getDescription());
- auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
+ auctionGoodsinfoVO.setYears(String.valueOf(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();
@@ -398,6 +407,8 @@
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
+ auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
+ auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionType,1);
@@ -420,7 +431,7 @@
wrapper2.eq(MemberAuctionCollection::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper2.eq(MemberAuctionCollection::getTargetId,byId.getId());
wrapper2.eq(MemberAuctionCollection::getDelFlag,0);
- MemberAuctionCollection one = memberAuctionCollectionServiceImpl.getOne(wrapper2);
+ MemberAuctionCollection one = memberAuctionCollectionService.getOne(wrapper2);
if (one!=null){
auctionGoodsinfoVO.setIsCollection(2);
}else {
@@ -518,4 +529,42 @@
page.setRecords(auctionGoodsVOS);
return PageDTO.of(page);
}
+
+ @Override
+ public void endAuctionGoods(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.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);
+ 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", "end");
+ String msg = objectMapper.writeValueAsString(map);
+ WebSocketUsers.sendMessageToUsersByText(msg);
+ log.info("===================>发送websocket通知，消息体{}", msg);
+ }
+ }
}
--
Gitblit v1.7.1