From 5c1f76edf6bd37c68ca3e915970c3bdac1e6d0e5 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 16:49:02 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java | 8 +--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java | 59 ++++++++++++++++++-----------
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java | 4 ++
3 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
index 6afda95..81d861a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
@@ -73,5 +73,9 @@
private Integer purchaseNum;
+ @ApiModelProperty(value = "是否成团")
+ private Integer isPurchase;
+
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
index 8be25a1..89addf7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
@@ -1,9 +1,6 @@
package com.ruoyi.system.api.domain.vo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
@@ -69,7 +66,8 @@
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
-
+ @ApiModelProperty(value = "排序")
+ private Integer sortNum;
}
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 f849338..751059b 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
@@ -83,34 +83,47 @@
wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,goodsGroupPurchaseInfo.getMubre());
GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoServiceImpl.getOne(wrapper6);
int i=one1.getCurrentNumber()-1;
- if (i==0){
- GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
-
- GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
- int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
- goodsSku.setStock(i2);
- goodsSkuMapper.updateById(goodsSku);
- goodsGroupPurchaseInfoServiceImpl.removeById(one1);
- }else{
- one1.setCurrentNumber(i);
- if (one1.getGroupSize()>one1.getCurrentNumber()){
- one1.setGroupStatus(0);
+ if (one1.getIsPurchase()==0){
+ if (i==0){
+ GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
+ int i1 = byId.getLimitNumber() * goodsGroupPurchaseInfo.getGroupSize();
+ GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
+ int i2 = i1 + goodsSku.getStock();
+ goodsSku.setStock(i2);
+ goodsSkuMapper.updateById(goodsSku);
+ goodsGroupPurchaseInfoServiceImpl.removeById(one1);
}
+ }else{
+ if (i==0){
+ GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
- Integer i3= one1.getPurchaseNum()-goodsGroupPurchaseInfo.getPurchaseNum();
- one1.setPurchaseNum(i3);
- goodsGroupPurchaseInfoServiceImpl.updateById(one1);
+ GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
+ int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
+ goodsSku.setStock(i2);
+ goodsSkuMapper.updateById(goodsSku);
+ goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+ }else{
+ one1.setCurrentNumber(i);
+ if (one1.getGroupSize()>one1.getCurrentNumber()){
+ one1.setGroupStatus(0);
+ }
- GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
+ Integer i3= one1.getPurchaseNum()-goodsGroupPurchaseInfo.getPurchaseNum();
+ one1.setPurchaseNum(i3);
+ goodsGroupPurchaseInfoServiceImpl.updateById(one1);
- GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
- int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
- goodsSku.setStock(i2);
- goodsSkuMapper.updateById(goodsSku);
- goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+ GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
- goodsGroupPurchaseInfoServiceImpl.updateById(one1);
+ GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
+ int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
+ goodsSku.setStock(i2);
+ goodsSkuMapper.updateById(goodsSku);
+ goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+
+ goodsGroupPurchaseInfoServiceImpl.updateById(one1);
+ }
}
+
return R.ok(one1);
}
@@ -126,6 +139,7 @@
goodsGroupPurchaseInfoServiceImpl.updateById(byId);
if (num==byId.getGroupSize()){
byId.setGroupStatus(1);
+ byId.setIsPurchase(1);
goodsGroupPurchaseInfoServiceImpl.updateById(byId);
orderClient.updateOrderStatusByMubres1(byId.getMubre(), SecurityConstants.INNER);
@@ -145,6 +159,7 @@
}else{
if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()){
goodsGroupPurchaseInfo.setGroupStatus(1);
+ goodsGroupPurchaseInfo.setIsPurchase(1);
orderClient.updateOrderStatusByMubres1(goodsGroupPurchaseInfo.getMubre(), SecurityConstants.INNER);
}
goodsGroupPurchaseInfoServiceImpl.save(goodsGroupPurchaseInfo);
--
Gitblit v1.7.1