From 2d0e7dee5ece569db12811325321223358df3dec Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 14 四月 2026 18:49:15 +0800
Subject: [PATCH] 支付对接

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

diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 7ae7422..9684eeb 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1702,7 +1702,48 @@
             e.printStackTrace();
         }
     }
+    /**
+     * 取消订单微信回调
+     *
+     * @param request
+     */
+    @ResponseBody
+    @PostMapping("/base/cbyzxCancelOrderTaxi")
+    public void cbyzxCancelOrderTaxi(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+            if (null != map) {
+                String order_id = map.get("transaction_id");
+                String out_trade_no = map.get("out_trade_no");
+                String result = map.get("result");
+                if (ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(order_id)) {
+                    PrintWriter out = response.getWriter();
+                    out.write(result);
+                    out.flush();
+                    out.close();
 
+                    String[] split = out_trade_no.split("_");
+                    Integer id = Integer.valueOf(split[0]);
+                    Integer type = Integer.valueOf(split[1]);
+                    switch (type) {
+                        case 1:
+                            orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 1);
+                            break;
+                        case 2:
+                            orderTaxiService.payCancelOrderTaxi(id, order_id, 1);
+                            break;
+                        case 3:
+                            orderCrossCityService.payCancelOrderCrossCity(id, order_id, 1);
+                            break;
+                    }
+                }
+//                cloudPay(map.get("total_fee"),map.get("transaction_id"),1);
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     /**
      * 取消订单支付宝回调
@@ -1809,9 +1850,9 @@
      */
     @ResponseBody
     @PostMapping("/base/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("创博优完成订单支付回调,notify_type={}, out_trade_no={}, trade_no={}, trade_status={}",
                     cbyzxOrderPayHelper.extractNotifyType(payload),
                     cbyzxOrderPayHelper.extractOutRequestNo(payload),

--
Gitblit v1.7.1