From 8c03ae07df6e094ab3420017d76bcd9ad0a8dac0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 10:44:31 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 5 +++--
1 files changed, 3 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 f011021..91a8431 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
@@ -433,6 +433,7 @@
@ResponseBody
@PostMapping(value = "/chargingOrderWXCallback")
public void chargingOrderWXCallback(HttpServletRequest request) {
+ System.err.println("-------------------支付回调通知-------------------");
Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
if (null != data) {
String out_trade_no = data.get("out_trade_no").toString();
@@ -625,7 +626,7 @@
@ResponseBody
@PostMapping(value = "/watch/chargingOrder")
@ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"})
- public AjaxResult<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingOrderQuery dto) {
+ public R<List<ChargingOrderAndUploadRealTimeMonitoringDataDto>> watchChargingOrder(@RequestBody ChargingOrderQuery dto) {
Integer page = dto.getPageCurr();
Integer pageSize = dto.getPageSize();
List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
@@ -652,7 +653,7 @@
}
- return AjaxResult.success(res);
+ return R.ok(dtos);
}
--
Gitblit v1.7.1