修改bug

Pu Zhibing

昨天 f3106694f7f9992391b26897571ff11462cfe475

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

@@ -556,6 +556,21 @@
                    orderCrossCity.setIsReassign(2);
                    orderCrossCityService.updateById(orderCrossCity);

                    if(ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){
                        Company company = companyService.selectById(driver.getCompanyId());
                        //中台修改订单状态
                        ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                        request.setOrderId(orderCrossCity.getTravelId());
                        request.setStatus(orderCrossCity.getState());
                        request.setDriverId(driver.getEmpId().toString());
                        if (2 == orderCrossCity.getPromotion()) {
                            Driver driver1 = driverService.selectById(orderCrossCity.getPromotionDriverId());
                            request.setPromoterId(driver1.getEmpId().toString());
                        }
                        request.setSupplierShopId(company.getEnterCode());
                        OrderUtil.modifyTravelItinerary(request);
                    }

                    //添加已收入明细
                    incomeService.saveData(1, orderCrossCity.getCompanyId(), 4, orderCrossCity.getId(), 3, reassign.getMoney());
                }
@@ -569,15 +584,15 @@
//                    jgPushUtil.push(2, "有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }
            if (reassign.getPayType() == 4) {

                String[] split1 = ids.split(",");
                resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0]));
                for (String id : split1) {
                    // TODO 司机云闪付 跨城改派调起云闪付
                    paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据
                }
            }
//            if (reassign.getPayType() == 4) {
//
//                String[] split1 = ids.split(",");
//                resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0]));
//                for (String id : split1) {
//                     TODO 司机云闪付 跨城改派调起云闪付
//                    paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据
//                }
//            }
        }
        return resultUtil;
    }
@@ -793,8 +808,9 @@
                    for (int j = 0; j < 6; j++) {
                        Boolean push = false;
                        for (int i = 1; i <= querys.size(); i++) {
                            num++;
                            int finalI = i;
                            PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
                            PushOrder pushOrder = querys.stream().filter(s -> s.getType() == finalI).findFirst().orElse(null);
                            System.out.println("pushOrder:" + pushOrder);
                            //获取空闲司机
                            List<Driver> list = driverService.queryIdleDriver(2, orderTaxi.getStartLon(), orderTaxi.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
@@ -822,7 +838,7 @@
                            }
                            Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                            Integer state = orderTaxi1.getState();
                            if (state != 1 || state!= 11) {
                            if (state != 1 && state != 11) {
                                orderIds.remove(orderTaxi.getId());
                                push = true;
                                break;
@@ -833,6 +849,9 @@
                                pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, 10);
                                orderTaxi1.setState(10);
                                orderTaxiService.updateById(orderTaxi1);
                                Driver driver = driverService.selectById(orderTaxi1.getDriverId());
                                driver.setState(2);
                                driverService.updateById(driver);
                                orderIds.remove(orderTaxi.getId());
                            }
                        }
@@ -922,6 +941,9 @@
                                pushUtil.pushReassignEndCancel(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 10);
                                orderPrivateCar.setState(10);
                                orderPrivateCarService.updateById(orderPrivateCar);
                                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                                driver.setState(2);
                                driverService.updateById(driver);
                                orderIds.remove(orderPrivateCar.getId());
                            }
                        }