12.10

luodangjia

2024-12-10 31ce6be2d56798d9509e6d90335999064351f7f3

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

@@ -2,10 +2,7 @@


import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.OrderCrossCity;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.model.Reassign;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
//import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
@@ -60,8 +57,8 @@
//    @Autowired
//    private ICBCPayUtil icbcPayUtil;



    @Autowired
    private IOrderTransferService orderTransferService;
    /**
     * 获取订单列表
     * @param type
@@ -100,6 +97,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 +133,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();
@@ -160,6 +165,9 @@
            }
            if(orderType == 2){//跨城
                return orderCrossCityService.cancelOrder(orderId);
            }
            if(orderType == 7){//接送机
                return orderTransferService.cancelOrder(orderId);
            }
            return ResultUtil.success();
        }catch (Exception e){
@@ -294,6 +302,12 @@
                    orderPrivateCar.setOldState(null);
                    orderPrivateCarService.updateAllColumnById(orderPrivateCar);
                }
                if(reassign.getOrderType() == 7){//专车
                    OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
                    orderPrivateCar.setState(orderPrivateCar.getOldState());
                    orderPrivateCar.setOldState(null);
                    orderTransferService.updateAllColumnById(orderPrivateCar);
                }
                if(reassign.getOrderType() == 3){//跨城
                    OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
                    orderCrossCity.setState(orderCrossCity.getOldState());