Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

6 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

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

@@ -141,7 +141,7 @@
     * @throws Exception
     */
    @Override
    public synchronized ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
    public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
        if(null == orderPrivateCar){
            return ResultUtil.error("订单已被抢了");
@@ -215,16 +215,16 @@
        orderPrivateCar.setSnatchOrderTime(new Date());

        //调用高德创建轨迹
        String s = gdFalconUtil.selectTerminal(driver.getPhone());
        String track = gdFalconUtil.createTrack(s);
        orderPrivateCar.setTrackId(track);
//        String s = gdFalconUtil.selectTerminal(driver.getPhone());
//        String track = gdFalconUtil.createTrack(s);
//        orderPrivateCar.setTrackId(track);

        //调用移动的小号接口
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
            if(String.valueOf(map.get("code")).equals("200")){
            orderPrivateCar.setTelX(map.get("telX"));
            orderPrivateCar.setBindId(map.get("bindId"));
        }
//        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
//            if(String.valueOf(map.get("code")).equals("200")){
//            orderPrivateCar.setTelX(map.get("telX"));
//            orderPrivateCar.setBindId(map.get("bindId"));
//        }

        this.updateById(orderPrivateCar);

@@ -293,17 +293,18 @@

        systemNoticeService.addSystemNotice(2, "您已成功抢得快车订单，请及时联系客户！", orderPrivateCar.getDriverId(), 1);
        systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId(), 1);

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){
    
        if(pushMinistryOfTransport){
            new Thread(new Runnable() {
                @Override
                public void run() {
                    //上传数据
                    pushMinistryOfTransportUtil.orderCreate(orderId);
                    pushMinistryOfTransportUtil.orderMatch(orderId);
                }
            }
        }).start();
            }).start();
        }
        

        return ResultUtil.success(orderPrivateCar.getId());
    }