From 80262701ddf3142954ea649ccc3eaa138e60aa04 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 22 七月 2024 16:49:01 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 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 0748925..8361708 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
@@ -382,6 +382,8 @@
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());
@@ -408,7 +410,7 @@
goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
}
}else{
- goodsGroupPurchaseInfoVO.setCurrentNumber(one.getGroupSize());
+ goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
}
@@ -459,11 +461,16 @@
}
}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());
}
@@ -560,29 +567,32 @@
orderDTO.setMemberId(homeGoodsSkuDTO.getMemberId());
Order orderOne = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData();
- LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
- wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
- wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,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 (orderOne!=null){
+ LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
+ wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
+ wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,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);
}
- }if (one1.getGroupStatus()==1){
- goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
- }if (one1.getGroupStatus()==2){
- goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
- }
+ }
}
+
}
--
Gitblit v1.7.1