From 6ddfb0ce8f781457b59689d08218d2ea617c5925 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 10:02:43 +0800
Subject: [PATCH] 完善功能
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 0e0089d..4c1927c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1,4 +1,5 @@
package com.ruoyi.order.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists;
import java.math.BigDecimal;
@@ -374,10 +375,7 @@
.eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
return R.ok(one);
}
-
-
-
-
+
@ResponseBody
@GetMapping(value = "/getMyChargingOrderList")
@ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
@@ -462,7 +460,7 @@
* @param request
*/
@ResponseBody
- @PostMapping(value = "/chargingOrderALICallback")
+ @PostMapping(value = "/chargingOrderStartupFailureWxRefund")
public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){
WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
if(null != data){
@@ -644,7 +642,17 @@
public void chargeMonitoring(@RequestBody UploadRealTimeMonitoringDataQuery query){
chargingOrderService.chargeMonitoring(query);
}
-
+ /**
+ * 通过流水号查询订单
+ * @param code
+ * @return
+ */
+ @PostMapping(value = "/getOrderByCode/{code}")
+ public R<TChargingOrder> getOrderByCode(@PathVariable("code") String code){
+ return R.ok(chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getCode,code)));
+ }
+
@@ -776,5 +784,16 @@
return resultList;
}
+
+
+ /**
+ * 硬件充电结束后的处理逻辑
+ * @param code
+ */
+ @PostMapping("/endCharge")
+ public void endCharge(@RequestParam("code") String code){
+ chargingOrderService.endCharge(code);
+ }
+
}
--
Gitblit v1.7.1