From da780b14b8db78043d2c0f27d3bfd73111e6d550 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 04 六月 2026 15:36:54 +0800
Subject: [PATCH] 更新配置文件和线路模型增加调度电话字段
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 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 f3bbe25..0bbdacc 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
@@ -1720,40 +1720,43 @@
*/
@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();
+ public Map<String, Object> cbyzxCancelOrderTaxi(HttpServletRequest request, HttpServletResponse response) {
+ // 不做处理 退款已同步处理
+ return buildCbyzxCallbackResponse(0, "success");
- 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();
- }
+// 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();
+// }
}
/**
@@ -1864,7 +1867,7 @@
public Map<String, Object> cbyzxPayOrderTaxi(@RequestBody String params, HttpServletRequest request) {
try {
JSONObject payload = JSONObject.parseObject(params);
- log.info("创博优完成订单支付回调，outRequestNo={}, paymentOrderId={}, paidTime={}, paidAmount={}",
+ log.error("创博优完成订单支付回调，outRequestNo={}, paymentOrderId={}, paidTime={}, paidAmount={}",
cbyzxOrderPayHelper.extractOutRequestNo(payload),
cbyzxOrderPayHelper.extractThirdPartyOrderNo(payload),
payload == null ? null : payload.getString("paidTime"),
@@ -1916,7 +1919,7 @@
return buildCbyzxCallbackResponse(1, "order not found");
}
if (orderRide.getState() == null || orderRide.getState() != 2) {
- orderRide.setOutNum(orderId);
+// orderRide.setOutNum(orderId);
orderRide.setPayTime(new Date());
orderRide.setPayType(2);
orderRide.setState(2);
--
Gitblit v1.7.1