8.18

liujie

2025-08-19 c7fe9d122a14fa2cd4463d4d1b0f14a6058f7955

 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){
@@ -988,9 +990,11 @@
                    list = orderTaxiService.queryCoupon(orderId, uid, pageNum, size);
                    break;
                case 3:
                    System.err.println("跨城");
                    list = orderCrossCityService.queryCoupon(orderId, uid, pageNum, size);
                    break;
            }
            System.err.println("跨城"+CouponWarpper.getCouponWarppers(list));
            return ResultUtil.success(CouponWarpper.getCouponWarppers(list));
        }catch (Exception e){
            e.printStackTrace();
@@ -1257,7 +1261,7 @@
    @PostMapping("/base/wxPayOrderTaxi")
    public void wxPayOrderTaxi(HttpServletRequest request, HttpServletResponse response){
        try {
            System.out.println("完成订单微信支付回调");
            System.err.println("完成订单微信支付回调");
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
            System.out.println("wx支付信息："+map);

@@ -1284,6 +1288,7 @@
                            orderTaxiService.payOrderTaxiCallback(id, order_id, 1);
                            break;
                        case 3:
                            orderCrossCityService.payOrderCrossCityCallback(id, order_id, 1);
                            break;
                        case 4:
                            break;