From 8d738d847973e1184a704b5ca3d4f492bffdb03f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 26 七月 2024 09:01:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 177 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 133 insertions(+), 44 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 f544f53..8b1d0d5 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,11 +8,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.SecurityConstants;
-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.OrderStatusEnum;
-import com.ruoyi.common.core.enums.StartStatusEnum;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.*;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -25,6 +22,7 @@
import com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO;
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;
@@ -36,11 +34,7 @@
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.GoodsStockUpdDTO;
-import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
-import com.ruoyi.system.api.domain.dto.ListStatusDTO;
-import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
-import com.ruoyi.system.api.domain.dto.RefundDTO;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.GoodsGroupPurchaseInfoVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.WdGoodsGroupPurchaseVO;
@@ -51,7 +45,6 @@
import java.util.Map;
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;
@@ -75,9 +68,7 @@
private final RedisService redisService;
private final IMemberGoodsCollectionService iMemberGoodsCollectionService;
private final SysUserClient sysUserClient;
-
- @Resource
- private GoodsGroupPurchaseInfoServiceImpl GoodsGroupPurchaseInfoServiceImpl;
+ private final IGoodsGroupPurchaseInfoService goodsGroupPurchaseInfoService;
// 创建一个静态共享的ObjectMapper实例以重用
private static final ObjectMapper objectMapper = new ObjectMapper();
/**
@@ -101,6 +92,7 @@
@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不能为空");
@@ -204,6 +196,12 @@
+ 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());
@@ -253,10 +251,12 @@
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", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
@@ -280,13 +280,27 @@
if (StringUtils.isNull(groupPurchase)) {
throw new ServiceException("团购商品不存在");
}
- //判断商品状态，未成团则查询关联订单，进行退款；成团就直接修改状态
- if (groupPurchase.getGroupStatus().equals(GroupStatusEnum.TO_FORM_A_GROUP)) {
- //查询关联订单
- List<Order> orderList = orderClient.getOrderByGroupPurchaseId(id,
+ // 处理未成团订单退款和成团订单修改展示状态
+ boolean res = handleGroupPurchase(id);
+ groupPurchase.setGroupStatus(
+ res ? GroupStatusEnum.FORMED_INTO_A_GROUP : GroupStatusEnum.GROUP_FAILURE);
+ groupPurchase.setStartStatus(StartStatusEnum.ENDED);
+
+ this.updateById(groupPurchase);
+ }
+
+ 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());
@@ -307,6 +321,15 @@
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()))
@@ -318,10 +341,24 @@
orderClient.updateOrderList(orderUpdDTOS, SecurityConstants.INNER);
}
}
- groupPurchase.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ 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);
}
- groupPurchase.setStartStatus(StartStatusEnum.ENDED);
- this.updateById(groupPurchase);
+ return false;
}
@Override
@@ -345,28 +382,38 @@
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());
- LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
- wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
- wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
- wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,one.getId());
- GoodsGroupPurchaseInfo one1 = GoodsGroupPurchaseInfoServiceImpl.getOne(wrapper6);
- if (one1!=null){
- goodsGroupPurchaseInfoVO.setCurrentNumber(one1.getCurrentNumber());
- if (one1.getGroupStatus()==0){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
- }else{
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
- }
+ 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());
@@ -388,7 +435,7 @@
HomeGoodsSkuDTO homeGoodsSkuDTO1=new HomeGoodsSkuDTO();
homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
- Order data = orderClient.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
+ Order data = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
if (data!=null){
goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
goodsGroupPurchaseInfoVO.setOrder(data);
@@ -396,23 +443,34 @@
LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper7= Wrappers.lambdaQuery();
wrapper7.eq(GoodsGroupPurchaseInfo::getMubre,data.getGroupNo());
- GoodsGroupPurchaseInfo one7 = GoodsGroupPurchaseInfoServiceImpl.getOne(wrapper7);
+ GoodsGroupPurchaseInfo one7 = goodsGroupPurchaseInfoService.getOne(wrapper7);
if (one7!=null){
goodsGroupPurchaseInfoVO.setCurrentNumber(one7.getCurrentNumber());
if (one7.getGroupStatus()==0){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
- }else{
+ 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()-one.getCurrentNumber()<5){
- goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ 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());
}
@@ -503,6 +561,37 @@
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 (one1.getGroupStatus()==2){
+ goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
+ }
+
+ }
+ }
+
+
+
}
--
Gitblit v1.7.1