update

liujie

2025-08-04 fe2489749de15476eb1ad736577b7eaf69176b5f

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityInfoWrapper;
import com.stylefeng.guns.modular.crossCity.warpper.OrderWarpper;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
@@ -60,6 +59,10 @@

    @Resource
    private DriverWorkMapper driverWorkMapper;
    @Autowired
    private ISysTimeoutMoneyService sysTimeoutMoneyService;
    @Autowired
    private IOpenCityService openCityService;

    @Autowired
    private ICarService carService;
@@ -278,8 +281,7 @@
    }


    @Autowired
    private ISysTimeoutMoneyService sysTimeoutMoneyService;
    

    /**
     * 获取服务中页面订单详情
@@ -304,8 +306,8 @@
            Map<String, Object> map = orderService.queryOrderInfo(uid, orderId, orderType);

            if (orderType == 4 || orderType == 5){

                SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(null);
                OpenCity openCity = openCityService.openCity1(map.get("startLon").toString(), map.get("startLat").toString());
                SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(new EntityWrapper<SysTimeoutMoney>().eq("openCityId", openCity.getId()));
                map.put("timeOutMoney",Double.parseDouble(map.get("timeOutMoney").toString()));
                map.put("note","配送超过" + sysTimeoutMoney.getTimeOut() + "分钟扣订单的" + sysTimeoutMoney.getDeductMoney() + "%费用");

@@ -324,12 +326,14 @@
                }
            }
            return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
            //return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }
    
    
    

    @ResponseBody
    @PostMapping("/api/order/queryOrderInfo1")
@@ -348,8 +352,8 @@
            Map<String, Object> map = orderService.queryOrderInfo(uid, orderId, 7);

            if (orderType == 4 || orderType == 5){

                SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(null);
                OpenCity openCity = openCityService.openCity1(map.get("startLon").toString(), map.get("startLat").toString());
                SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(new EntityWrapper<SysTimeoutMoney>().eq("openCityId", openCity.getId()));
                map.put("timeOutMoney",Double.parseDouble(map.get("timeOutMoney").toString()));
                map.put("note","配送超过" + sysTimeoutMoney.getTimeOut() + "分钟扣订单的" + sysTimeoutMoney.getDeductMoney() + "%费用");

@@ -553,6 +557,10 @@
            return ResultUtil.runErr();
        }
    }
    
    
    
    

    @ResponseBody
    @PostMapping("/api/order/cancleOrder")
@@ -570,6 +578,9 @@
            return ResultUtil.runErr();
        }
    }
    
    
    
    @ResponseBody
    @PostMapping("/api/order/updatePeopleNum")
    @ApiOperation(value = "修改人数", tags = {"司机端-服务中"}, notes = "")
@@ -587,6 +598,8 @@
            return ResultUtil.runErr();
        }
    }
    
    

    @ResponseBody
    @PostMapping("/api/order/confirmFees1")
@@ -722,30 +735,7 @@
    }


    @ResponseBody
    @PostMapping("/base/order/test")
    public String test(String phoneA, String phoneB){
        try {
            Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, (System.currentTimeMillis() + 86400000));
            System.err.println(JSON.toJSONString(map));
        }catch (Exception e){
            e.printStackTrace();
            return "";
        }
        return null;
    }

    @ResponseBody
    @PostMapping("/base/order/test_")
    public String test(String bindId){
        try {
            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId, null, null);
        }catch (Exception e){
            e.printStackTrace();
            return "";
        }
        return null;
    }


    /**
@@ -778,6 +768,9 @@
    }


    
    
    
    @ResponseBody
    @PostMapping("/api/order/queryVoiceBroadcast")
    @ApiOperation(value = "接单后获取语音播报内容", tags = {"司机端-首页"}, notes = "")
@@ -824,6 +817,8 @@
        }
    }

    
    


    @ResponseBody