合并代码

Pu Zhibing

2024-10-16 c4664502dfdaffff555b532e65b51a57ac8b29c2

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java

@@ -160,10 +160,10 @@
     * @param success_time
     */
    @PostMapping("/t-charging-order/chargingOrderStartupFailureWxRefund")
    void chargingOrderStartupFailureWxRefund(@RequestParam("out_trade_no") String out_refund_no,
                                             @RequestParam("out_trade_no") String refund_id,
                                             @RequestParam("out_trade_no") String tradeState,
                                             @RequestParam("out_trade_no") String success_time);
    void chargingOrderStartupFailureWxRefund(@RequestParam("out_refund_no") String out_refund_no,
                                             @RequestParam("refund_id") String refund_id,
                                             @RequestParam("tradeState") String tradeState,
                                             @RequestParam("success_time") String success_time);
    /**
     * 管理后台取消购物订单后退款回调
     * @param out_refund_no
@@ -177,13 +177,12 @@
                                             @RequestParam("out_trade_no") String tradeState,
                                             @RequestParam("out_trade_no") String success_time);
    
    //todo 待监听完成后调用此方法
    /**
     * 修改安全检测数据
     * @param securityDetection
     */
    @PostMapping("/t-charging-order/securityDetection")
    void securityDetection(@RequestBody SecurityDetection securityDetection);
    void securityDetection(@RequestBody SecurityDetectionVO securityDetection);
    
    
    /**
@@ -191,5 +190,20 @@
     * @param message
     */
    @PostMapping("/t-charging-order/startChargeSuccessfully")
    void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
    void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
    
    
    /**
     * 停止充电应答处理
     * @param platformStopChargingReply
     */
    @PostMapping("/t-charging-order/terminateSuccessfulResponse")
    void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply);
    
    /**
     * 停止充电返回账单后计算费用
     * @param vo
     */
    @PostMapping("/t-charging-order/endChargeBillingCharge")
    void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
}