6.5

luodangjia

2024-06-05 06c5eda038f967dc0c0261e16eff0ad1a18e41e7

 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -60,8 +60,8 @@
//    @Autowired
//    private ICBCPayUtil icbcPayUtil;



    @Autowired
    private IOrderTransferService orderTransferService;
    /**
     * 获取订单列表
     * @param type
@@ -100,6 +100,11 @@
            if(type == 2){//跨城
                list = orderCrossCityService.queryOrderList(search, orderSource, state, lineId, pageNum, size, uid);
            }

            if(type ==7){//接送机
                list = orderTransferService.queryOrderList(search, orderSource, state, pageNum, size, uid);
            }

            return ResultUtil.success(OrderListWarpper.getOrderListWarppers(list));
        }catch (Exception e){
            e.printStackTrace();
@@ -131,6 +136,9 @@
            if(orderType == 2){//跨城
                map = orderCrossCityService.queryOrderInfo(orderId);
            }
            if(orderType == 7){//专车
                map = orderTransferService.queryOrderInfo(orderId);
            }
            return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
@@ -161,6 +169,9 @@
            if(orderType == 2){//跨城
                return orderCrossCityService.cancelOrder(orderId);
            }
            if(orderType == 7){//接送机
                return orderTransferService.cancelOrder(orderId);
            }
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();