From e9e42b621afdf6ac94f5327ee843b32b10a401b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 04 八月 2026 17:45:14 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/api/mini/MiniTourOrderController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/api/mini/MiniTourOrderController.java b/backend/src/main/java/com/tourguide/api/mini/MiniTourOrderController.java
index c198ea9..6359f22 100644
--- a/backend/src/main/java/com/tourguide/api/mini/MiniTourOrderController.java
+++ b/backend/src/main/java/com/tourguide/api/mini/MiniTourOrderController.java
@@ -5,7 +5,9 @@
import com.tourguide.modules.order.dto.MiniOrderListResponse;
import com.tourguide.modules.order.dto.MiniOrderCreateRequest;
import com.tourguide.modules.order.dto.MiniOrderSummaryResponse;
+import com.tourguide.modules.order.dto.MiniPaymentResponse;
import com.tourguide.modules.order.dto.TourOrderResponse;
+import com.tourguide.modules.order.service.HuifuMiniPaymentService;
import com.tourguide.modules.order.service.MiniTourOrderCommandService;
import com.tourguide.modules.order.service.MiniTourOrderService;
import com.tourguide.security.AppUserPrincipal;
@@ -29,11 +31,14 @@
public class MiniTourOrderController {
private final MiniTourOrderService orderService;
private final MiniTourOrderCommandService commandService;
+ private final HuifuMiniPaymentService paymentService;
public MiniTourOrderController(MiniTourOrderService orderService,
- MiniTourOrderCommandService commandService) {
+ MiniTourOrderCommandService commandService,
+ HuifuMiniPaymentService paymentService) {
this.orderService = orderService;
this.commandService = commandService;
+ this.paymentService = paymentService;
}
/**
@@ -74,18 +79,18 @@
}
/**
- * 确认当前游客的订单支付成功，将订单从待支付流转为等待导游接单。
- * 当前用于小程序模拟支付完成；正式微信支付接入后应改由服务端支付回调确认。
+ * 创建汇付微信小程序支付订单并返回调起微信支付所需参数。
+ * 本接口不会直接修改订单为已支付，订单状态只由验签成功的汇付异步回调推进。
*
* @param principal 安全过滤器解析出的当前游客身份
* @param id 当前游客订单主键
- * @return 支付完成后的订单详情
+ * @return 微信小程序支付参数
*/
@PutMapping("/{id}/pay")
- public ApiResponse<TourOrderResponse> pay(
+ public ApiResponse<MiniPaymentResponse> pay(
@AuthenticationPrincipal AppUserPrincipal principal,
@PathVariable Long id) {
- return ApiResponse.success(commandService.confirmPayment(principal.getUserId(), id));
+ return ApiResponse.success(paymentService.create(principal.getUserId(), id));
}
@GetMapping("/active")
--
Gitblit v1.7.1