bug修改

xuhy

2025-04-22 42b3ed3c042d768bc2085aded6f5c6cfded16475

bug修改

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -907,6 +907,7 @@
            return R.fail("订单不存在");
        }
        order.setSubsidy(recycleSubsidy);
        order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));
        orderService.updateById(order);
        return R.ok();
    }

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java

@@ -191,30 +191,6 @@
        return R.ok(orderClient.supplementAllowance(orderId, prizeMoney).getData());
    }

    /**
     * 分享获取津贴
     *
     * @return 奖品列表
     */
    @GetMapping("/shareAllowanceMoney")
    @ApiOperation(value = "分享获取津贴", tags = {"用户端-订单"})
    public R<Object> shareAllowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) {
        Prize data = adminClient.prizeDetail(prizeId).getData();
        if (null == data) {
            return R.fail(adminClient.prizeDetail(prizeId).getMsg());
        }
        if(Objects.isNull(data.getPrizeType()) || data.getPrizeType() == 2){
            return R.fail("该津贴为非补贴金类型");
        }
        String prizeMoney;
        if (data.getPrizeType()==1) {
            prizeMoney = data.getPrizeName().substring(Constants.ONE);
        } else {
            prizeMoney = "0";
        }
        return R.ok(orderClient.supplementAllowance(orderId, prizeMoney).getData());
    }

    @PostMapping("/orderEstimate")
    @ApiOperation(value = "下单评估，生成预订单信息", tags = {"用户端-订单"})
    public R<String> orderEstimate(@RequestBody OrderRequest orderRequest) {