liujie
2023-06-12 c8638bb17163cc95e9063c358eb92cada1474102
src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -9,6 +9,7 @@
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GeocodeVo;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GoogleMapUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -480,15 +481,15 @@
        lonLat.setLng(tOrder.getStartLon());
        lonLats.add(lonLat);
        String s = tOrder.geteAddress();
//        GeocodeVo geocode = googleMapUtil.getGeocode(s);
//        orderInfo.setElat(String.valueOf(geocode.getLat()));
//        orderInfo.setElon(String.valueOf(geocode.getLng()));
        GeocodeVo geocode = googleMapUtil.getGeocode(s);
        orderInfo.setElat(String.valueOf(geocode.getLat()));
        orderInfo.setElon(String.valueOf(geocode.getLng()));
        lonLat=new LonLat();
        lonLat.setLng("-113.066919618184");
        lonLat.setLat("37.684389618184");
        lonLat.setLng(tOrder.getStartLon());
        lonLat.setLat(tOrder.getStartLat());
        lonLats.add(lonLat);
        orderInfo.setElat("37.684389618184");
        orderInfo.setElon("-113.066919618184");
        orderInfo.setElat(String.valueOf(geocode.getLat()));
        orderInfo.setElon(String.valueOf(geocode.getLng()));
        orderInfo.setLonLats(lonLats);
        Long quoteId = tQuoteMapper.selectList(new EntityWrapper<TQuote>().eq("order_id", tOrder.geteZipZ())).get(0).getId();
@@ -541,6 +542,7 @@
        ArrayList<String> strings = new ArrayList<>();
        goods.forEach(e->{
            strings.add(e.getContainerNumber());
            strings.add(String.valueOf(e.getOrderId()));
            orderInfo.setBl(e.getBillNumber());
        });
        orderInfo.setContainer(strings);