From 2d338a0e7480330ecb78e6d5471c2f47867b0a80 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 ca25338..7bf1902 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;
@@ -141,6 +142,12 @@
public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) {
return chargingOrderService.payOrderQuery(payOrderQueryDto);
}
+ @ResponseBody
+ @PostMapping(value = "/pay/order/refund")
+ @ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"})
+ public R refund(@RequestBody PayOrderRefundDto payOrderQueryDto) {
+ return chargingOrderService.payRefund(payOrderQueryDto);
+ }
@ResponseBody
@GetMapping(value = "/pay/order/pay/detail")
@@ -250,8 +257,15 @@
@ResponseBody
@PostMapping(value = "/pay/order/refund/list")
- @ApiOperation(value = "充电信息", tags = {"管理后台-支付订单-退款订单"})
+ @ApiOperation(value = "列表", tags = {"管理后台-支付订单-退款订单"})
public R<PageInfo<TChargingOrderRefund>> refundList(@RequestBody ChargingRefundDto chargingRefundDto) {
+ return chargingOrderService.getRefundList(chargingRefundDto);
+
+ }
+ @ResponseBody
+ @PostMapping(value = "/pay/order/refund/list1")
+ @ApiOperation(value = "列表1", tags = {"管理后台-支付订单-退款订单"})
+ public R<PageInfo<TChargingOrderRefund>> refundList1(@RequestBody ChargingRefundDto chargingRefundDto) {
return chargingOrderService.getRefundList(chargingRefundDto);
}
@@ -456,7 +470,7 @@
* @param request
*/
@ResponseBody
- @PostMapping(value = "/chargingOrderALICallback")
+ @PostMapping(value = "/chargingOrderStartupFailureWxRefund")
public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){
WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
if(null != data){
@@ -638,7 +652,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)));
+ }
+
@@ -771,4 +795,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);
+ }
}
--
Gitblit v1.7.1