From f44e4d609e7efaed9eac545137970b1e334f8106 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 21 九月 2024 09:01:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 9acf417..2fdfad9 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
@@ -14,6 +14,8 @@
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.feignClient.OrderClient;
+import java.util.List;
+import java.util.Set;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -87,16 +89,17 @@
if (one1.getIsPurchase()==0){
if (i==0){
GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
- int i1 = byId.getLimitNumber() * goodsGroupPurchaseInfo.getGroupSize();
+ // int i1 = byId.getLimitNumber() * goodsGroupPurchaseInfo.getGroupSize();
+ int i1 = one1.getPurchaseNum();
GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
int i2 = i1 + goodsSku.getStock();
goodsSku.setStock(i2);
goodsSkuMapper.updateById(goodsSku);
/* goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/
- }else{
- one1.setCurrentNumber(i);
- goodsGroupPurchaseInfoServiceImpl.updateById(one1);
}
+ one1.setCurrentNumber(i);
+ one1.setPurchaseNum(0);
+ goodsGroupPurchaseInfoServiceImpl.updateById(one1);
}else{
if (i==0){
GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
@@ -124,7 +127,7 @@
goodsSkuMapper.updateById(goodsSku);
/* goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/
- goodsGroupPurchaseInfoServiceImpl.updateById(one1);
+ // goodsGroupPurchaseInfoServiceImpl.updateById(one1);
}
}
@@ -253,4 +256,16 @@
}
return R.ok();
}
+
+ /**
+ * 根据团购商品id集合查询商品sku信息
+ *
+ * @param groupPurchaseIdSet
+ * @return
+ */
+ @InnerAuth
+ @PostMapping("/getGoodsSkuByGroupPurchaseIdSet")
+ R<List<GoodsSku>> getGoodsSkuByGroupPurchaseIdSet(@RequestBody Set<Long> groupPurchaseIdSet) {
+ return R.ok(goodsGroupPurchaseService.getGoodsSkuByGroupPurchaseIdSet(groupPurchaseIdSet));
+ }
}
--
Gitblit v1.7.1