From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 198 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 165 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index ed51dbd..52e94a6 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -27,27 +27,24 @@
import com.ruoyi.goods.service.IGoodsInfoTitleValueService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.goods.service.IMemberGoodsCollectionService;
-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.GoodsGroupPurchase;
-import com.ruoyi.system.api.domain.GoodsSeckill;
-import com.ruoyi.system.api.domain.GoodsSeries;
-import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuInfoVO;
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
+import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+
+import com.ruoyi.system.api.feignClient.OrderClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
@@ -73,6 +70,9 @@
private final GoodsSeckillMapper goodsSeckillMapper;
private final GoodsGroupPurchaseMapper goodsGroupPurchaseMapper;
private final RedissonClient redissonClient;
+
+ @Resource
+ private OrderClient orderClient;
@Resource
private GoodsSkuClient goodsSkuClient;
@@ -301,12 +301,22 @@
LambdaQueryWrapper<GoodsSku> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(GoodsSku::getDelFlag,0);
wrapper3.eq(GoodsSku::getListingStatus,0);
- wrapper3.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
- wrapper3.eq(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
- wrapper3.eq(GoodsSku::getBrandId,homeGoodsSkuDTO.getBrandId());
- wrapper3.eq(GoodsSku::getCategoryId,homeGoodsSkuDTO.getCategoryId());
- wrapper3.eq(GoodsSku::getSeriesId,homeGoodsSkuDTO.getSeriesId());
- wrapper3.eq(GoodsSku::getFlavorTypeId,homeGoodsSkuDTO.getFlavorTypeId());
+ if (homeGoodsSkuDTO.getSkuName()!=null){
+ wrapper3.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
+ }
+ if (homeGoodsSkuDTO.getBrandId()!=null){
+ wrapper3.eq(GoodsSku::getBrandId,homeGoodsSkuDTO.getBrandId());
+ }
+ if (homeGoodsSkuDTO.getCategoryId()!=null){
+ wrapper3.eq(GoodsSku::getCategoryId,homeGoodsSkuDTO.getCategoryId());
+ }
+
+ if (homeGoodsSkuDTO.getSeriesId()!=null){
+ wrapper3.eq(GoodsSku::getSeriesId,homeGoodsSkuDTO.getSeriesId());
+ }
+ if (homeGoodsSkuDTO.getFlavorTypeId()!=null){
+ wrapper3.eq(GoodsSku::getFlavorTypeId,homeGoodsSkuDTO.getFlavorTypeId());
+ }
if (homeGoodsSkuDTO.getSort()==2){
wrapper3.orderByAsc(GoodsSku::getPrice);
}
@@ -324,35 +334,49 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDateTime newTime7 = now.minusYears(30);
String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
- wrapper3.gt(GoodsSku::getYears,parseTime7);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears,parseTime7);
}
if(homeGoodsSkuDTO.getYear()==3){
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDateTime newTime7 = now.minusYears(30);
String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
LocalDateTime newTime15 = now.minusYears(15);
String formattedDate15 = newTime15.format(formatter);
- LocalDateTime parseTime15= LocalDateTime.parse(formattedDate15, formatter);
- wrapper3.gt(GoodsSku::getYears, parseTime15)
- .le(GoodsSku::getYears, parseTime7);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime15)
+ .gt(GoodsSku::getYears, parseTime7);
}
- if(homeGoodsSkuDTO.getYear()==3){
+ if(homeGoodsSkuDTO.getYear()==4){
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDateTime newTime7 = now.minusYears(5);
String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
LocalDateTime newTime15 = now.minusYears(15);
String formattedDate15 = newTime15.format(formatter);
- LocalDateTime parseTime15= LocalDateTime.parse(formattedDate15, formatter);
- wrapper3.ge(GoodsSku::getYears, parseTime7)
- .le(GoodsSku::getYears, parseTime15);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime7)
+ .gt(GoodsSku::getYears, parseTime15);
+ }
+
+ if(homeGoodsSkuDTO.getYear()==5){
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime newTime7 = now.minusYears(1);
+ String formattedDate7 = newTime7.format(formatter);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+ LocalDateTime newTime15 = now.minusYears(5);
+ String formattedDate15 = newTime15.format(formatter);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime7)
+ .ge(GoodsSku::getYears, parseTime15);
}
wrapper3.orderByAsc(GoodsSku::getSortNum);
Page<GoodsSku> page1 = this.page(page, wrapper3);
@@ -388,29 +412,137 @@
homeGoodsSkuInfoVO.setShareTitle(byId.getShareTitle());
homeGoodsSkuInfoVO.setSharePic(byId.getSharePic());
+ LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper1 =new LambdaQueryWrapper<>();
+ queryWrapper1.eq(GoodsGroupPurchase::getListingStatus,
+ ListingStatusEnum.ON_SHELVES)
+ .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId());
+ GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectOne(queryWrapper1);
+ if(goodsGroupPurchase!=null){
+ HomeGoodsSkuDTO homeGoodsSkuDTO1 =new HomeGoodsSkuDTO();
+ homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId());
+ homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
+ Order data5 = orderClient.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
+ if (data5!=null){
+ homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(2);
+ }else{
+ homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
+ }
+
+ }
+
+
LambdaQueryWrapper<MemberGoodsCollection> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(MemberGoodsCollection::getDelFlag,0);
wrapper3.eq(MemberGoodsCollection::getMemberId,homeGoodsSkuDTO.getMemberId());
wrapper3.eq(MemberGoodsCollection::getTargetId,homeGoodsSkuDTO.getGoodsSkuId());
+ wrapper3.eq(MemberGoodsCollection::getType,1);
List<MemberGoodsCollection> list = iMemberGoodsCollectionService.list(wrapper3);
if (list.size()>0){
homeGoodsSkuInfoVO.setIsCollection(2);
}else{
homeGoodsSkuInfoVO.setIsCollection(1);
}
- LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper1 =new LambdaQueryWrapper<>();
- queryWrapper1.eq(GoodsGroupPurchase::getListingStatus,
+ LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>();
+ queryWrapper2.eq(GoodsGroupPurchase::getListingStatus,
ListingStatusEnum.ON_SHELVES)
.eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId());
- GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectOne(queryWrapper1);
- if (goodsGroupPurchase!=null){
- homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(2);
+ GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2);
+ if (goodsGroupPurchase2!=null){
+ homeGoodsSkuInfoVO.setGroupPurchaseGoods(2);
}else{
- homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
+ homeGoodsSkuInfoVO.setGroupPurchaseGoods(1);
}
return homeGoodsSkuInfoVO;
}
+ @Override
+ public List<getHomeGoodsSkuXxiVO> getHomeGoodsSkuXxi(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>();
+ GoodsSku byId = this.getById(homeGoodsSkuDTO.getGoodsSkuId());
+ GoodsBrand data = goodsSkuClient.getBrandOne(byId.getBrandId(), SecurityConstants.INNER).getData();
+ GoodsCategory data1 = goodsSkuClient.getCategoryOne(byId.getCategoryId(), SecurityConstants.INNER).getData();
+ GoodsSeries data2 = goodsSkuClient.getSeriesOne(byId.getSeriesId(), SecurityConstants.INNER).getData();
+ GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(byId.getFlavorTypeId(), SecurityConstants.INNER).getData();
+
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO1=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO1.setContent(data1.getCategoryName());
+ getHomeGoodsSkuXxiVO1.setTitleName("分类");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO1);
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO2=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO2.setContent(data2.getSeriesName());
+ getHomeGoodsSkuXxiVO2.setTitleName("系列");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO2);
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO.setContent(data.getBrandName());
+ getHomeGoodsSkuXxiVO.setTitleName("品牌");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO);
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO3=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO3.setContent(data3.getFlavorTypeName());
+ getHomeGoodsSkuXxiVO3.setTitleName("香型");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO3);
+
+
+ List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(homeGoodsSkuDTO.getGoodsSkuId());
+ Collections.sort(goodsInfoTitleValueVOList, Comparator.comparingInt(GoodsInfoTitleValueVO::getSortNum));
+ for (GoodsInfoTitleValueVO goodsInfoTitleValueVO:goodsInfoTitleValueVOList){
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVO.getContent());
+ getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVO.getTitleName());
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVOs);
+ }
+
+
+ return homeGoodsSkuXxiVOS;
+ }
+
+ public List<getHomeGoodsSkuXxiVO> getMsHomeGoodsSkuXxi(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>();
+ GoodsSeckill goodsSeckill = goodsSeckillMapper.selectById(homeGoodsSkuDTO.getGoodsSkuId());
+ GoodsSku byId = this.getById(goodsSeckill.getGoodsSkuId());
+ GoodsBrand data = goodsSkuClient.getBrandOne(byId.getBrandId(), SecurityConstants.INNER).getData();
+ GoodsCategory data1 = goodsSkuClient.getCategoryOne(byId.getCategoryId(), SecurityConstants.INNER).getData();
+ GoodsSeries data2 = goodsSkuClient.getSeriesOne(byId.getSeriesId(), SecurityConstants.INNER).getData();
+ GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(byId.getFlavorTypeId(), SecurityConstants.INNER).getData();
+
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO1=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO1.setContent(data1.getCategoryName());
+ getHomeGoodsSkuXxiVO1.setTitleName("分类");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO1);
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO2=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO2.setContent(data2.getSeriesName());
+ getHomeGoodsSkuXxiVO2.setTitleName("系列");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO2);
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO.setContent(data.getBrandName());
+ getHomeGoodsSkuXxiVO.setTitleName("品牌");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO);
+
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO3=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVO3.setContent(data3.getFlavorTypeName());
+ getHomeGoodsSkuXxiVO3.setTitleName("香型");
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO3);
+
+
+ List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(homeGoodsSkuDTO.getGoodsSkuId());
+ Collections.sort(goodsInfoTitleValueVOList, Comparator.comparingInt(GoodsInfoTitleValueVO::getSortNum));
+ for (GoodsInfoTitleValueVO goodsInfoTitleValueVO:goodsInfoTitleValueVOList){
+ getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO();
+ getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVO.getContent());
+ getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVO.getTitleName());
+ homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVOs);
+ }
+
+
+ return homeGoodsSkuXxiVOS;
+ }
+
private boolean updateGoodsStock(GoodsSku skus, Integer auctionStock) {
return this.lambdaUpdate()
.set(skus.getStock() + auctionStock > 0, GoodsSku::getStock,
--
Gitblit v1.7.1