fix: 学习端bug

hjl

2024-06-21 a9bf1fc6ffb80c2de56e1730595b3abde4910484

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java

@@ -164,6 +164,11 @@
    @PostMapping("/addGoods")
    @ApiOperation(value = "添加", tags = {"后台-商品管理"})
    public R addGoods(@RequestBody TGoods dto) {
        if (dto.getTotal() != null) {
            dto.setSurplus(dto.getTotal());
        } else {
            dto.setSurplus(0);
        }
        goodsService.save(dto);
        return R.ok("添加成功");
    }
@@ -179,6 +184,11 @@
    @PostMapping("/updateGoods")
    @ApiOperation(value = "修改", tags = {"后台-商品管理"})
    public R updateGoods(@RequestBody TGoods dto) {
        if (dto.getTotal() != null) {
            dto.setSurplus(dto.getTotal());
        } else {
            dto.setSurplus(0);
        }
        goodsService.updateById(dto);
        return R.ok("修改成功");
    }
@@ -592,7 +602,11 @@
    @ApiOperation(value = "可兑换商品推荐", tags = {"学习端-商城"})
    @ApiOperationSupport(order = 38)
    public R<List<TGoodsVO>> goodRecommend() {
        return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
        LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
        if (null == loginUserStudy) {
            return R.tokenError("登录失效！");
        }
        return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
    }

    /**
@@ -633,7 +647,19 @@
            number += goods.getBasicCount();
        }
        number += orderService.getGoodBuyNumber(goods.getId());
        return R.ok(new GoodDetailVO(goods, goodsTypes, number));
        // 剩余兑换数量
        Integer residueNumber = null;
        if (null != goods.getTotal()) {
            // 计算剩余兑换数量
            List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getGoodsId, goodId)
                    .eq(TOrder::getDisabled, 0).list();
            Integer item = 0;
            for (TOrder order : orderList) {
                item += order.getCount();
            }
            residueNumber = goods.getTotal() - item;
        }
        return R.ok(new GoodDetailVO(goods, goodsTypes, number, residueNumber));
    }

    /**
@@ -664,7 +690,19 @@
            number += goods.getBasicCount();
        }
        number += orderService.getGoodBuyNumber(goods.getId());
        return R.ok(new GoodDetailVO(goods, goodsTypes, number));
        // 剩余兑换数量
        Integer residueNumber = null;
        if (null != goods.getTotal()) {
            // 计算剩余兑换数量
            List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getGoodsId, goodId)
                    .eq(TOrder::getDisabled, 0).list();
            Integer item = 0;
            for (TOrder order : orderList) {
                item += order.getCount();
            }
            residueNumber = goods.getTotal() - item;
        }
        return R.ok(new GoodDetailVO(goods, goodsTypes, number, residueNumber));
    }

    /**
@@ -754,6 +792,7 @@
    @PostMapping("/goodExchange")
    @ApiOperation(value = "家长端-商品兑换确认", tags = {"家长端-商品兑换确认"})
    public R goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
        System.err.println("家长兑换:");
        Recipient recipient = recipientService.getById(Integer.valueOf(goodExchange.getRecipientId()));
        return goodsService.goodExchange1(goodExchange, recipient);
    }
@@ -762,6 +801,7 @@
    @ApiOperation(value = "商品兑换确认", tags = {"学习端-商城"})
    @ApiOperationSupport(order = 42)
    public R<String> goodExchangeStudy(@RequestBody @Validated GoodExchangeDTO goodExchange) {
        System.err.println("学习兑换:");
        Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
        return goodsService.goodExchange(goodExchange, recipient);
    }