黔云通代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2 天以前 ba6b508a44cb1f0730c6a27a5d73b8d2ae8f1d4b 
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java


@@ -559,7 +559,7 @@


        if(null == driverWork){


            return ResultUtil.error("请先上班");


        }


        String value = redisUtil.getValue("DRIVER" + uid);


        String value = redisUtil.getValue("daijia:DRIVER" + uid);


        List<String> list = new ArrayList<>();


        if(ToolUtil.isNotEmpty(value)){


            String[] split = value.split(",");


@@ -587,7 +587,7 @@


                        i = 3;


                    }


                }


                String value1 = redisUtil.getValue("DRIVER" + s.getDriverId());


                String value1 = redisUtil.getValue("daijia:DRIVER" + s.getDriverId());


                if(s.getDriverId().compareTo(uid) != 0 && ToolUtil.isNotEmpty(value1)){


                    list.add(s.getLocation().getX() + "," + s.getLocation().getY()+","+i+","+driver.getName());


                }


@@ -629,7 +629,7 @@


        Double lat = driverPositionWarpper.getLat();


        Integer driverId = driverPositionWarpper.getDriverId();


        Integer orderId = driverPositionWarpper.getOrderId();


        redisUtil.setStrValue("DRIVER" + driverId, lon + "," + lat, 30);


        redisUtil.setStrValue("daijia:DRIVER" + driverId, lon + "," + lat, 30);


        Query query = Query.query(Criteria.where("driverId").is(driverId));


        Location old = this.mongoTemplate.findOne(query, Location.class);


        if (Objects.isNull(old)) {


@@ -797,6 +797,8 @@


                .eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));


        if(null != youTuiDriver){


            driverInfo.setYouTuiEnd(youTuiDriver.getType() == 1 ? youTuiDriver.getFailureTime().getTime() : youTuiDriver.getEndTime().getTime());


            driverInfo.setType(youTuiDriver.getType());


            driverInfo.setSurplusQuantity(youTuiDriver.getSurplusQuantity());


        }


        List<Integer> state = Arrays.asList(107, 108, 109);


        int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT(createTime, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')"));