lidongdong
2023-08-31 480f4b49dde7d746031b6054327474d24a2e15ce
修改库存问题
3个文件已修改
62 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -58,10 +58,10 @@
            return R.fail("商品价值不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getGoodNum()))
        {
            return R.fail("商品数量不能为空");
        }
//        if(StringUtils.isEmpty(vimVO.getGoodNum()))
//        {
//            return R.fail("商品数量不能为空");
//        }
        vimVO.setGoodType("0");
        return merchantService.VolunteerIntegralMerchantInsertVolunteer(vimVO);
@@ -75,10 +75,10 @@
            return R.fail("商品价值不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getGoodNum()))
        {
            return R.fail("商品数量不能为空");
        }
//        if(StringUtils.isEmpty(vimVO.getGoodNum()))
//        {
//            return R.fail("商品数量不能为空");
//        }
        vimVO.setGoodType("0");
        return merchantService.VolunteerIntegralMerchantUpdateById(vimVO);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -63,9 +63,9 @@
    @GetMapping("/setOpenOrClose")
    public R setOpenOrClose(@RequestParam("merchantType") String merchantType,
    public R setOpenOrClose(@RequestParam("merchantState") String merchantState,
                            @RequestParam("merchantIds") String merchantIds) {
        if (StringUtils.isEmpty(merchantType)) {
        if (StringUtils.isEmpty(merchantState)) {
            return R.fail("开启或者禁用状态不能为空");
        }
@@ -77,7 +77,7 @@
        {
            VolunteerMerchantVO merchantVO=new VolunteerMerchantVO();
            merchantVO.setId(merchantIds);
            merchantVO.setMerchantState(merchantType);
            merchantVO.setMerchantState(merchantState);
            vtService.updateVolunteerMerchant(merchantVO);
            return R.ok();
        }
@@ -88,7 +88,7 @@
            {
                VolunteerMerchantVO merchantVO=new VolunteerMerchantVO();
                merchantVO.setId(id);
                merchantVO.setMerchantState(merchantType);
                merchantVO.setMerchantState(merchantState);
                vtService.updateVolunteerMerchant(merchantVO);
            }
            return R.ok();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -92,25 +92,25 @@
            return R.fail("兑换用户id不能为空");
        }
        if(StringUtils.isEmpty(goods.getGoodNum()))
        {
            return R.fail("商品库存不足");
        }
        else
        {
            int goodNum=Integer.valueOf(goods.getGoodNum());
            if(goodNum<=0)
            {
                return R.fail("商品库存不足");
            }
            goodNum--;
            VolunteerIntegralMerchantVO vo=new VolunteerIntegralMerchantVO();
            vo.setId(goods.getId());
            vo.setGoodNum(goodNum+"");
            goodsService.updateById(vo);
        }
//        if(StringUtils.isEmpty(goods.getGoodNum()))
//        {
//            return R.fail("商品库存不足");
//        }
//        else
//        {
//            int goodNum=Integer.valueOf(goods.getGoodNum());
//            if(goodNum<=0)
//            {
//                return R.fail("商品库存不足");
//            }
//
//            goodNum--;
//
//            VolunteerIntegralMerchantVO vo=new VolunteerIntegralMerchantVO();
//            vo.setId(goods.getId());
//            vo.setGoodNum(goodNum+"");
//            goodsService.updateById(vo);
//        }
        //增加积分明细记录