xuhy
2 天以前 185b90fbbd29bcf520456196d758079e60b325eb
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -853,7 +853,17 @@
                                         @RequestParam("attach") String attach) {
        chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
    }
    /**
     * 支付宝H5支付成功后的回调
     */
    @ResponseBody
    @PostMapping(value = "/chargingOrderALIH5Callback")
    public void chargingOrderALIH5Callback(@RequestParam("out_trade_no") String out_trade_no,
                                         @RequestParam("transaction_id") String transaction_id,
                                         @RequestParam("attach") String attach) {
        chargingOrderService.chargingOrderCallback(3, out_trade_no, transaction_id, attach);
    }
    
    /**
     *
@@ -2381,4 +2391,20 @@
        return R.ok(chargingOrderService.getSumDegreeBySiteIds(SiteIds));
    }
    @GetMapping(value = "/getOrderIdByUserId")
    @ApiOperation(value = "H5查询当前用户正在充电中的订单id集合", tags = {"H5-首页-用户充电订单信息"})
    public R<String> getOrderIdByUserId() {
        Long userId = tokenService.getLoginUserApplet().getUserId();
        TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
                .eq(TChargingOrder::getAppUserId, userId)
                .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4))
                .orderByDesc(TChargingOrder::getCreateTime)
                .last("LIMIT 1"));
        if(Objects.isNull(chargingOrder)){
            return R.ok();
        }
        return R.ok(String.valueOf(chargingOrder.getId()));
    }
}