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