From 01d6fa48a0de7a21988e89f71721b6b85e53b517 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 06 三月 2025 16:33:53 +0800
Subject: [PATCH] 去掉资讯图片必填限制
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 495 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 339 insertions(+), 156 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
index aa0f0fa..84eed16 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -31,7 +31,6 @@
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.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
@@ -47,11 +46,15 @@
import com.ruoyi.system.api.domain.vo.GoodsGroupPurchaseInfoVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.WdGoodsGroupPurchaseVO;
+import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
@@ -78,6 +81,7 @@
private final IMemberGoodsCollectionService iMemberGoodsCollectionService;
private final SysUserClient sysUserClient;
private final IGoodsGroupPurchaseInfoService goodsGroupPurchaseInfoService;
+ private final GoodsSkuClient goodsSkuClient;
// 创建一个静态共享的ObjectMapper实例以重用
private static final ObjectMapper objectMapper = new ObjectMapper();
/**
@@ -108,15 +112,11 @@
}
LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(GoodsGroupPurchase::getGoodsSkuId, dto.getGoodsSkuId());
- queryWrapper.eq(GoodsGroupPurchase::getListingStatus,
- ListingStatusEnum.ON_SHELVES.getCode());
- queryWrapper.le(GoodsGroupPurchase::getStartTime, dto.getStartTime());
- queryWrapper.ge(GoodsGroupPurchase::getEndTime, dto.getStartTime());
+ queryWrapper.ne(GoodsGroupPurchase::getStartStatus, StartStatusEnum.ENDED);
long count = this.count(queryWrapper);
if (count > 0) {
throw new ServiceException("添加失败，当前商品在该时间段内有其他团购活动");
}
- this.save(goodsGroupPurchase);
GoodsSku goodsSku = goodsSkuService.getById(dto.getGoodsSkuId());
if (StringUtils.isNull(goodsSku)) {
throw new ServiceException("商品不存在");
@@ -126,6 +126,7 @@
throw new ServiceException(String.format("团购商品【%s】剩余库存不足，请修改团购库存",
goodsSku.getSkuName()));
}
+ this.save(goodsGroupPurchase);
} else {
GoodsGroupPurchase groupPurchase = this.getById(dto.getId());
if (StringUtils.isNull(groupPurchase)) {
@@ -149,7 +150,11 @@
goodsSku.getSkuName()));
}
}
- if (goodsGroupPurchase.getListingStatus().equals(ListingStatusEnum.ON_SHELVES)) {
+ if (goodsGroupPurchase.getEndTime().isBefore(LocalDateTime.now())) {
+ goodsGroupPurchase.setStartStatus(StartStatusEnum.ENDED);
+ goodsGroupPurchase.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ this.updateById(goodsGroupPurchase);
+ } else {
asyncMethodService.groupPurchaseScheduleTask(Lists.newArrayList(goodsGroupPurchase));
}
}
@@ -197,28 +202,19 @@
if (groupPurchase.getStartStatus().equals(StartStatusEnum.STARTED)) {
throw new ServiceException("该商品已开始团购，不能下架");
}
- //移除该团购商品延时任务
- redisService.deleteObject(DelayTaskEnum.GROUP_PURCHASES_START_TASK.getCode() + "-"
- + groupPurchase.getId());
- redisService.deleteObject(
- DelayTaskEnum.GROUP_PURCHASES_END_TASK.getCode() + "-" + groupPurchase.getId());
- // 退回剩余库存
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setAuctionStock(
- groupPurchase.getLimitNumber() * groupPurchase.getGroupSize());
- goodsStockUpdDTO.setGoodsSkuId(groupPurchase.getGoodsSkuId());
- goodsSkuService.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO));
}
//修改状态
groupPurchase.setListingStatus(dto.getListingStatus());
- groupPurchase.setStartStatus(StartStatusEnum.ENDED);
- if (!groupPurchase.getGroupStatus().equals(GroupStatusEnum.FORMED_INTO_A_GROUP)) {
+ List<GoodsGroupPurchaseInfo> groupPurchaseInfoList = goodsGroupPurchaseInfoService.lambdaQuery()
+ .eq(GoodsGroupPurchaseInfo::getGroupPurchaseId, dto.getId()).list();
+ long count = groupPurchaseInfoList.stream().filter(info -> info.getGroupStatus() == 1)
+ .count();
+ if (count > 0) {
+ groupPurchase.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ } else {
groupPurchase.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
this.updateById(groupPurchase);
- if (dto.getListingStatus().equals(ListingStatusEnum.ON_SHELVES)) {
- asyncMethodService.groupPurchaseScheduleTask(Lists.newArrayList(groupPurchase));
- }
}
/**
@@ -257,7 +253,7 @@
public void endGroupPurchase(Long groupPurchaseId) throws JsonProcessingException {
log.info(">>>>>>>>>>>>>>>>>>>>{}团购商品结束团购<<<<<<<<<<<<<<<<<<<<", groupPurchaseId);
GoodsGroupPurchase groupPurchase = this.getById(groupPurchaseId);
- boolean res = handleGroupPurchase(groupPurchaseId);
+ boolean res = handleGroupPurchase(groupPurchase);
if (StringUtils.isNotNull(groupPurchase)) {
groupPurchase.setStartStatus(StartStatusEnum.ENDED);
groupPurchase.setGroupStatus(
@@ -287,7 +283,7 @@
throw new ServiceException("团购商品不存在");
}
// 处理未成团订单退款和成团订单修改展示状态
- boolean res = handleGroupPurchase(id);
+ boolean res = handleGroupPurchase(groupPurchase);
groupPurchase.setGroupStatus(
res ? GroupStatusEnum.FORMED_INTO_A_GROUP : GroupStatusEnum.GROUP_FAILURE);
groupPurchase.setStartStatus(StartStatusEnum.ENDED);
@@ -295,58 +291,79 @@
this.updateById(groupPurchase);
}
- private boolean handleGroupPurchase(Long id) {
+ private boolean handleGroupPurchase(GoodsGroupPurchase groupPurchase) {
+ Long id = groupPurchase.getId();
+ // 查询参团记录
List<GoodsGroupPurchaseInfo> groupPurchaseInfoList = goodsGroupPurchaseInfoService.lambdaQuery()
.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId, id).list();
if (CollUtils.isNotEmpty(groupPurchaseInfoList)) {
- List<String> mubres = groupPurchaseInfoList.stream()
+ // 筛选未成团的记录
+ List<GoodsGroupPurchaseInfo> notGroupedInfoList = groupPurchaseInfoList.stream()
.filter(g -> g.getCurrentNumber()
< g.getGroupSize())
- .map(GoodsGroupPurchaseInfo::getMubre).collect(
+ .collect(
Collectors.toList());
- List<Order> orderList = orderClient.getOrderListByMubres(mubres,
- SecurityConstants.INNER).getData();
- if (CollUtils.isNotEmpty(orderList)) {
- List<RefundDTO> refundDTOList = orderList.stream().map(order -> {
- RefundDTO refundDTO = new RefundDTO();
- refundDTO.setOrderNo(order.getOrderNo());
- refundDTO.setAmount(order.getTotalAmount());
- return refundDTO;
- }).collect(Collectors.toList());
- Map<String, Object> data = orderClient.refund(refundDTOList,
+ // 回退未成团记录的商品库存
+ if (CollUtils.isNotEmpty(notGroupedInfoList)) {
+ Integer stock = groupPurchase.getLimitNumber() * groupPurchase.getGroupSize()
+ * notGroupedInfoList.size();
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(groupPurchase.getGoodsSkuId());
+ goodsStockUpdDTO.setAuctionStock(stock);
+ goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ SecurityConstants.INNER);
+ // 根据唯一标识查询订单
+ List<String> mubres = notGroupedInfoList.stream()
+ .map(GoodsGroupPurchaseInfo::getMubre)
+ .collect(
+ Collectors.toList());
+ List<Order> orderList = orderClient.getOrderListByMubres(mubres,
SecurityConstants.INNER).getData();
- if (StringUtils.isNotEmpty(data)) {
- // 处理退款返回结果
- List<String> successfulOrders = new ArrayList<>();
- List<String> failedOrders = new ArrayList<>();
+ if (CollUtils.isNotEmpty(orderList)) {
+ List<RefundDTO> refundDTOList = orderList.stream().map(order -> {
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderNo(order.getOrderNo());
+ refundDTO.setAmount(order.getTotalAmount());
+ return refundDTO;
+ }).collect(Collectors.toList());
+ Map<String, Object> data = orderClient.refund(refundDTOList,
+ SecurityConstants.INNER).getData();
+ if (StringUtils.isNotEmpty(data)) {
+ // 处理退款返回结果
+ List<String> successfulOrders = new ArrayList<>();
+ List<String> failedOrders = new ArrayList<>();
- data.forEach((key, value) -> {
- if ((boolean) value) {
- successfulOrders.add(key);
- } else {
- failedOrders.add(key);
+ data.forEach((key, value) -> {
+ if ((boolean) value) {
+ successfulOrders.add(key);
+ } else {
+ failedOrders.add(key);
+ }
+ });
+ try {
+ log.info(
+ "=============================退款结束=============================");
+ log.info("退款成功订单：{}",
+ objectMapper.writeValueAsString(successfulOrders));
+ log.info("退款失败订单：{}",
+ objectMapper.writeValueAsString(failedOrders));
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
}
- });
- try {
- log.info(
- "=============================退款结束=============================");
- log.info("退款成功订单：{}",
- objectMapper.writeValueAsString(successfulOrders));
- log.info("退款失败订单：{}", objectMapper.writeValueAsString(failedOrders));
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
+ // 处理退款结果
+ List<Order> updateOrderList = orderList.stream()
+ .filter(order -> successfulOrders.contains(order.getOrderNo()))
+ .peek(order -> {
+ order.setOrderStatus(OrderStatusEnum.CANCELED);
+ }).collect(Collectors.toList());
+ List<OrderUpdDTO> orderUpdDTOS = BeanUtils.copyList(updateOrderList,
+ OrderUpdDTO.class);
+ orderClient.updateOrderList(orderUpdDTOS, SecurityConstants.INNER);
}
- // 处理退款结果
- List<Order> updateOrderList = orderList.stream()
- .filter(order -> successfulOrders.contains(order.getOrderNo()))
- .peek(order -> {
- order.setOrderStatus(OrderStatusEnum.CANCELED);
- }).collect(Collectors.toList());
- List<OrderUpdDTO> orderUpdDTOS = BeanUtils.copyList(updateOrderList,
- OrderUpdDTO.class);
- orderClient.updateOrderList(orderUpdDTOS, SecurityConstants.INNER);
}
}
+
+ // 已成团的记录更新订单状态
List<String> formedGroupMubres = groupPurchaseInfoList.stream()
.filter(g -> g.getCurrentNumber()
>= g.getGroupSize())
@@ -357,8 +374,7 @@
return true;
}
List<GoodsGroupPurchaseInfo> notGroupedList = groupPurchaseInfoList.stream()
- .filter(g -> !g.getCurrentNumber()
- .equals(g.getGroupSize())).peek(p -> {
+ .filter(g -> g.getCurrentNumber() < g.getGroupSize()).peek(p -> {
p.setGroupStatus(GroupStatusEnum.GROUP_FAILURE.getCode());
}).collect(
Collectors.toList());
@@ -372,7 +388,7 @@
GoodsSku byId = goodsSkuService.getById(homeGoodsSkuDTO.getGoodsSkuId());
LambdaQueryWrapper<GoodsGroupPurchase> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(GoodsGroupPurchase::getDelFlag,0);
- wrapper3.eq(GoodsGroupPurchase::getGoodsSkuId,homeGoodsSkuDTO.getGoodsSkuId());
+ wrapper3.eq(GoodsGroupPurchase::getId, homeGoodsSkuDTO.getId());
wrapper3.eq(GoodsGroupPurchase::getListingStatus,0);
List arr=new ArrayList<>();
arr.add(0);
@@ -380,109 +396,125 @@
wrapper3.in(GoodsGroupPurchase::getStartStatus,arr);
GoodsGroupPurchase one = this.getOne(wrapper3);
GoodsGroupPurchaseInfoVO goodsGroupPurchaseInfoVO=new GoodsGroupPurchaseInfoVO();
- goodsGroupPurchaseInfoVO.setGoodsSkuId(one.getId());
- goodsGroupPurchaseInfoVO.setGoodsSkuName(byId.getSkuName());
- goodsGroupPurchaseInfoVO.setYears(String.valueOf(byId.getYears().getYear()));
- goodsGroupPurchaseInfoVO.setCoverPic(byId.getCoverPic());
- goodsGroupPurchaseInfoVO.setPrice(byId.getPrice());
- goodsGroupPurchaseInfoVO.setShareTitle(one.getShareTitle());
- goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
- goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus());
- goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
- goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
- goodsGroupPurchaseInfoVO.setSharePic(one.getSharePic());
- goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice());
- goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
- goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());
+ if (Objects.nonNull(one)) {
+ goodsGroupPurchaseInfoVO.setGoodsSkuId(one.getId());
+ goodsGroupPurchaseInfoVO.setGoodsSkuName(byId.getSkuName());
+ goodsGroupPurchaseInfoVO.setYears(String.valueOf(byId.getYears().getYear()));
+ goodsGroupPurchaseInfoVO.setCoverPic(byId.getCoverPic());
+ goodsGroupPurchaseInfoVO.setPrice(byId.getPrice());
+ if (StringUtils.isNotBlank(one.getShareTitle())) {
+ goodsGroupPurchaseInfoVO.setShareTitle(one.getShareTitle());
+ } else {
+ goodsGroupPurchaseInfoVO.setShareTitle(byId.getSkuName());
+ }
+ if (StringUtils.isNotBlank(one.getSharePic())) {
+ goodsGroupPurchaseInfoVO.setSharePic(one.getSharePic());
+ } else {
+ goodsGroupPurchaseInfoVO.setSharePic(byId.getCoverPic());
+ }
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus());
+ goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
+ goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
+ goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice());
+ goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
+ goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());
+ if (one.getGroupStatus().getCode() == 0) {
+ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6 = Wrappers.lambdaQuery();
+ wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag, 0);
+ wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus, 0);
+ wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId, one.getId());
+ GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
+ if (one1 != null) {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one1.getCurrentNumber());
+ if (one1.getGroupStatus() == 0) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ if (one1.getGroupStatus() == 1) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
+ if (one1.getGroupStatus() == 2) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
- if (one.getGroupStatus().getCode()==0){
- LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
- wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
- wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
- wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,one.getId());
- GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
- if (one1!=null){
- goodsGroupPurchaseInfoVO.setCurrentNumber(one1.getCurrentNumber());
- if (one1.getGroupStatus()==0){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
- }if(one1.getGroupStatus()==1){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
- }if(one1.getGroupStatus()==2){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ } else {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
}
-
- }else{
+ } else {
goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
}
- }else{
- goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
- goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
- }
- goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
- goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
- goodsGroupPurchaseInfoVO.setDescription(one.getDescription());
- goodsGroupPurchaseInfoVO.setDetail(byId.getDescription());
+ goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
+ goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
+ goodsGroupPurchaseInfoVO.setDescription(one.getDescription());
+ goodsGroupPurchaseInfoVO.setDetail(byId.getDescription());
- goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus());
+ goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus());
- LambdaQueryWrapper<MemberGoodsCollection> wrapper4= Wrappers.lambdaQuery();
- wrapper4.eq(MemberGoodsCollection::getDelFlag,0);
- wrapper4.eq(MemberGoodsCollection::getMemberId,homeGoodsSkuDTO.getMemberId());
- wrapper4.eq(MemberGoodsCollection::getTargetId,one.getId());
- wrapper4.eq(MemberGoodsCollection::getType,1);
- List<MemberGoodsCollection> list = iMemberGoodsCollectionService.list(wrapper4);
- if (list.size()>0){
- goodsGroupPurchaseInfoVO.setIsCollection(2);
- }else{
- goodsGroupPurchaseInfoVO.setIsCollection(1);
- }
- HomeGoodsSkuDTO homeGoodsSkuDTO1=new HomeGoodsSkuDTO();
- homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
- homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
- Order data = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
- if (data!=null){
- goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
- goodsGroupPurchaseInfoVO.setOrder(data);
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.YCT_FAILURE);
-
- LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper7= Wrappers.lambdaQuery();
- wrapper7.eq(GoodsGroupPurchaseInfo::getMubre,data.getGroupNo());
- GoodsGroupPurchaseInfo one7 = goodsGroupPurchaseInfoService.getOne(wrapper7);
- if (one7!=null){
- goodsGroupPurchaseInfoVO.setCurrentNumber(one7.getCurrentNumber());
- if (one7.getGroupStatus()==0){
- if (one7.getGroupSize()-one7.getCurrentNumber()<5){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
- }else{
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
- }
- }if(one7.getGroupStatus()==1){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
- }if(one7.getGroupStatus()==2){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
- }
-
+ LambdaQueryWrapper<MemberGoodsCollection> wrapper4 = Wrappers.lambdaQuery();
+ wrapper4.eq(MemberGoodsCollection::getDelFlag, 0);
+ wrapper4.eq(MemberGoodsCollection::getMemberId, homeGoodsSkuDTO.getMemberId());
+ wrapper4.eq(MemberGoodsCollection::getTargetId, one.getId());
+ wrapper4.eq(MemberGoodsCollection::getType, 1);
+ List<MemberGoodsCollection> list = iMemberGoodsCollectionService.list(wrapper4);
+ if (list.size() > 0) {
+ goodsGroupPurchaseInfoVO.setIsCollection(2);
+ } else {
+ goodsGroupPurchaseInfoVO.setIsCollection(1);
}
- }else{
- if (one.getGroupStatus().getCode()==0){
- if (one.getGroupSize()>5){
- if (one.getGroupSize()-one.getCurrentNumber()<5){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
- }else{
+ HomeGoodsSkuDTO homeGoodsSkuDTO1 = new HomeGoodsSkuDTO();
+ homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
+ homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
+ Order data = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1,
+ SecurityConstants.INNER).getData();
+ if (data != null) {
+ goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
+ goodsGroupPurchaseInfoVO.setOrder(data);
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.YCT_FAILURE);
+
+ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper7 = Wrappers.lambdaQuery();
+ wrapper7.eq(GoodsGroupPurchaseInfo::getMubre, data.getGroupNo());
+ GoodsGroupPurchaseInfo one7 = goodsGroupPurchaseInfoService.getOne(wrapper7);
+ if (one7 != null) {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one7.getCurrentNumber());
+ if (one7.getGroupStatus() == 0) {
+ if (one7.getGroupSize() - one7.getCurrentNumber() < 5) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseInfoVO.setGroupStatus(
+ GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ }
+ if (one7.getGroupStatus() == 1) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
+ if (one7.getGroupStatus() == 2) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+
+ }
+ } else {
+ if (one.getGroupStatus().getCode() == 0) {
+ if (one.getGroupSize() > 5) {
+ if (one.getGroupSize() - one.getCurrentNumber() < 5) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ }
+ } else {
goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
}
- }else{
+
+ } else {
goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
}
-
- }else {
- goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(1);
}
- goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(1);
}
-
return goodsGroupPurchaseInfoVO;
}
@@ -610,4 +642,155 @@
return GoodsGroupPurchaseVOPageDTO;
}
+
+ /**
+ * 根据团购商品id集合查询商品sku信息
+ *
+ * @param groupPurchaseIdSet
+ * @return
+ */
+ @Override
+ public List<GoodsSku> getGoodsSkuByGroupPurchaseIdSet(Set<Long> groupPurchaseIdSet) {
+ List<GoodsGroupPurchase> goodsGroupPurchaseList = this.listByIds(groupPurchaseIdSet);
+ List<Long> goodsSkuIdList = goodsGroupPurchaseList.stream()
+ .map(GoodsGroupPurchase::getGoodsSkuId)
+ .collect(Collectors.toList());
+ return goodsSkuService.listByIds(goodsSkuIdList);
+ }
+
+ @Override
+ public GoodsGroupPurchaseInfoVO getFormedGoodsGroupPurchaseInfo(
+ HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ GoodsSku byId = goodsSkuService.getById(homeGoodsSkuDTO.getGoodsSkuId());
+ LambdaQueryWrapper<GoodsGroupPurchase> wrapper3 = Wrappers.lambdaQuery();
+ wrapper3.eq(GoodsGroupPurchase::getDelFlag, 0);
+ wrapper3.eq(GoodsGroupPurchase::getId, homeGoodsSkuDTO.getId());
+ wrapper3.eq(GoodsGroupPurchase::getListingStatus, 0);
+ List arr = new ArrayList<>();
+ arr.add(0);
+ arr.add(1);
+ wrapper3.in(GoodsGroupPurchase::getStartStatus, arr);
+ GoodsGroupPurchase one = this.getOne(wrapper3);
+ GoodsGroupPurchaseInfoVO goodsGroupPurchaseInfoVO = new GoodsGroupPurchaseInfoVO();
+ if (Objects.nonNull(one)) {
+ goodsGroupPurchaseInfoVO.setGoodsSkuId(one.getId());
+ goodsGroupPurchaseInfoVO.setGoodsSkuName(byId.getSkuName());
+ goodsGroupPurchaseInfoVO.setYears(String.valueOf(byId.getYears().getYear()));
+ goodsGroupPurchaseInfoVO.setCoverPic(byId.getCoverPic());
+ goodsGroupPurchaseInfoVO.setPrice(byId.getPrice());
+ if (StringUtils.isNotBlank(one.getShareTitle())) {
+ goodsGroupPurchaseInfoVO.setShareTitle(one.getShareTitle());
+ } else {
+ goodsGroupPurchaseInfoVO.setShareTitle(byId.getSkuName());
+ }
+ if (StringUtils.isNotBlank(one.getSharePic())) {
+ goodsGroupPurchaseInfoVO.setSharePic(one.getSharePic());
+ } else {
+ goodsGroupPurchaseInfoVO.setSharePic(byId.getCoverPic());
+ }
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus());
+ goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
+ goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
+ goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice());
+ goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
+ goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());
+ if (one.getGroupStatus().getCode() == 0) {
+ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6 = Wrappers.lambdaQuery();
+ wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag, 0);
+ wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus, 0);
+ wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId, one.getId());
+ GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
+ if (one1 != null) {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one1.getCurrentNumber());
+ if (one1.getGroupStatus() == 0) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ if (one1.getGroupStatus() == 1) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
+ if (one1.getGroupStatus() == 2) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+
+ } else {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ }
+ } else {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ }
+
+ goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
+ goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
+ goodsGroupPurchaseInfoVO.setDescription(one.getDescription());
+ goodsGroupPurchaseInfoVO.setDetail(byId.getDescription());
+
+ goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus());
+
+ LambdaQueryWrapper<MemberGoodsCollection> wrapper4 = Wrappers.lambdaQuery();
+ wrapper4.eq(MemberGoodsCollection::getDelFlag, 0);
+ wrapper4.eq(MemberGoodsCollection::getMemberId, homeGoodsSkuDTO.getMemberId());
+ wrapper4.eq(MemberGoodsCollection::getTargetId, one.getId());
+ wrapper4.eq(MemberGoodsCollection::getType, 1);
+ List<MemberGoodsCollection> list = iMemberGoodsCollectionService.list(wrapper4);
+ if (list.size() > 0) {
+ goodsGroupPurchaseInfoVO.setIsCollection(2);
+ } else {
+ goodsGroupPurchaseInfoVO.setIsCollection(1);
+ }
+ HomeGoodsSkuDTO homeGoodsSkuDTO1 = new HomeGoodsSkuDTO();
+ homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
+ homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
+ Order data = orderClient.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO1,
+ SecurityConstants.INNER).getData();
+ if (data != null) {
+ goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
+ goodsGroupPurchaseInfoVO.setOrder(data);
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.YCT_FAILURE);
+
+ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper7 = Wrappers.lambdaQuery();
+ wrapper7.eq(GoodsGroupPurchaseInfo::getMubre, data.getGroupNo());
+ GoodsGroupPurchaseInfo one7 = goodsGroupPurchaseInfoService.getOne(wrapper7);
+ if (one7 != null) {
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one7.getCurrentNumber());
+ if (one7.getGroupStatus() == 0) {
+ if (one7.getGroupSize() - one7.getCurrentNumber() < 5) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseInfoVO.setGroupStatus(
+ GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ }
+ if (one7.getGroupStatus() == 1) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
+ if (one7.getGroupStatus() == 2) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+
+ }
+ } else {
+ if (one.getGroupStatus().getCode() == 0) {
+ if (one.getGroupSize() > 5) {
+ if (one.getGroupSize() - one.getCurrentNumber() < 5) {
+ goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ }
+ } else {
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ }
+
+ } else {
+ goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ }
+ goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(1);
+ }
+ }
+ return goodsGroupPurchaseInfoVO;
+ }
}
--
Gitblit v1.7.1