From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 318 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 292 insertions(+), 26 deletions(-)
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 d44a70c..4df64e6 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
@@ -1,13 +1,19 @@
package com.ruoyi.goods.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.enums.ClientTypeEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
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;
@@ -16,27 +22,46 @@
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.GoodsSeckillAppointment;
+import com.ruoyi.goods.domain.MemberGoodsCollection;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
+import com.ruoyi.goods.service.IGoodsSeckillAppointmentService;
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;
+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.GoodsSeckill;
+import com.ruoyi.system.api.domain.GoodsSeries;
import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.WebsocketMessageDTO;
+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.HomeGoodsSeckillInfoVO;
+import com.ruoyi.system.api.domain.vo.HomeGoodsSeckillVO;
+import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import java.time.LocalDate;
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.Optional;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+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 util.WebSocketUsers;
/**
* <p>
@@ -53,11 +78,19 @@
private final IGoodsSkuService goodsSkuService;
private final OrderClient orderClient;
+ private final GoodsSkuClient goodsSkuClient;
private final RedisService redisService;
private final SysUserClient sysUserClient;
private final AsyncMethodService asyncMethodService;
// 创建一个静态共享的ObjectMapper实例以重用
private static final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Resource
+ private IMemberGoodsCollectionService iMemberGoodsCollectionService;
+
+ @Resource
+ private IGoodsSeckillAppointmentService iGoodsSeckillAppointmentService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public void addGoodsSeckill(GoodsSeckillDTO dto) {
@@ -70,6 +103,31 @@
goodsSeckill.setEndTime(dto.getEndTime());
goodsSeckill.setStartStatus(StartStatusEnum.NOT_STARTED);
}
+ // 查询该时间范围内，是否已经存在该秒杀商品
+ List<GoodsSeckill> list = this.lambdaQuery()
+ .ne(GoodsSeckill::getStartStatus, StartStatusEnum.ENDED)
+ .eq(GoodsSeckill::getListingStatus, ListingStatusEnum.ON_SHELVES)
+ .le(GoodsSeckill::getStartTime, dto.getStartTime())
+ .ge(GoodsSeckill::getEndTime, dto.getStartTime()).list();
+ Set<Long> existGoodsSkuIdSet = list.stream().map(GoodsSeckill::getGoodsSkuId)
+ .collect(Collectors.toSet());
+ if (!existGoodsSkuIdSet.isEmpty()) {
+ List<GoodsSku> goodsSkuList = goodsSkuService.listByIds(existGoodsSkuIdSet);
+ Map<Long, String> goodsSkuMap = goodsSkuList.stream()
+ .collect(Collectors.toMap(GoodsSku::getId, GoodsSku::getSkuName));
+ List<GoodsSeckill> collect = goodsSeckills.stream()
+ .filter(goodsSeckill -> existGoodsSkuIdSet.contains(
+ goodsSeckill.getGoodsSkuId()))
+ .collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ String goodsSkuNames = collect.stream().map(item -> {
+ return goodsSkuMap.get(item.getGoodsSkuId());
+ }).filter(Objects::nonNull)
+ .collect(Collectors.joining(","));
+ throw new ServiceException(
+ String.format("添加失败，商品%s在该时间段内有其他秒杀活动", goodsSkuNames));
+ }
+ }
this.saveBatch(goodsSeckills);
for (GoodsSeckill goodsSeckill : goodsSeckills) {
@@ -77,12 +135,18 @@
if (StringUtils.isNull(goodsSku)) {
throw new ServiceException("商品不存在");
}
+
Integer seckillStock = goodsSeckill.getSeckillStock();
- goodsSkuService.lambdaUpdate()
- .set(GoodsSku::getStock, goodsSku.getStock() - seckillStock)
- .ge(GoodsSku::getStock, seckillStock)
- .eq(GoodsSku::getId, goodsSku.getId());
- asyncMethodService.seckillScheduleTask(goodsSeckill);
+ if (goodsSku.getStock() < seckillStock) {
+ throw new ServiceException(
+ String.format("秒杀商品%s剩余库存不足，请修改秒杀库存",
+ goodsSku.getSkuName()));
+ }
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setAuctionStock(seckillStock * -1);
+ goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
+ goodsSkuService.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO));
+ asyncMethodService.seckillScheduleTask(Lists.newArrayList(goodsSeckill));
}
}
@@ -113,12 +177,22 @@
if (StringUtils.isNull(goodsSeckill)) {
throw new ServiceException("秒杀商品不存在");
}
- if (goodsSeckill.getStartStatus().equals(StartStatusEnum.STARTED)) {
+ if (goodsSeckill.getStartStatus().equals(StartStatusEnum.STARTED)
+ && goodsSeckill.getListingStatus().equals(ListingStatusEnum.ON_SHELVES)) {
throw new ServiceException("秒杀商品已开始秒杀，不能修改");
}
+ GoodsSku goodsSku = goodsSkuService.getById(goodsSeckill.getGoodsSkuId());
+ if (goodsSku.getStock() < upd.getSeckillStock()) {
+ throw new ServiceException("编辑失败，商品库存不足");
+ }
GoodsSeckill goodsSeckillUpd = BeanUtils.copyBean(upd, GoodsSeckill.class);
+ goodsSeckillUpd.setListingStatus(ListingStatusEnum.ON_SHELVES);
this.updateById(goodsSeckillUpd);
- asyncMethodService.seckillScheduleTask(goodsSeckill);
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setAuctionStock(upd.getSeckillStock() * -1);
+ goodsStockUpdDTO.setGoodsSkuId(goodsSeckill.getGoodsSkuId());
+ goodsSkuService.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO));
+ asyncMethodService.seckillScheduleTask(Lists.newArrayList(goodsSeckill));
}
/**
@@ -132,17 +206,15 @@
if (StringUtils.isNull(goodsSeckill)) {
throw new ServiceException("秒杀商品不存在");
}
- this.lambdaUpdate()
- .eq(GoodsSeckill::getId, dto.getId())
- .set(GoodsSeckill::getListingStatus, dto.getListingStatus())
- .update();
+ goodsSeckill.setListingStatus(dto.getListingStatus());
if (dto.getListingStatus().equals(ListingStatusEnum.REMOVED_FROM_THE_SHELF)) {
- //移除该秒杀商品的延时任务
- redisService.deleteObject(
- DelayTaskEnum.SECKILL_START_TASK.getCode() + "-" + goodsSeckill.getId());
- redisService.deleteObject(
- DelayTaskEnum.SECKILL_END_TASK.getCode() + "-" + goodsSeckill.getId());
+ // 退回剩余库存
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setAuctionStock(goodsSeckill.getSeckillStock());
+ goodsStockUpdDTO.setGoodsSkuId(goodsSeckill.getGoodsSkuId());
+ goodsSkuService.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO));
}
+ this.updateById(goodsSeckill);
}
/**
@@ -159,9 +231,13 @@
}
GoodsSeckillVO vo = BeanUtils.copyBean(goodsSeckill, GoodsSeckillVO.class);
GoodsSku goods = goodsSkuService.getById(goodsSeckill.getGoodsSkuId());
- Optional.of(goods).ifPresent(goodsSku -> vo.setGoodsSkuName(goodsSku.getSkuName()));
- Integer num = orderClient.getSeckillMembers(goodsSeckill.getGoodsSkuId()).getData();
- vo.setNumberOfPurchasedMembers(num);
+ Optional.of(goods).ifPresent(goodsSku -> {
+ vo.setGoodsSkuName(goodsSku.getSkuName());
+ vo.setGoodsSkuStock(goodsSku.getStock());
+ });
+ Integer num = orderClient.getSeckillMembers(goodsSeckill.getId(),
+ SecurityConstants.INNER).getData();
+ vo.setNumberOfPurchasedMembers(StringUtils.isNull(num) ? 0 : num);
return vo;
}
@@ -174,7 +250,7 @@
public void startSeckill(Long seckillId) throws JsonProcessingException {
log.info(">>>>>>>>>>>>>>>>>>>>{}秒杀开始<<<<<<<<<<<<<<<<<<<<", seckillId);
GoodsSeckill goodsSeckill = this.getById(seckillId);
- //秒杀商品不能为空且状态为未开始
+ // 秒杀商品不能为空且上架状态为上架中 状态为未开始
if (StringUtils.isNotNull(goodsSeckill)
&& goodsSeckill.getStartStatus().equals(StartStatusEnum.NOT_STARTED)) {
//开始秒杀
@@ -188,10 +264,12 @@
//推送秒杀开始消息
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.SECKILL);
- map.put("notification_time", LocalDateTime.now());
+ map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
+ map.put("target_id", seckillId);
map.put("message_type", "start");
String msg = objectMapper.writeValueAsString(map);
- WebSocketUsers.sendMessageToUsersByText(msg);
+ sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
+ .clientType(ClientTypeEnum.MEMBER).build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
@@ -214,10 +292,198 @@
}
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.SECKILL);
- map.put("notification_time", LocalDateTime.now());
+ map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
+ map.put("target_id", seckillId);
map.put("message_type", "end");
String msg = objectMapper.writeValueAsString(map);
- WebSocketUsers.sendMessageToUsersByText(msg);
+ sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
+ .clientType(ClientTypeEnum.MEMBER).build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
+
+ @Override
+ public PageDTO<HomeGoodsSeckillVO> getHomeGoodsSeckillVOList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ LambdaQueryWrapper<GoodsSku> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(GoodsSku::getDelFlag,0);
+ if (homeGoodsSkuDTO.getSkuName()!=null && homeGoodsSkuDTO.getSkuName()!=""){
+ 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);
+ }
+ if (homeGoodsSkuDTO.getSort()==3){
+ wrapper3.orderByDesc(GoodsSku::getPrice);
+ }
+ if (homeGoodsSkuDTO.getSort()==4){
+ wrapper3.orderByAsc(GoodsSku::getSoldQuantity);
+ }
+ if (homeGoodsSkuDTO.getSort()==5){
+ wrapper3.orderByDesc(GoodsSku::getSoldQuantity);
+ }
+ if(homeGoodsSkuDTO.getYear()==2){
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime newTime7 = now.minusYears(30);
+ String formattedDate7 = newTime7.format(formatter);
+ 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 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+ LocalDateTime newTime15 = now.minusYears(15);
+ String formattedDate15 = newTime15.format(formatter);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime15)
+ .gt(GoodsSku::getYears, parseTime7);
+ }
+
+ 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 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+ LocalDateTime newTime15 = now.minusYears(15);
+ String formattedDate15 = newTime15.format(formatter);
+ 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);
+ }
+
+ List<GoodsSku> page1 = goodsSkuService.list(wrapper3);
+
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = page1.stream().map(GoodsSku::getId)
+ .collect(Collectors.toSet());
+
+ Page<GoodsSeckill> page = new Page<>();
+ page.setSize(homeGoodsSkuDTO.getPageSize());
+ page.setCurrent(homeGoodsSkuDTO.getPageCurr());
+
+ LambdaQueryWrapper<GoodsSeckill> wrapper4= Wrappers.lambdaQuery();
+ wrapper4.eq(GoodsSeckill::getDelFlag,0);
+ wrapper4.eq(GoodsSeckill::getListingStatus,0);
+ List<Integer> in=new ArrayList<>();
+ in.add(0);
+ in.add(1);
+ wrapper4.in(GoodsSeckill::getStartStatus,in);
+ if(goodsSkuIdList.size()>0){
+ wrapper4.in(GoodsSeckill::getGoodsSkuId,goodsSkuIdList);
+ }
+
+ wrapper4.orderByDesc(GoodsSeckill::getSortNum);
+ Page<GoodsSeckill> page2 = this.page(page, wrapper4);
+
+ PageDTO<HomeGoodsSeckillVO> HomeGoodsSeckillVOPageDTO = PageDTO.of(page2, HomeGoodsSeckillVO.class);
+ List<HomeGoodsSeckillVO> list2 = HomeGoodsSeckillVOPageDTO.getList();
+ for (HomeGoodsSeckillVO homeGoodsSeckillVO:list2){
+ GoodsSku data = goodsSkuClient.getGoodsSkuOne(homeGoodsSeckillVO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ homeGoodsSeckillVO.setPrice(data.getPrice());
+ homeGoodsSeckillVO.setYears(String.valueOf(data.getYears().getYear()));
+ homeGoodsSeckillVO.setCoverPic(data.getCoverPic());
+ homeGoodsSeckillVO.setSkuName(data.getSkuName());
+ }
+ return HomeGoodsSeckillVOPageDTO;
+ }
+
+ @Override
+ public HomeGoodsSeckillInfoVO getHomeGoodsSeckillInfo(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ GoodsSeckill byId = this.getById(homeGoodsSkuDTO.getGoodsSkuId());
+ GoodsSku data6 = goodsSkuClient.getGoodsSkuOne(byId.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ HomeGoodsSeckillInfoVO homeGoodsSeckillInfoVO=new HomeGoodsSeckillInfoVO();
+ homeGoodsSeckillInfoVO.setGoodsSkuId(byId.getId());
+ homeGoodsSeckillInfoVO.setSkuName(data6.getSkuName());
+ homeGoodsSeckillInfoVO.setYears(String.valueOf(data6.getYears().getYear()));
+ GoodsBrand data = goodsSkuClient.getBrandOne(data6.getBrandId(), SecurityConstants.INNER).getData();
+ GoodsCategory data1 = goodsSkuClient.getCategoryOne(data6.getCategoryId(), SecurityConstants.INNER).getData();
+ GoodsSeries data2 = goodsSkuClient.getSeriesOne(data6.getSeriesId(), SecurityConstants.INNER).getData();
+ GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(data6.getFlavorTypeId(), SecurityConstants.INNER).getData();
+ if(data!=null){
+ homeGoodsSeckillInfoVO.setBrand(data.getBrandName());
+ }
+ if(data1!=null){
+ homeGoodsSeckillInfoVO.setCategory(data1.getCategoryName());
+ }
+ if(data2!=null){
+ homeGoodsSeckillInfoVO.setSeries(data2.getSeriesName());
+ }
+ if(data3!=null){
+ homeGoodsSeckillInfoVO.setFlavorType(data3.getFlavorTypeName());
+ }
+
+ homeGoodsSeckillInfoVO.setPrice(data6.getPrice());
+ homeGoodsSeckillInfoVO.setSoldQuantity(byId.getSoldQuantity());
+ homeGoodsSeckillInfoVO.setUnit(data6.getUnit());
+ homeGoodsSeckillInfoVO.setSpecUnit(data6.getSpecUnit());
+ homeGoodsSeckillInfoVO.setCoverPic(data6.getCoverPic());
+ homeGoodsSeckillInfoVO.setAlbum(data6.getAlbum());
+ homeGoodsSeckillInfoVO.setShareTitle(byId.getShareTitle());
+ homeGoodsSeckillInfoVO.setSeckillPrice(byId.getSeckillPrice());
+ homeGoodsSeckillInfoVO.setDescription(data6.getDescription());
+ homeGoodsSeckillInfoVO.setDetail(data6.getDetail());
+ homeGoodsSeckillInfoVO.setLimitNumber(byId.getLimitNumber());
+ homeGoodsSeckillInfoVO.setSeckillPrice(byId.getSeckillPrice());
+ homeGoodsSeckillInfoVO.setStartTime(byId.getStartTime());
+ homeGoodsSeckillInfoVO.setEndTime(byId.getEndTime());
+ homeGoodsSeckillInfoVO.setStartStatus(byId.getStartStatus());
+ homeGoodsSeckillInfoVO.setSeckillStock(byId.getSeckillStock());
+
+
+ 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);
+ }
+
+ LambdaQueryWrapper<GoodsSeckillAppointment> wrapper4= Wrappers.lambdaQuery();
+ wrapper4.eq(GoodsSeckillAppointment::getDelFlag,0);
+ wrapper4.eq(GoodsSeckillAppointment::getMemberId,homeGoodsSkuDTO.getMemberId());
+ wrapper4.eq(GoodsSeckillAppointment::getGoodsSeckillId,homeGoodsSkuDTO.getGoodsSkuId());
+ List<GoodsSeckillAppointment> list2 = iGoodsSeckillAppointmentService.list(wrapper4);
+ if (list2.size()>0){
+ homeGoodsSeckillInfoVO.setIsAppointment(2);
+ }else{
+ homeGoodsSeckillInfoVO.setIsAppointment(1);
+ }
+
+ return homeGoodsSeckillInfoVO;
+ }
}
--
Gitblit v1.7.1