From cfc72c5a140e6f3dd750b28b9566c64c713806bc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 九月 2024 13:50:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 22 ++++++++++++++++------
1 files changed, 16 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 4c1927c..9e67183 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
@@ -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 = {"小程序-充电记录"})
@@ -784,16 +787,23 @@
return resultList;
}
-
-
+
+
/**
* 硬件充电结束后的处理逻辑
* @param code
*/
@PostMapping("/endCharge")
public void endCharge(@RequestParam("code") String code){
- chargingOrderService.endCharge(code);
+ chargingOrderService.endCharge(code, 2);
}
-
+ /**
+ * 硬件异常结束充电后的处理逻辑
+ * @param code
+ */
+ @PostMapping("/excelEndCharge")
+ public void excelEndCharge(@RequestParam("code") String code){
+ chargingOrderService.excelEndCharge(code);
+ }
}
--
Gitblit v1.7.1