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/GoodsGroupPurchaseServiceImpl.java | 367 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 291 insertions(+), 76 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 13afb40..cdd540b 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
@@ -8,36 +8,45 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.ClientTypeEnum;
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
+import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
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.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.dto.*;
-import com.ruoyi.system.api.domain.vo.GoodsGroupPurchaseInfoVO;
import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseDTO;
import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseQuery;
import com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO;
-import com.ruoyi.goods.domain.GoodsGroupPurchase;
+import com.ruoyi.goods.domain.MemberGoodsCollection;
import com.ruoyi.goods.mapper.GoodsGroupPurchaseMapper;
+import com.ruoyi.goods.service.IGoodsGroupPurchaseInfoService;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
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;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.WebsocketMessageDTO;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
+import com.ruoyi.system.api.domain.dto.ListStatusDTO;
+import com.ruoyi.system.api.domain.dto.OrderDTO;
+import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
+import com.ruoyi.system.api.domain.dto.RefundDTO;
+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.OrderClient;
-import com.ruoyi.system.api.util.WebSocketUsers;
-import java.time.LocalDateTime;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -64,6 +73,9 @@
private final IGoodsSkuService goodsSkuService;
private final AsyncMethodService asyncMethodService;
private final RedisService redisService;
+ private final IMemberGoodsCollectionService iMemberGoodsCollectionService;
+ private final SysUserClient sysUserClient;
+ private final IGoodsGroupPurchaseInfoService goodsGroupPurchaseInfoService;
// 创建一个静态共享的ObjectMapper实例以重用
private static final ObjectMapper objectMapper = new ObjectMapper();
/**
@@ -87,9 +99,20 @@
@Override
public void saveGoodsGroupPurchase(GoodsGroupPurchaseDTO dto) {
GoodsGroupPurchase goodsGroupPurchase = BeanUtils.copyBean(dto, GoodsGroupPurchase.class);
+ goodsGroupPurchase.setListingStatus(ListingStatusEnum.ON_SHELVES);
if (StringUtils.isNull(dto.getId())) {
if (StringUtils.isNull(dto.getGoodsSkuId())) {
throw new ServiceException("商品id不能为空");
+ }
+ 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());
+ long count = this.count(queryWrapper);
+ if (count > 0) {
+ throw new ServiceException("添加失败，当前商品在该时间段内有其他团购活动");
}
this.save(goodsGroupPurchase);
GoodsSku goodsSku = goodsSkuService.getById(dto.getGoodsSkuId());
@@ -97,10 +120,10 @@
throw new ServiceException("商品不存在");
}
int groupPurchaseStock = dto.getLimitNumber() * dto.getGroupSize();
- goodsSkuService.lambdaUpdate()
- .set(GoodsSku::getStock, goodsSku.getStock() - groupPurchaseStock)
- .ge(GoodsSku::getStock, groupPurchaseStock)
- .eq(GoodsSku::getId, goodsSku.getId());
+ if (goodsSku.getStock() < groupPurchaseStock) {
+ throw new ServiceException(String.format("团购商品【%s】剩余库存不足，请修改团购库存",
+ goodsSku.getSkuName()));
+ }
} else {
GoodsGroupPurchase groupPurchase = this.getById(dto.getId());
if (StringUtils.isNull(groupPurchase)) {
@@ -113,20 +136,18 @@
throw new ServiceException("已结束的团购商品不能编辑");
}
int originGroupStock = groupPurchase.getLimitNumber() * groupPurchase.getGroupSize();
- GoodsSku goodsSku = goodsSkuService.getById(dto.getGoodsSkuId());
+ GoodsSku goodsSku = goodsSkuService.getById(groupPurchase.getGoodsSkuId());
if (StringUtils.isNull(goodsSku)) {
throw new ServiceException("商品不存在");
}
int groupPurchaseStock = dto.getLimitNumber() * dto.getGroupSize();
int latestStock = originGroupStock - groupPurchaseStock;
- goodsSkuService.lambdaUpdate()
- .set(GoodsSku::getStock,
- goodsSku.getStock() + latestStock)
- .ge(GoodsSku::getStock, latestStock)
- .eq(GoodsSku::getId, goodsSku.getId());
- this.updateById(goodsGroupPurchase);
- asyncMethodService.groupPurchaseScheduleTask(Lists.newArrayList(goodsGroupPurchase));
+ if (goodsSku.getStock() < latestStock) {
+ throw new ServiceException(String.format("团购商品%s剩余库存不足，请修改团购库存",
+ goodsSku.getSkuName()));
+ }
}
+ asyncMethodService.groupPurchaseScheduleTask(Lists.newArrayList(goodsGroupPurchase));
}
/**
@@ -147,6 +168,12 @@
Integer num = orderClient.getGroupPurchasesGoodsNum(groupPurchase.getId(),
SecurityConstants.INNER).getData();
vo.setBuyNumber(num);
+ List<GoodsGroupPurchaseInfo> list = goodsGroupPurchaseInfoService.lambdaQuery()
+ .eq(GoodsGroupPurchaseInfo::getGroupPurchaseId, id).list();
+ Integer count = list.stream().map(GoodsGroupPurchaseInfo::getCurrentNumber)
+ .reduce(Integer::sum)
+ .orElse(0);
+ vo.setGroupedMemberNumber(count);
return vo;
}
@@ -166,14 +193,18 @@
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());
}
//修改状态
groupPurchase.setListingStatus(dto.getListingStatus());
+ 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);
}
@@ -193,11 +224,13 @@
.eq(GoodsGroupPurchase::getId, groupPurchaseId).update();
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.GROUP_PURCHASE);
- map.put("notification_time", LocalDateTime.now());
+ map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
map.put("target_id", groupPurchaseId);
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);
}
}
@@ -211,17 +244,20 @@
public void endGroupPurchase(Long groupPurchaseId) throws JsonProcessingException {
log.info(">>>>>>>>>>>>>>>>>>>>{}团购商品结束团购<<<<<<<<<<<<<<<<<<<<", groupPurchaseId);
GoodsGroupPurchase groupPurchase = this.getById(groupPurchaseId);
- if (StringUtils.isNotNull(groupPurchase) && groupPurchase.getStartStatus()
- .equals(StartStatusEnum.STARTED)) {
- this.lambdaUpdate().set(GoodsGroupPurchase::getStartStatus, StartStatusEnum.ENDED)
- .eq(GoodsGroupPurchase::getId, groupPurchaseId).update();
+ boolean res = handleGroupPurchase(groupPurchaseId);
+ if (StringUtils.isNotNull(groupPurchase)) {
+ groupPurchase.setStartStatus(StartStatusEnum.ENDED);
+ groupPurchase.setGroupStatus(
+ res ? GroupStatusEnum.FORMED_INTO_A_GROUP : GroupStatusEnum.GROUP_FAILURE);
+ this.updateById(groupPurchase);
Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.GROUP_PURCHASE);
- map.put("notification_time", LocalDateTime.now());
+ map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
map.put("target_id", groupPurchaseId);
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);
}
}
@@ -237,47 +273,85 @@
if (StringUtils.isNull(groupPurchase)) {
throw new ServiceException("团购商品不存在");
}
- //判断商品状态，未成团则查询关联订单，进行退款；成团就直接修改状态
- if (groupPurchase.getGroupStatus().equals(GroupStatusEnum.TO_FORM_A_GROUP)) {
- //查询关联订单
- List<Order> orderList = orderClient.getOrderByGroupPurchaseId(id,
- SecurityConstants.INNER).getData();
+ // 处理未成团订单退款和成团订单修改展示状态
+ boolean res = handleGroupPurchase(id);
+ groupPurchase.setGroupStatus(
+ res ? GroupStatusEnum.FORMED_INTO_A_GROUP : GroupStatusEnum.GROUP_FAILURE);
+ groupPurchase.setStartStatus(StartStatusEnum.ENDED);
- 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<>();
+ this.updateById(groupPurchase);
+ }
- data.forEach((key, value) -> {
- if ((boolean) value) {
- successfulOrders.add(key);
- } else {
- failedOrders.add(key);
+ private boolean handleGroupPurchase(Long id) {
+ List<GoodsGroupPurchaseInfo> groupPurchaseInfoList = goodsGroupPurchaseInfoService.lambdaQuery()
+ .eq(GoodsGroupPurchaseInfo::getGroupPurchaseId, id).list();
+ if (CollUtils.isNotEmpty(groupPurchaseInfoList)) {
+ List<String> mubres = groupPurchaseInfoList.stream()
+ .filter(g -> g.getCurrentNumber()
+ < g.getGroupSize())
+ .map(GoodsGroupPurchaseInfo::getMubre).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,
+ 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);
+ }
+ });
+ 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);
+ }
}
- } else {
- this.lambdaUpdate()
- .set(GoodsGroupPurchase::getStartStatus, StartStatusEnum.ENDED)
- .eq(GoodsGroupPurchase::getId, id).update();
+ List<String> formedGroupMubres = groupPurchaseInfoList.stream()
+ .filter(g -> g.getCurrentNumber()
+ >= g.getGroupSize())
+ .map(GoodsGroupPurchaseInfo::getMubre).collect(
+ Collectors.toList());
+ if (CollUtils.isNotEmpty(formedGroupMubres)) {
+ orderClient.updateOrderStatusByMubres(formedGroupMubres, SecurityConstants.INNER);
+ return true;
+ }
+ List<GoodsGroupPurchaseInfo> notGroupedList = groupPurchaseInfoList.stream()
+ .filter(g -> !g.getCurrentNumber()
+ .equals(g.getGroupSize())).peek(p -> {
+ p.setGroupStatus(GroupStatusEnum.GROUP_FAILURE.getCode());
+ }).collect(
+ Collectors.toList());
+ goodsGroupPurchaseInfoService.updateBatchById(notGroupedList);
}
+ return false;
}
@Override
@@ -286,6 +360,11 @@
LambdaQueryWrapper<GoodsGroupPurchase> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(GoodsGroupPurchase::getDelFlag,0);
wrapper3.eq(GoodsGroupPurchase::getGoodsSkuId,homeGoodsSkuDTO.getGoodsSkuId());
+ 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();
goodsGroupPurchaseInfoVO.setGoodsSkuId(one.getId());
@@ -293,22 +372,101 @@
goodsGroupPurchaseInfoVO.setYears(String.valueOf(byId.getYears().getYear()));
goodsGroupPurchaseInfoVO.setCoverPic(byId.getCoverPic());
goodsGroupPurchaseInfoVO.setPrice(byId.getPrice());
- goodsGroupPurchaseInfoVO.setShareTitle(byId.getShareTitle());
- goodsGroupPurchaseInfoVO.setSharePic(byId.getSharePic());
+ 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 (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.setStartStatus(one.getStartStatus());
- goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus());
- goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
+ goodsGroupPurchaseInfoVO.setDetail(byId.getDescription());
- Order data = orderClient.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO, SecurityConstants.INNER).getData();
+ 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);
+ }
+
+ }
}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);
}
@@ -361,9 +519,28 @@
List<Long> goodsSkuIdList = data.stream()
.map(OrderVO::getGoodsSkuId)
.collect(Collectors.toList());
+
+ LambdaQueryWrapper< GoodsSku> wrapper1= Wrappers.lambdaQuery();
+ if (homeGoodsSkuDTO.getSkuName()!=null&&homeGoodsSkuDTO.getSkuName()!=""){
+ wrapper1.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
+ }
+ List<GoodsSku> list = goodsSkuService.list(wrapper1);
+
+ List<Long> goodsSkuIdList1 = list.stream()
+ .map(GoodsSku::getId)
+ .collect(Collectors.toList());
+
Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize());
LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery();
- wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList);
+ if (goodsSkuIdList.size()>0){
+ wrapper.in(GoodsGroupPurchase::getId,goodsSkuIdList);
+ }
+ if (goodsSkuIdList1.size()>0){
+ wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList1);
+ }else {
+ goodsSkuIdList1.add(0L);
+ wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList1);
+ }
wrapper.eq(GoodsGroupPurchase::getListingStatus,0);
wrapper.eq( GoodsGroupPurchase::getDelFlag,0);
Page< GoodsGroupPurchase> page1 = this.page(page, wrapper);
@@ -377,6 +554,44 @@
goodsGroupPurchaseeVO.setPrice(byId.getPrice());
goodsGroupPurchaseeVO.setYears(String.valueOf(byId.getYears().getYear()));
goodsGroupPurchaseeVO.setIsGoodsGroupPurchase(2);
+ OrderDTO orderDTO =new OrderDTO();
+ orderDTO.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
+ orderDTO.setGoodsSkuId(goodsGroupPurchaseeVO.getId());
+ orderDTO.setMemberId(homeGoodsSkuDTO.getMemberId());
+ Order orderOne = orderClient.getOrderOne2(orderDTO, SecurityConstants.INNER).getData();
+
+ if (orderOne!=null){
+ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
+ wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
+ wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsGroupPurchaseeVO.getId());
+ wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,orderOne.getGroupNo());
+ GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
+ if (one1!=null){
+ goodsGroupPurchaseeVO.setCurrentNumber(one1.getCurrentNumber());
+ if (one1.getGroupStatus()==0){
+ if (one1.getGroupSize()-one1.getCurrentNumber()<5){
+ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ }else{
+ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ }if (one1.getGroupStatus()==1){
+ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }if (goodsGroupPurchaseeVO.getStartStatus().getCode()==1){
+ if (one1.getGroupStatus()==2){
+ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
+ }else{
+ if (one1.getGroupStatus()==2){
+ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+ }
+
+
+ }
+ }
+
+
+
}
--
Gitblit v1.7.1