大屏接口bug修改

无关风月

17 小时以前 b5ead35c1d955f2a0e2e10da79254860d0ba95e9

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

@@ -173,38 +173,18 @@
     */
    @GetMapping("/allowanceMoney")
    @ApiOperation(value = "补充订单津贴金额", tags = {"用户端-订单"})
    public R<Object> allowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) {
    public R<Object> allowanceMoney(@RequestParam("orderId") String orderId,
                                    @RequestParam("prizeId") String prizeId,
                                    @RequestParam("serveId") String serveId) {
        Prize data = adminClient.prizeDetail(prizeId).getData();
        if (null == data) {
            return R.fail(adminClient.prizeDetail(prizeId).getMsg());
        }
        String prizeMoney;
        if (data.getPrizeName().contains(Constants.SUBSIDY_MONEY)) {
            prizeMoney = data.getPrizeName().substring(Constants.ONE);
        } else {
            prizeMoney = "0";
        }
        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);
        if (data.getPrizeType() == 1) {
            // 查询服务回收补贴金
            RecoveryServe recoveryServe = recoveryServeService.getById(serveId);
            prizeMoney = recoveryServe.getRecycleSubsidy().toString();
        } else {
            prizeMoney = "0";
        }