修改bug

rentaiming

2024-07-26 c308d4fde4087bc555508384e70cf51baa489b50

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

@@ -14,10 +14,13 @@
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.feignClient.OrderClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -110,6 +113,23 @@
                 if (num==byId.getGroupSize()){
                     byId.setGroupStatus(1);
                     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();
                     }

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

                 }
                 goodsGroupPurchaseInfoServiceImpl.updateById(byId);
             }else{
@@ -118,6 +138,23 @@
                     orderClient.updateOrderStatusByMubres1(goodsGroupPurchaseInfo.getMubre(), SecurityConstants.INNER);
                 }
                 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;
                         GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId());
                         int i2 = i3 + goodsSku.getStock();
                         goodsSku.setStock(i2);
                         goodsSkuMapper.updateById(goodsSku);
                     }
                 }
             }

        return R.ok();