update

liujie

2 天以前 c0ffabe6c300432c2492485a47f88e990f9c7f8e

update

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

@@ -629,7 +629,7 @@
        Double lat = driverPositionWarpper.getLat();
        Integer driverId = driverPositionWarpper.getDriverId();
        Integer orderId = driverPositionWarpper.getOrderId();
        redisUtil.setStrValue("daijia: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)) {

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

@@ -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);

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java

@@ -28,7 +28,7 @@

    Logger logger = LoggerFactory.getLogger("ServiceLog");
    
    private final String socket_uri = "http://192.168.110.85:6000";
    private final String socket_uri = "http://192.168.110.111:6000";



@@ -52,6 +52,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -87,6 +88,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -128,6 +130,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -165,6 +168,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -206,6 +210,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -243,6 +248,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -281,6 +287,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -315,6 +322,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -352,6 +360,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -387,6 +396,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
@@ -418,6 +428,7 @@
        params.put("msg", msg.toJSONString());
        params.put("id", id.toString());
        params.put("type", type.toString());
        params.put("bussinessType", "daijia");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java

@@ -19,13 +19,13 @@
    @ApiModelProperty("总行驶里程")
    private Double actualMileage;
    @ApiModelProperty("起步价")
    private Double startPrice;
    private Double startPrice=0.0;
    @ApiModelProperty("起步里程")
    private Double startDistance;
    private Double startDistance=0.0;
    @ApiModelProperty("超出起步里程")
    private Double overDriveDistance;
    private Double overDriveDistance=0.0;
    @ApiModelProperty("里程费")
    private Double mileageFee;
    private Double mileageFee=0.0;
    @ApiModelProperty("等待时长")
    private String waitTime;
    @ApiModelProperty("等待费")