broker 司机端

liujie

2023-06-12 9c47fbfef3cc65bf67fb44917e33162177bf4f9c

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java

@@ -576,7 +576,7 @@
    @Resource
    private TYardService yardService;
    @Override
    public OrderDetailVo orderInfo(Long id,int typeStr) {
    public OrderDetailVo orderInfo(Long id,int did) {
        OrderDetailVo orderDetailVo = new OrderDetailVo();
        List<Map<String, Object>> maps = new ArrayList<>();

@@ -745,7 +745,7 @@
        orderInfo.put("7_danger",tGoods.getDanger());
        orderInfo.put("8_weight",tGoods.getWeight());
        Map<String, Object> map = sortMapByKey(orderInfo);
        if(typeStr==1){
        if(tOrder.getsDriverid()==did){
            maps.add(map);
        }
        if(tOrder.getExamSite()!=null){
@@ -753,7 +753,7 @@
            TExamSite tExamSite = examSiteService.selectById(examSite);
            // 第二个检查站
            Map<String, Object> examInfo = getExamInfo(tExamSite);
            if(typeStr==1){
            if(tOrder.getsDriverid()==did){
                maps.add(examInfo);
            }
        }
@@ -764,7 +764,7 @@
        Map<String, Object> yardOne = getYardOne(tTransportations1, tYard);
        // 第四个  destination
        Map<String, Object> destination = getDestination(tOrder);
        if(typeStr==2){
        if(tOrder.getsDriverIdOne()==did){
            maps.add(yardOne);
            maps.add(destination);
        }
@@ -773,7 +773,7 @@
            TYard tYard1 = yardService.selectById(tTransportations2.getYardId());
            // 第五个  yard
            Map<String, Object> yardOne1 = getYardOne(tTransportations2, tYard1);
            if(typeStr==3 && tOrder.getType().equals("Live Unload")){
            if(tOrder.geteDriverid()==did && tOrder.getType().equals("Live Unload")){
                maps.add(yardOne1);
            }
        }
@@ -784,7 +784,7 @@

            // 第六个 port
            Map<String, Object> port = getPort(tTransportations3, tPort);
            if(typeStr==4 && tOrder.getType().equals("Live Unload")){
            if(tOrder.geteDriverIdOne()==did && tOrder.getType().equals("Live Unload")){
                maps.add(port);
            }
        }