From 8598b95c1023355ca40c351cbc5046e01b826156 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 26 八月 2025 11:20:58 +0800
Subject: [PATCH] 8.26
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index f15375b..a0b7608 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -380,10 +380,10 @@
*/
@ResponseBody
@PostMapping("/api/taxi/pushOrderTaxi")
- @ApiOperation(value = "继续等待推单操作", tags = {"用户端-出租车", "用户端-专车"}, notes = "")
+ @ApiOperation(value = "继续等待推单操作", tags = {"用户端-出租车", "用户端-专车","用户端-跨城"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3-跨城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil pushOrderTaxi(Integer id, Integer orderType){
@@ -393,6 +393,8 @@
return orderPrivateCarService.pushOrderPrivateCar(id);
case 2:
return orderTaxiService.pushOrderTaxi(id);
+// case 3:
+// return orderCrossCityService.pushOrderCrossCity(id);
}
return ResultUtil.success();
}catch (Exception e){
@@ -1289,6 +1291,7 @@
orderCrossCityService.payOrderCrossCityCallback(id, order_id, 1);
break;
case 4:
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
break;
case 5:
break;
@@ -1357,16 +1360,14 @@
@PostMapping("/base/wxPayOrderLogisticsSpread")
public void wxPayOrderLogisticsSpread(HttpServletRequest request, HttpServletResponse response){
try {
- Map<String, String> map = icbcPayUtil.payCallback(request);
+ System.err.println("完成订单微信支付回调");
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ System.out.println("wx支付信息："+map);
if(null != map){
String out_trade_no = map.get("out_trade_no");
String order_id = map.get("order_id");
- String s = icbcPayUtil.queryTransaction("", order_id);
- if(s.equals("0")){
- icbcPayUtil.answer(response);//回调应答
- }
- if(ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(order_id) && s.equals("0")){
- String[] split = out_trade_no.split(",");
+ if(ToolUtil.isNotEmpty(out_trade_no) ){
+ String[] split = out_trade_no.split("_");
Integer id = Integer.valueOf(split[0]);
Integer type = Integer.valueOf(split[1]);
orderLogisticsService.payOrderLogisticsSpreadCallback(id, order_id, 1);
--
Gitblit v1.7.1