DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -108,17 +108,38 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ if(s.equals(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ if(s.equals(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ if(s.equals(frenchName)){ collect.add(city1.getId()); break; } } } if(collect.size() == 0){ for (City city1 : cities1) { String chineseName = city1.getChineseName(); String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ collect.add(city1.getId()); break; } } } } @@ -148,21 +169,42 @@ String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ if(s.equals(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ if(s.equals(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ if(s.equals(frenchName)){ collect.add(city1.getId()); break; } } } if(collect.size() == 0){ for (City city1 : cities1) { String chineseName = city1.getChineseName(); String englishName = city1.getEnglishName(); String frenchName = city1.getFrenchName(); for (String s : city) { if(s.contains(chineseName)){ collect.add(city1.getId()); break; } if(s.contains(englishName)){ collect.add(city1.getId()); break; } if(s.contains(frenchName)){ collect.add(city1.getId()); break; } } } } if(collect.size() == 0){ return null; } return companyMapper.query1(collect); DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -346,7 +346,7 @@ driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverMapper.updateById(driver); if(ToolUtil.isNotEmpty(driver.getEmail())){ if(list.size() > 0 && ToolUtil.isNotEmpty(driver.getEmail())){ String path = templatePath + "driver/index.html"; Document document = Jsoup.parse(new File(path), "UTF-8"); if(1 == language){ @@ -536,7 +536,7 @@ driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driverMapper.updateById(driver); if(ToolUtil.isNotEmpty(driver.getEmail())){ if(list.size() > 0 && ToolUtil.isNotEmpty(driver.getEmail())){ Driver finalDriver = driver; BigDecimal finalBigDecimal = bigDecimal; new Thread(new Runnable() { DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -225,9 +225,10 @@ PushOrder pushOrder = pushOrderService.querys(1, 1, company.getId()).get(0); //获取空闲司机 List<Driver> list = driverService.queryIdleDriver(orderPrivateCar.getUserId(), 1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机 System.err.println("【" + orderPrivateCar.getId() + "】空闲司机：" + JSON.toJSONString(list)); System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派空闲司机：" + JSON.toJSONString(list)); drivers = list.stream().filter(d -> !d.getId().equals(orderPrivateCar.getDriverId())).collect(Collectors.toList()); if(drivers.size() > 0) {//有司机，直接指派给司机 System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派候选司机：" + JSON.toJSONString(drivers)); Driver dr = null; if (drivers.size() > 1) { List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机 @@ -269,10 +270,11 @@ } else { dr = drivers.get(0); } System.err.println("【" + orderPrivateCar.getId() + "】订单改派-指派司机：" + JSON.toJSONString(dr)); Driver driver1 = driverService.selectById(dr.getId()); DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId()) .eq("state", 1).like("type", "1")); if(driver.getState() == 2 && null != driverWork) { if(driver1.getState() == 2 && null != driverWork) { String text = ""; reassign.setState(3); reassign.setNowDriverId(driver1.getId()); @@ -571,9 +573,10 @@ PushOrder pushOrder1 = pushOrderService.querys(1, 1, company1.getId()).get(0); //获取空闲司机 List<Driver> list1 = driverService.queryIdleDriver(orderLogistics.getUserId(), orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder1.getPushDistance(), null);//所有附近空闲司机 System.err.println("【" + orderLogistics.getId() + "】空闲司机：" + JSON.toJSONString(list1)); System.err.println("【" + orderLogistics.getId() + "】订单改派-指派空闲司机：" + JSON.toJSONString(list1)); drivers = list1.stream().filter(d -> !d.getId().equals(orderLogistics.getDriverId())).collect(Collectors.toList()); if(drivers.size() > 0){//有司机，直接指派给司机 System.err.println("【" + orderLogistics.getId() + "】订单改派-指派候选司机：" + JSON.toJSONString(drivers)); Driver dr = null; if(drivers.size() > 1){ List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机 @@ -615,7 +618,7 @@ }else{ dr = drivers.get(0); } System.err.println("【" + orderLogistics.getId() + "】订单改派-指派司机：" + JSON.toJSONString(dr)); Driver driver1 = driverService.selectById(dr.getId()); DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()) .eq("state", 1).like("type", "4")); DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -48,9 +48,9 @@ spring: datasource: url: jdbc:mysql://172.16.0.4:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: i-go password: HjKbXilb9zajmXbl url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: root password: _6)S]<vpfvj?N#t2 db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat
@@ -48,9 +48,9 @@ spring: datasource: url: jdbc:mysql://172.16.0.4:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: i-go password: HjKbXilb9zajmXbl url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0 username: root password: _6)S]<vpfvj?N#t2 db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat
@@ -208,6 +208,12 @@ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已完成" onfocus="TUser.tooltip()">已完成</p>'] } else if (row.state == 10){ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已取消" onfocus="TUser.tooltip()">已取消</p>'] } else if (row.state == 11){ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="改派中" onfocus="TUser.tooltip()">改派中</p>'] } else if (row.state == 12){ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="取消待支付" onfocus="TUser.tooltip()">取消待支付</p>'] } else if (row.state == 13){ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="补差价" onfocus="TUser.tooltip()">补差价</p>'] } } return btn;
