From 8c16911f9f6b339f1373b89822455561f40ff80c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 九月 2024 10:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 953b629..13df8be 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;
@@ -105,8 +106,7 @@
private AliPaymentClient aliPaymentClient;
@Resource
private TShoppingOrderService shoppingOrderService;
- @Resource
-
+
@Resource
private AppUserClient appUserClient;
@@ -141,6 +141,12 @@
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
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
@@ -369,10 +375,7 @@
.eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
return R.ok(one);
}
-
-
-
-
+
@ResponseBody
@GetMapping(value = "/getMyChargingOrderList")
@ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
@@ -639,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)));
+ }
+
--
Gitblit v1.7.1