java/ZhaoYangChuXing.git

昭阳出行

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Pu Zhibing

3 天以前 ca73af429b960124ab9b32ccfd5572e3f1df2bc2

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -442,7 +442,7 @@
                                        // 判断司机是否有订单进行中
                                        long count = orderPrivateCarMapper.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driver1.getId())
                                                .in("state", Arrays.asList(2, 3, 4, 5, 6, 11)).eq("isDelete", 1));
                                        if(0 != count){
                                        if(count > 0){
                                            continue;
                                        }
                                        // 判断该司机是否有30分钟内预约单
@@ -462,7 +462,6 @@
                                            }
                                        }
                                    }

                                    if(!ds.isEmpty()){
                                        ds.sort(new Comparator<Driver>() {
                                            @Override

			@@ -442,7 +442,7 @@
			// 判断司机是否有订单进行中
			long count = orderPrivateCarMapper.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driver1.getId())
			.in("state", Arrays.asList(2, 3, 4, 5, 6, 11)).eq("isDelete", 1));
			if(0 != count){
			if(count > 0){
			continue;
			}
			// 判断该司机是否有30分钟内预约单
			@@ -462,7 +462,6 @@
			}
			}
			}

			if(!ds.isEmpty()){
			ds.sort(new Comparator<Driver>() {
			@Override