修改bug

Pu Zhibing

1 天以前 ab564273ec5349d3dd3f71049a4c2738f8b9ebc6

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -38,6 +38,8 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.*;

/**
@@ -128,9 +130,18 @@
        //获取证联数据
        if(null == driver.getCustId() || 0 == driver.getAccOpenFlag()){
            TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
            tradeTerminalInfo.setIp("127.0.0.1");
            tradeTerminalInfo.setTerminal("1");
            tradeTerminalInfo.setMac("");
            InetAddress inetAddress = InetAddress.getLocalHost();
            String ip = inetAddress.getHostAddress();
            tradeTerminalInfo.setIp(ip);
            NetworkInterface networkInterface = NetworkInterface.getByInetAddress(inetAddress);
            byte[] mac = networkInterface.getHardwareAddress();
            StringBuilder macAddress = new StringBuilder();
            for (int i = 0; i < mac.length; i++) {
                macAddress.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? "-" : ""));
            }
            
            tradeTerminalInfo.setMac(macAddress.toString());
            ZLUserInfo userInfo = ZhengLianUtil.getUserInfo(driver.getEmpId().toString(), tradeTerminalInfo);
            if(null != userInfo){
                driver.setCustId(userInfo.getCustId());
@@ -375,9 +386,15 @@
                }
                break;
            case 2://出租
                OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
                if(null != orderPrivateCar && orderPrivateCar.getType() == 3){
                    map = orderPrivateCarService.queryPushOrder(orderId);

                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                if(null != orderTaxi && orderTaxi.getType() == 2){
                    OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
                    if(null != orderPrivateCar && orderPrivateCar.getType() == 3){
                        map = orderPrivateCarService.queryPushOrder(orderId);
                    }else{
                        map = orderTaxiService.queryPushOrder(orderId);
                    }
                }else{
                    map = orderTaxiService.queryPushOrder(orderId);
                }
@@ -385,9 +402,7 @@
                // TODO: 2023/11/4 无法修改
                String distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order1, 1).get("distance");
                map.put("startDistance", ToolUtil.isNotEmpty(distance1) ? Double.valueOf(distance1) / 1000 : 0);

                //总距离

                String end1 = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
                if(end1.equals(",")){
                    map.put("totalDistance", 0);
@@ -402,7 +417,6 @@
                    }

                }


                Integer orderSource1 = Integer.valueOf(String.valueOf(map.get("orderSource")));
                if(orderSource1 == 1 || orderSource1 == 2 || orderSource1 == 3){