南通出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
2024-12-13 73b750200f25df08aa64124da49e7461f9de6653 
 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;


@@ -305,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());