From fa5620dba592d030e7fd9197ce01eacee26426a8 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 21:47:13 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java | 6 +++---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 32 +++++++++++++++++++-------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
index 2b33aa4..3b5f8c3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
@@ -91,7 +91,7 @@
int i2 = i1 + goodsSku.getStock();
goodsSku.setStock(i2);
goodsSkuMapper.updateById(goodsSku);
- goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+ /* goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/
}else{
one1.setCurrentNumber(i);
goodsGroupPurchaseInfoServiceImpl.updateById(one1);
@@ -104,7 +104,7 @@
int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
goodsSku.setStock(i2);
goodsSkuMapper.updateById(goodsSku);
- goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+ /* goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/
}else{
one1.setCurrentNumber(i);
if (one1.getGroupSize()>one1.getCurrentNumber()){
@@ -121,7 +121,7 @@
int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
goodsSku.setStock(i2);
goodsSkuMapper.updateById(goodsSku);
- goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+ /* goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/
goodsGroupPurchaseInfoServiceImpl.updateById(one1);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index f6658b5..6ef2d4c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1307,7 +1307,6 @@
wrapper1.eq(Order::getMemberId,homeGoodsSkuDTO1.getMemberId());
wrapper1.eq(Order::getOrderFrom,3);
wrapper1.eq(Order::getDelFlag,0);
- wrapper1.eq(Order::getOrderStatus,2);
wrapper1.orderByDesc(Order::getCreateTime);
Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
Page< Order> page1 = this.page(page, wrapper1);
@@ -1328,24 +1327,31 @@
goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
if (byId1.getGroupNo()!=null){
GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData();
- if (one1!=null) {
- goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
- if (one1.getGroupStatus() == 0) {
- if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
- } else {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+
+ if (one1.getGroupStatus()==3){
+ if (one1!=null) {
+ goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
+ if (one1.getGroupStatus() == 0) {
+ if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
}
- }
- if (one1.getGroupStatus() == 1) {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
- }
+ if (one1.getGroupStatus() == 1) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
if (one1.getGroupStatus() == 2) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
+ }else{
+ goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
+ }
}else{
- goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
+ goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
+
}
--
Gitblit v1.7.1