合并代码

puzhibing

3 天以前 6598b47440f5be4adc1c793bbfc9f187be50a179

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -548,7 +548,7 @@
                        .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));
                Double d = null;
                for (YouTuiDriver youTuiDriver : youTuiDrivers) {
                    String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
                    String value = redisUtil.getValue("daijia:DRIVER" + youTuiDriver.getDriverId());
                    if(ToolUtil.isEmpty(value)){
                        continue;
                    }
@@ -602,7 +602,7 @@
                        Double score = null;//评分
                        Double d = null;
                        for (Driver driver1 : drivers) {
                            String value = redisUtil.getValue("DRIVER" + driver1.getId());
                            String value = redisUtil.getValue("daijia:DRIVER" + driver1.getId());
                            if(ToolUtil.isEmpty(value)){
                                continue;
                            }
@@ -729,7 +729,7 @@
            return;
        }
        for (Driver driver1 : drivers) {
            String value = redisUtil.getValue("DRIVER" + driver1.getId());
            String value = redisUtil.getValue("daijia:DRIVER" + driver1.getId());
            if (ToolUtil.isEmpty(value)) {
                continue;
            }
@@ -752,7 +752,7 @@
    @Override
    public List<HallOrderList> queryOrderHall(Integer uid, Integer pageNum, Integer pageSize) throws Exception {
        pageNum = (pageNum - 1) * pageSize;
        String value = redisUtil.getValue("DRIVER" + uid);
        String value = redisUtil.getValue("daijia:DRIVER" + uid);
        List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
        List<HallOrderList> lists = new ArrayList<>();
        hallOrderLists.forEach(hallOrderList -> {
@@ -990,7 +990,7 @@
        if(ToolUtil.isEmpty(orderInfoWarpper.getAvatar())){
            orderInfoWarpper.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
        }
        String value = redisUtil.getValue("DRIVER" + uid);
        String value = redisUtil.getValue("daijia:DRIVER" + uid);
        orderInfoWarpper.setPickUpTime(0);
        if(ToolUtil.isNotEmpty(value)){
            Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
@@ -1203,7 +1203,7 @@
            return;
        }
        Integer driverId = order.getDriverId();
        String value = redisUtil.getValue("DRIVER" + driverId);
        String value = redisUtil.getValue("daijia:DRIVER" + driverId);
        if(order.getState() == 106 || order.getState() == 301){
            redisUtil.delSetValue("orderService", orderId.toString());
            return;
@@ -1250,7 +1250,7 @@
            return;
        }
        Integer driverId = order.getDriverId();
        String value = redisUtil.getValue("DRIVER" + driverId);
        String value = redisUtil.getValue("daijia:DRIVER" + driverId);
        if(order.getState() == 108 || order.getState() == 111){
            redisUtil.delSetValue("orderService_check", orderId.toString());
            return;
@@ -1538,22 +1538,22 @@
    public ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception {
        try {
            boolean lock = redisUtil.lock(orderId + "",5);
            if(!lock){
                int num1 = 1;
                while (num1 <= 10){
                    Thread.sleep(3000);//等待3秒
                    lock = redisUtil.lock(orderId + "",5);
                    if(lock){
                        break;
                    }else{
                        num1++;
                    }
                }
            }
            if(!lock){
                redisUtil.unlock(orderId + "");
                return ResultUtil.error("请稍后重试");
            }
//            if(!lock){
//                int num1 = 1;
//                while (num1 <= 10){
//                    Thread.sleep(3000);//等待3秒
//                    lock = redisUtil.lock(orderId + "",5);
//                    if(lock){
//                        break;
//                    }else{
//                        num1++;
//                    }
//                }
//            }
//            if(!lock){
//                redisUtil.unlock(orderId + "");
//                return ResultUtil.error("请稍后重试");
//            }

            Order order = this.selectById(orderId);
            if(state == 107 && order.getState() != 106){
@@ -1562,7 +1562,7 @@
            }
            if(state == 108 && order.getState() != 107){
                redisUtil.unlock(orderId + "");
                return ResultUtil.error("操作失败，请刷新数据");
//                return ResultUtil.error("操作失败，请刷新数据");
            }

            order.setState(state);