From da9b7a52dbc6fcd2173efef90528d8fccc322554 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期五, 17 七月 2026 16:22:40 +0800
Subject: [PATCH] P1问题fix
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 9c4a40e..18d0dca 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
@@ -703,8 +703,6 @@
@PostMapping(value = "/chargingOrder")
@ApiOperation(value = "充电桩订单列表", tags = {"管理后台-订单管理"})
public AjaxResult<TCharingOrderVO> chargingOrder(@RequestBody ChargingOrderQuery dto) {
- List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
- dto.setUserIds(data);
TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
return AjaxResult.success(res);
}
@@ -954,6 +952,13 @@
return chargingOrderService.paymentChargingOrder(addChargingOrder);
}
+ @ResponseBody
+ @GetMapping(value = "/confirmIcbcPayment")
+ @ApiOperation(value = "主动确认工行充电支付结果", tags = {"小程序-扫一扫"})
+ public AjaxResult confirmIcbcPayment(@RequestParam("orderCode") String orderCode) {
+ return chargingOrderService.confirmIcbcPayment(orderCode);
+ }
+
@RequiresPermissions(value = {"/chargingPileOrder", "/paymentOrder/refund"}, logical = Logical.AND)
@PostMapping("/icbc/fund/payment-query")
@ApiOperation(value = "管理后台查询工行支付订单", tags = {"后台-充电桩订单"})
--
Gitblit v1.7.1