From 4d4eb6e9addc4ce148e05f470beb016e507975ba Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 27 四月 2026 17:21:06 +0800
Subject: [PATCH] 小程序二维码 支持改价 自主行程查询

---
 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
index 95eb650..35a865c 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
@@ -19,11 +19,9 @@
 import com.stylefeng.guns.modular.system.util.rongyun.model.CloudRecordingCallback;
 import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
 import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +37,7 @@
 /**
  * 第三方支付回调控制器
  */
+@Slf4j
 @RestController
 @RequestMapping("/base")
 public class CallbackController {
@@ -71,15 +70,20 @@
      */
     @ResponseBody
     @PostMapping("/cbyzxPayOrderTaxi")
-    public Map<String, Object> cbyzxPayOrderTaxi(HttpServletRequest request) {
+    public Map<String, Object> cbyzxPayOrderTaxi(@RequestBody String params, HttpServletRequest request) {
         try {
-            JSONObject payload = cbyzxOrderPayHelper.parseCallbackRequest(request);
+            JSONObject payload = JSONObject.parseObject(params);
+            log.info("创博优完成订单支付回调,outRequestNo={}, paymentOrderId={}, paidTime={}, paidAmount={}",
+                    cbyzxOrderPayHelper.extractOutRequestNo(payload),
+                    cbyzxOrderPayHelper.extractThirdPartyOrderNo(payload),
+                    payload == null ? null : payload.getString("paidTime"),
+                    payload == null ? null : payload.getString("paidAmount"));
             if (payload == null) {
                 return buildCbyzxCallbackResponse(1, "invalid request");
             }
-            if (!cbyzxOrderPayHelper.isPaySuccess(payload)) {
-                return buildCbyzxCallbackResponse(1, cbyzxOrderPayHelper.extractMessage(payload));
-            }
+//            if (!cbyzxOrderPayHelper.isPaySuccess(payload)) {
+//                return buildCbyzxCallbackResponse(1, cbyzxOrderPayHelper.extractMessage(payload));
+//            }
 
             String outTradeNo = cbyzxOrderPayHelper.extractOutRequestNo(payload);
             if (ToolUtil.isEmpty(outTradeNo)) {

--
Gitblit v1.7.1