Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -459,6 +459,16 @@
                        //添加已收入明细
                        incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
                        break;
                    case 7:
                        TOrderTransfer orderTransfer = orderTransferService.selectById(reassign.getOrderId());
                        orderTransfer.setOldState(orderTransfer.getState());
                        orderTransfer.setState(11);
                        orderTransfer.setReassignNotice(2);
                        orderTransferService.updateById(orderTransfer);

                        //添加已收入明细
                        incomeService.saveData(1, orderTransfer.getCompanyId(), 4, orderTransfer.getId(), 7, reassign.getMoney());
                        break;
                    case 2:
                        OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
                        orderTaxi.setOldState(orderTaxi.getState());