提交修改后的版本

puzhibing

2023-05-18 c54be562403989ae722ce4e12b640d4a44b5dcb3

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -138,8 +138,8 @@
    @Autowired
    private IOrderPositionService orderPositionService;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;
//    @Autowired
//    private ChinaMobileUtil chinaMobileUtil;

    @Autowired
    private IDriverServiceService driverServiceService;
@@ -277,11 +277,11 @@
            //调用移动的小号接口
            Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
            Region region = regionMapper.query(geocode1.get("districtCode"));
            Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
            if(String.valueOf(map.get("code")).equals("200")){
                orderTaxi.setTelX(map.get("telX"));
                orderTaxi.setBindId(map.get("bindId"));
            }
//            Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//            if(String.valueOf(map.get("code")).equals("200")){
//                orderTaxi.setTelX(map.get("telX"));
//                orderTaxi.setBindId(map.get("bindId"));
//            }

            driver.setState(3);
            driverService.updateById(driver);
@@ -527,9 +527,9 @@
                userInfoService.updateById(userInfo);

                //解除小号绑定
                if(orderTaxi.getBindId() != null){
                    chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
                }
//                if(orderTaxi.getBindId() != null){
//                    chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
//                }

                orderTaxi.setState(10);
                orderTaxi.setTelX("");
@@ -1210,9 +1210,9 @@
            transactionDetailsService.saveData(orderTaxi.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 2, query.getOrderId());
            orderTaxi.setState(10);
            //解除小号绑定
            if(orderTaxi.getBindId() != null){
                chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
            }
//            if(orderTaxi.getBindId() != null){
//                chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
//            }
            orderTaxi.setBindId("");
            orderTaxi.setTelX("");
            this.updateById(orderTaxi);