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); } 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,6 +1327,8 @@ goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2); if (byId1.getGroupNo()!=null){ GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData(); if (one1.getGroupStatus()==3){ if (one1!=null) { goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber()); if (one1.getGroupStatus() == 0) { @@ -1346,6 +1347,11 @@ }else{ goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus()); } }else{ goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber()); goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE); } }
