From c5f7cdfaf69deb6fb3bb4a8379beb0e9bbe0f3c0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 16:28:12 +0800
Subject: [PATCH] 修改循环注入
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 88 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 27 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 2352ce6..69c7b40 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,19 +4,19 @@
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.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.google.common.collect.Lists;
-import com.ruoyi.auction.controller.management.dto.AuctionGoodsDTO;
-import com.ruoyi.auction.controller.management.dto.AuctionGoodsQuery;
-import com.ruoyi.auction.controller.management.vo.AuctionBidRecordVO;
-import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsDTO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsQuery;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
+import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.MemberAuctionCollection;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.*;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
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.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
@@ -28,14 +28,18 @@
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AuctionGoods;
-import com.ruoyi.system.api.domain.dto.*;
-import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
-import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
+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.OrderAuctionBond;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
@@ -45,18 +49,18 @@
import com.ruoyi.system.api.feignClient.OrderClient;
import io.seata.spring.annotation.GlobalTransactional;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
/**
* <p>
@@ -77,13 +81,13 @@
private final IAuctionBidRecordService auctionBidRecordService;
@Resource
- private MemberAuctionCollectionServiceImpl memberAuctionCollectionServiceImpl;
-
- @Resource
- private IAuctionGoodsService auctionGoodsService;
+ private IMemberAuctionCollectionService memberAuctionCollectionService;
@Resource
private AuctionGoodsMapper auctionGoodsMapper;
+
+ @Resource
+ private IAuctionBrowseRecordService iAuctionBrowseRecordService;
/**
* 获取拍卖商品列表的分页数据
@@ -92,7 +96,7 @@
* @return PageDTO<AuctionGoodsVO>
*/
@Override
- public PageDTO<AuctionGoodsVO> getAuctionGoodsPage(AuctionGoodsQuery query) {
+ public PageDTO<MgtAuctionGoodsVO> getAuctionGoodsPage(MgtAuctionGoodsQuery query) {
Set<Long> goodsSkuIdList = null;
if (StringUtils.isNotEmpty(query.getGoodsSkuName())) {
List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(query.getGoodsSkuName(),
@@ -114,13 +118,13 @@
.eq(StringUtils.isNotNull(query.getStartStatus()), AuctionGoods::getStartStatus,
query.getStartStatus())
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
- return PageDTO.of(page, AuctionGoodsVO.class);
+ return PageDTO.of(page, MgtAuctionGoodsVO.class);
}
@Override
@Transactional
@GlobalTransactional(rollbackFor = Exception.class)
- public void saveAuctionGoods(AuctionGoodsDTO dto) {
+ public void saveAuctionGoods(MgtAuctionGoodsDTO dto) {
Long id = dto.getId();
Long goodsSkuId = dto.getGoodsSkuId();
AuctionGoods auctionGoods = BeanUtils.copyBean(dto, AuctionGoods.class);
@@ -192,12 +196,13 @@
* @return AuctionGoodsVO
*/
@Override
- public AuctionGoodsVO getAuctionGoodsById(Long id) {
+ public MgtAuctionGoodsVO getAuctionGoodsById(Long id) {
AuctionGoods auctionGoods = this.getById(id);
if (StringUtils.isNull(auctionGoods)) {
throw new ServiceException("拍卖商品不存在");
}
- AuctionGoodsVO auctionGoodsVO = BeanUtils.copyBean(auctionGoods, AuctionGoodsVO.class);
+ MgtAuctionGoodsVO auctionGoodsVO = BeanUtils.copyBean(auctionGoods,
+ MgtAuctionGoodsVO.class);
if (!auctionGoods.getStartStatus().equals(AuctionStartStatusEnum.IN_PREVIEW)) {
List<AuctionBidRecord> list = auctionBidRecordService.lambdaQuery()
.eq(AuctionBidRecord::getTargetId, auctionGoodsVO.getId())
@@ -210,13 +215,13 @@
getMemberListByIds(collect, SecurityConstants.INNER).getData();
Map<Long, String> memberMap = memberList.stream()
.collect(Collectors.toMap(Member::getId, Member::getNickname));
- List<AuctionBidRecordVO> auctionBidRecordVOS = BeanUtils.copyList(list,
- AuctionBidRecordVO.class);
- for (AuctionBidRecordVO vo : auctionBidRecordVOS) {
+ List<MgtAuctionBidRecordVO> mgtAuctionBidRecordVOS = BeanUtils.copyList(list,
+ MgtAuctionBidRecordVO.class);
+ for (MgtAuctionBidRecordVO vo : mgtAuctionBidRecordVOS) {
String memberName = memberMap.get(vo.getMemberId());
vo.setMemberName(StringUtils.isNotEmpty(memberName) ? memberName : "");
}
- auctionGoodsVO.setRecordList(auctionBidRecordVOS);
+ auctionGoodsVO.setRecordList(mgtAuctionBidRecordVOS);
}
}
return auctionGoodsVO;
@@ -362,7 +367,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());
@@ -413,7 +418,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 {
@@ -425,6 +430,32 @@
}else{
auctionGoodsinfoVO.setIsApply(1);
}
+
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ String formattedDate = now.format(formatter);
+ LocalDateTime parseTime = LocalDateTime.parse(formattedDate, formatter);
+ LocalDateTime newTime7 = now.minusDays(7);
+ String formattedDate7 = newTime7.format(formatter);
+ LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
+
+ LambdaQueryWrapper<AuctionBrowseRecord> wrapper3=Wrappers.lambdaQuery();
+ wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
+ wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId());
+ wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId());
+ wrapper3.ge(AuctionBrowseRecord::getCreateTime, parseTime7)
+ .le(AuctionBrowseRecord::getCreateTime, parseTime);
+ List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
+ if (list.size()==0){
+ AuctionBrowseRecord auctionBrowseRecord=new AuctionBrowseRecord();
+ auctionBrowseRecord.setBrowseType(AuctionOrderTypeEnum.REGULAR_ITEMS);
+ auctionBrowseRecord.setMemberId(auctionGoodsListDTO.getMemberId());
+ auctionBrowseRecord.setTargetId(auctionGoodsListDTO.getGoodsSkuId());
+ iAuctionBrowseRecordService.save(auctionBrowseRecord);
+ }
+
+
+
return auctionGoodsinfoVO;
}
@@ -439,6 +470,9 @@
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+ if (auctionGoodsListDTO.getStartStatus()!=4){
+ auctionGoodsListPageDTO.setStartStatus(auctionGoodsListDTO.getStartStatus());
+ }
Page<AuctionGoodsListVO> page = new Page<>();
page.setSize(auctionGoodsListDTO.getPageSize());
--
Gitblit v1.7.1