From 0ef491bf8f4b52e9af4ba6de05c677b54eb8e2d7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 18:09:50 +0800
Subject: [PATCH] 开发司机跨城代付功能

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 25ee59b..0e70a40 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1464,9 +1464,12 @@
             @ApiImplicitParam(value = "支付端(1=用户APP端,2=司机APP端,3=用户小程序端)", name = "type", required = true, dataType = "int"),
             @ApiImplicitParam(value = "小程序支付成功跳转路径", name = "path", required = true, dataType = "String"),
             @ApiImplicitParam(value = "设备当前IP地址", name = "ip", required = true, dataType = "String"),
+            @ApiImplicitParam(value = "支付角色(1=乘客,2=司机)", name = "role", required = true, dataType = "int"),
+            @ApiImplicitParam(value = "jscode", name = "jscode", required = true, dataType = "String"),
             @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
     })
-    public ResultUtil payTaxiOrder1(Integer payType, Integer orderId, Integer orderType, Integer objectId, Integer objectType, Integer type, String path, String ip, HttpServletRequest request) {
+    public ResultUtil payTaxiOrder1(Integer payType, Integer orderId, Integer orderType, Integer objectId, Integer objectType, Integer type,
+                                    String path, String ip, Integer role, String jscode, HttpServletRequest request) {
         System.out.println(objectType);
         System.out.println(objectId);
         try {
@@ -1480,7 +1483,7 @@
                 case 2:
                     return orderTaxiService.payTaxiOrder1(payType, orderId, objectId, objectType, type, path, ip);
                 case 3:
-                    ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type, path, ip);
+                    ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type, path, ip, role, jscode);
 
                     orderCrossCityService.promotion(orderId);
 

--
Gitblit v1.7.1