修改bug

Pu Zhibing

1 天以前 f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a

 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java

@@ -387,18 +387,18 @@
        orderCrossCity.setIsDelete(1);
        orderCrossCity.setIsReassign(1);
        //调用高德创建轨迹
        String s = gdFalconUtil.selectTerminal(driver.getPhone());
        String track = gdFalconUtil.createTrack(s);
        orderCrossCity.setTrackId(track);
//        String s = gdFalconUtil.selectTerminal(driver.getPhone());
//        String track = gdFalconUtil.createTrack(s);
//        orderCrossCity.setTrackId(track);

        //调用移动的小号接口
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
        Region region = regionMapper.query(geocode.get("districtCode"));
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
        if(String.valueOf(map.get("code")).equals("200")){
            orderCrossCity.setTelX(map.get("telX"));
            orderCrossCity.setBindId(map.get("bindId"));
        }
//        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
//        Region region = regionMapper.query(geocode.get("districtCode"));
//        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderCrossCity.setTelX(map.get("telX"));
//            orderCrossCity.setBindId(map.get("bindId"));
//        }
        if(orderCrossCityWarpper.getTravelMode() == 2){//包车
            orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
            orderCrossCity.setPeopleNumber(lineShiftDriver.getLaveSeat());
@@ -491,7 +491,8 @@
        Timer timer = new Timer();
        timer.schedule(timerTask, 30 * 60 * 1000);

        return payMoneyUtil.weixinpay("完成订单", "", orderCrossCity.getId() + "_3_" + UUIDUtil.getRandomCode(5), orderCrossCity.getOrderMoney().toString(), "/base/wxPayOrderTaxi", "NATIVE", userInfo.getAppletsOpenId());
//        return payMoneyUtil.weixinpay("完成订单", "", orderCrossCity.getId() + "_3_" + UUIDUtil.getRandomCode(5), orderCrossCity.getOrderMoney().toString(), "/base/wxPayOrderTaxi", "NATIVE", userInfo.getAppletsOpenId());
        return ResultUtil.success();
    }