From 7360a891e115dbd9c8e35f32a7f55697b65ed008 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 14 六月 2024 19:08:23 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java | 4 +
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 14 ++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java | 6 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 90 +++++++++++++++++++++++------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 19 ++++++
5 files changed, 111 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
index af349c5..a99b86d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
@@ -13,6 +13,8 @@
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuInfoVO;
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
import java.util.List;
+
+import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import org.springframework.web.bind.annotation.RequestBody;
/**
@@ -69,6 +71,6 @@
HomeGoodsSkuInfoVO getHomeGoodsSkuInfo(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO);
List<getHomeGoodsSkuXxiVO> getHomeGoodsSkuXxi(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO);
-
+ List<getHomeGoodsSkuXxiVO> getMsHomeGoodsSkuXxi(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO);
GoodsSkuVO getGoodsDetail(Long id);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
index f05f949..415c5eb 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -21,9 +21,11 @@
import com.ruoyi.goods.controller.management.dto.GoodsSeckillQuery;
import com.ruoyi.goods.controller.management.dto.GoodsSeckillUpd;
import com.ruoyi.goods.controller.management.vo.GoodsSeckillVO;
+import com.ruoyi.goods.domain.MemberGoodsCollection;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.IGoodsSkuService;
+import com.ruoyi.goods.service.IMemberGoodsCollectionService;
import com.ruoyi.goods.service.async.AsyncMethodService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
@@ -57,6 +59,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+
/**
* <p>
* 商品秒杀表 服务实现类
@@ -78,6 +82,9 @@
private final AsyncMethodService asyncMethodService;
// 创建一个静态共享的ObjectMapper实例以重用
private static final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Resource
+ private IMemberGoodsCollectionService iMemberGoodsCollectionService;
@Override
@Transactional(rollbackFor = Exception.class)
public void addGoodsSeckill(GoodsSeckillDTO dto) {
@@ -392,6 +399,18 @@
homeGoodsSeckillInfoVO.setStartTime(byId.getStartTime());
homeGoodsSeckillInfoVO.setEndTime(byId.getEndTime());
homeGoodsSeckillInfoVO.setStartStatus(byId.getStartStatus());
+
+ 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,3);
+ List<MemberGoodsCollection> list = iMemberGoodsCollectionService.list(wrapper3);
+ if (list.size()>0){
+ homeGoodsSeckillInfoVO.setIsCollection(2);
+ }else{
+ homeGoodsSeckillInfoVO.setIsCollection(1);
+ }
return homeGoodsSeckillInfoVO;
}
}
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 6f13d2d..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,29 +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;
@@ -75,6 +70,9 @@
private final GoodsSeckillMapper goodsSeckillMapper;
private final GoodsGroupPurchaseMapper goodsGroupPurchaseMapper;
private final RedissonClient redissonClient;
+
+ @Resource
+ private OrderClient orderClient;
@Resource
private GoodsSkuClient goodsSkuClient;
@@ -413,36 +411,46 @@
homeGoodsSkuInfoVO.setDetail(byId.getDetail());
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){
- homeGoodsSkuInfoVO.setGroupPurchaseGoods(2);
- }else {
- homeGoodsSkuInfoVO.setGroupPurchaseGoods(1);
+ 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;
}
@@ -491,6 +499,50 @@
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,
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
index b2a3003..2ce38af 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
@@ -63,12 +63,14 @@
LambdaQueryWrapper< MemberGoodsCollection> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberGoodsCollection::getMemberId,auctionCollectionDTO.getMemberId());
wrapper.eq(MemberGoodsCollection::getTargetId,auctionCollectionDTO.getGoodsSkuId());
+ wrapper.eq(MemberGoodsCollection::getType,auctionCollectionDTO.getType());
if (auctionCollectionDTO.getState()==1){
List<MemberGoodsCollection> list = this.list(wrapper);
if (list.size()==0){
MemberGoodsCollection m =new MemberGoodsCollection();
m.setMemberId(auctionCollectionDTO.getMemberId());
m.setTargetId(auctionCollectionDTO.getGoodsSkuId());
+ m.setType(auctionCollectionDTO.getType());
this.save(m);
}
}else{
@@ -121,7 +123,7 @@
auctionGoodsVO.setIsCollection(2);
auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
- } if(auctionCollection.getType()==2){
+ } if(auctionCollection.getType()==3){
HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
GoodsSeckill goodsSeckill = goodsSeckillMapper.selectById(auctionCollection.getTargetId());
GoodsSku goodsSku = goodsSkuMapper.selectById(goodsSeckill.getGoodsSkuId());
@@ -137,7 +139,7 @@
auctionGoodsVO.setXiaosPrice(goodsSku.getPrice());
auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
- } if(auctionCollection.getType()==3){
+ } if(auctionCollection.getType()==2){
GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectById(auctionCollection.getTargetId());
HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
GoodsSku goodsSku = goodsSkuMapper.selectById(goodsGroupPurchase.getGoodsSkuId());
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 0da292e..b52a110 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -84,4 +84,18 @@
</where>
</select>
+
+ <select id="getOrderByGroupPurchaseMemberId" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
+ SELECT
+ o.*
+ FROM
+ t_order o
+ <where>
+ o.goods_sku_id = #{goodsSkuId}
+ AND o.order_status = 2 or o.order_status =1
+ AND o.order_from = 3
+ AND o.member_id=#{memberId}
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.7.1