修改bug

rentaiming

2024-07-30 256c98cc6ebd7f04d55e19324c9d9f12ac8ed476

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java

@@ -85,10 +85,9 @@
       int i=one1.getCurrentNumber()-1;
       if (i==0){
           GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
           int i1 = byId.getLimitNumber() * byId.getGroupSize();

           GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
           int i2 = i1 + goodsSku.getStock();
           int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
           goodsSku.setStock(i2);
           goodsSkuMapper.updateById(goodsSku);
           goodsGroupPurchaseInfoServiceImpl.removeById(one1);
@@ -97,6 +96,19 @@
           if (one1.getGroupSize()>one1.getCurrentNumber()){
               one1.setGroupStatus(0);
           }

            Integer i3= one1.getPurchaseNum()-goodsGroupPurchaseInfo.getPurchaseNum();
           one1.setPurchaseNum(i3);
           goodsGroupPurchaseInfoServiceImpl.updateById(one1);

           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);

           goodsGroupPurchaseInfoServiceImpl.updateById(one1);
       }

@@ -110,20 +122,18 @@
                 GoodsGroupPurchaseInfo byId = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId());
                 Integer num= byId.getCurrentNumber()+1;
                 byId.setCurrentNumber(num);
                 byId.setPurchaseNum(goodsGroupPurchaseInfo.getPurchaseNum());
                 goodsGroupPurchaseInfoServiceImpl.updateById(byId);
                 if (num==byId.getGroupSize()){
                     byId.setGroupStatus(1);
                     goodsGroupPurchaseInfoServiceImpl.updateById(byId);
                     orderClient.updateOrderStatusByMubres1(byId.getMubre(), SecurityConstants.INNER);

                     List<Order> listR = orderClient.updateOrderStatusByMubres2(byId.getMubre(), SecurityConstants.INNER).getData();
                     int i=0;
                     for (Order l:listR){
                         i=i+l.getGoodsQuantity();
                     }

                     GoodsGroupPurchaseInfo byIds = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId());
                     GoodsGroupPurchase byId1 = goodsGroupPurchaseService.getById(byId.getGroupPurchaseId());
                     int i1 = byId1.getLimitNumber() * byId.getGroupSize();
                     if (i<i1){
                         int i3=i1-i;
                     if (byIds.getPurchaseNum()<i1){
                         int i3=i1-byIds.getPurchaseNum();
                         GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId());
                         int i2 = i3 + goodsSku.getStock();
                         goodsSku.setStock(i2);
@@ -131,7 +141,7 @@
                     }

                 }
                 goodsGroupPurchaseInfoServiceImpl.updateById(byId);

             }else{
                 if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()){
                     goodsGroupPurchaseInfo.setGroupStatus(1);
@@ -139,16 +149,12 @@
                 }
                 goodsGroupPurchaseInfoServiceImpl.save(goodsGroupPurchaseInfo);
                 if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()) {
                     List<Order> listR = orderClient.updateOrderStatusByMubres2(goodsGroupPurchaseInfo.getMubre(), SecurityConstants.INNER).getData();
                     int i = 0;
                     for (Order l : listR) {
                         i = i + l.getGoodsQuantity();
                     }


                     GoodsGroupPurchase byId1 = goodsGroupPurchaseService.getById(goodsGroupPurchaseInfo.getGroupPurchaseId());
                     int i1 = byId1.getLimitNumber() * goodsGroupPurchaseInfo.getGroupSize();
                     if (i < i1) {
                         int i3 = i1 - i;
                     if (goodsGroupPurchaseInfo.getPurchaseNum() < i1) {
                         int i3 = i1 - goodsGroupPurchaseInfo.getPurchaseNum();
                         GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId());
                         int i2 = i3 + goodsSku.getStock();
                         goodsSku.setStock(i2);