Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-05 cfc72c5a140e6f3dd750b28b9566c64c713806bc

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

@@ -144,7 +144,7 @@
    }
    @ResponseBody
    @PostMapping(value = "/pay/order/refund")
    @ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
    @ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"})
    public R refund(@RequestBody PayOrderRefundDto payOrderQueryDto) {
        return chargingOrderService.payRefund(payOrderQueryDto);
    }
@@ -375,7 +375,10 @@
                .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
        return R.ok(one);
    }

    
    
    
    
    @ResponseBody
    @GetMapping(value = "/getMyChargingOrderList")
    @ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
@@ -460,7 +463,7 @@
     * @param request
     */
    @ResponseBody
    @PostMapping(value = "/chargingOrderALICallback")
    @PostMapping(value = "/chargingOrderStartupFailureWxRefund")
    public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){
        WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
        if(null != data){
@@ -785,4 +788,22 @@
        return resultList;
    }


    /**
     * 硬件充电结束后的处理逻辑
     * @param code
     */
    @PostMapping("/endCharge")
    public void endCharge(@RequestParam("code") String code){
        chargingOrderService.endCharge(code, 2);
    }

    /**
     * 硬件异常结束充电后的处理逻辑
     * @param code
     */
    @PostMapping("/excelEndCharge")
    public void excelEndCharge(@RequestParam("code") String code){
        chargingOrderService.excelEndCharge(code);
    }
}