修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

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

@@ -8,19 +8,22 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.goods.mapper.GoodsSkuMapper;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.goods.service.impl.GoodsGroupPurchaseInfoServiceImpl;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
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.*;

import java.util.List;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
@@ -86,13 +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);
       /*        goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/
           }
           one1.setCurrentNumber(i);
           one1.setPurchaseNum(0);
           goodsGroupPurchaseInfoServiceImpl.updateById(one1);
       }else{
           if (i==0){
               GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
@@ -101,7 +108,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()){
@@ -118,9 +125,9 @@
               int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
               goodsSku.setStock(i2);
               goodsSkuMapper.updateById(goodsSku);
               goodsGroupPurchaseInfoServiceImpl.removeById(one1);
             /*  goodsGroupPurchaseInfoServiceImpl.removeById(one1);*/

               goodsGroupPurchaseInfoServiceImpl.updateById(one1);
               // goodsGroupPurchaseInfoServiceImpl.updateById(one1);
           }
       }

@@ -131,7 +138,9 @@
    @InnerAuth
    @PostMapping("/updgoodsGroupPurchaseInfo")
    public R getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo) {
        log.info("getGoodsSeckiGoodsGroupPurchaseInfo==============》{}", goodsGroupPurchaseInfo);
             if (goodsGroupPurchaseInfo.getId()!=null){
                 log.info("========================已有待成团========================");
                 GoodsGroupPurchaseInfo byId = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId());
                 Integer num= byId.getCurrentNumber()+1;
                 byId.setCurrentNumber(num);
@@ -157,6 +166,7 @@
                 }

             }else{
                 log.info("===================没有待成团的团购===================");
                 if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()){
                     goodsGroupPurchaseInfo.setGroupStatus(1);
                     goodsGroupPurchaseInfo.setIsPurchase(1);
@@ -246,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));
    }
}