修改bug

puzhibing

2023-05-23 3ca8fe373c982ae0cfeef9301fc839f8875bea2e

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

@@ -158,16 +158,26 @@
        if(null != appUser){
            order.setUserId(appUser.getId());
        }
        String startAddress = addOrderWarpper.getStartAddress();
        startAddress = startAddress.replaceAll("& #40;", "(");
        startAddress = startAddress.replaceAll("& #41;", ")");
        order.setUserName(addOrderWarpper.getUserName());
        order.setUserPhone(addOrderWarpper.getPhone());
        order.setAgentId(driver.getAgentId());
        order.setBranchOfficeId(driver.getBranchOfficeId());
        order.setStartAddress(addOrderWarpper.getStartAddress());
        order.setStartAddress(startAddress);
        order.setStartLat(addOrderWarpper.getStartLat());
        order.setStartLng(addOrderWarpper.getStartLng());
        order.setEndAddress(addOrderWarpper.getEndAddress());
        order.setEndLat(addOrderWarpper.getEndLat());
        order.setEndLng(addOrderWarpper.getEndLng());

        String endAddress = addOrderWarpper.getEndAddress();
        if(ToolUtil.isNotEmpty(endAddress)){
            endAddress = endAddress.replaceAll("& #40;", "(");
            endAddress = endAddress.replaceAll("& #41;", ")");
            order.setEndAddress(endAddress);
            order.setEndLat(addOrderWarpper.getEndLat());
            order.setEndLng(addOrderWarpper.getEndLng());
        }

        Double d = 0D;
        if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
            Map<String, String> distance = MapUtil.getDistance(order.getStartLng() + "," + order.getStartLat(), order.getEndLng() + "," + order.getEndLat(), 1);