From 76cee87b6604ee782c1c25292642c768ad223a98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 21:28:13 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 72bc9ac..f0a9528 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -120,8 +120,8 @@
@GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
- @GetMapping(value = "/financial/settlement/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time);
+ @GetMapping(value = "/financial/settlement/settlementTotalR/{time}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time);
/**
* 修改充电订单
@@ -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
@@ -181,14 +181,37 @@
* 修改安全检测数据
* @param securityDetection
*/
- @PostMapping("/t-shopping-order/securityDetection")
- void securityDetection(@RequestBody SecurityDetection securityDetection);
+ @PostMapping("/t-charging-order/securityDetection")
+ void securityDetection(@RequestBody SecurityDetectionVO securityDetection);
/**
* 远程启动充电应答
* @param message
*/
- @PostMapping("/t-shopping-order/startChargeSuccessfully")
- void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
+ @PostMapping("/t-charging-order/startChargeSuccessfully")
+ 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);
+
+ /**
+ * 获取充电订单数据
+ * @param order
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrder")
+ R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);
}
--
Gitblit v1.7.1