Pu Zhibing
2025-05-16 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
@@ -58,9 +58,9 @@
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<OrderWarpper> queryOrderInfo(Integer orderId){
    public ResultUtil<OrderWarpper> queryOrderInfo(Integer language, Integer orderId){
        try {
            Map<String, Object> map = orderCrossCityService.queryOrderInfo(orderId);
            Map<String, Object> map = orderCrossCityService.queryOrderInfo(language, orderId);
            return ResultUtil.success(OrderWarpper.getOrderWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
@@ -86,13 +86,13 @@
            @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil reassignOrderCrossCityReassign(Reassign reassign, String orderIds, HttpServletRequest request){
    public ResultUtil reassignOrderCrossCityReassign(Reassign reassign, String orderIds, Integer language, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return reassignService.saveData_(reassign, orderIds, uid, null);
            return reassignService.saveData_(reassign, orderIds, uid, null, language);
        }catch (SystemException s){
            return ResultUtil.error(s.getMsg());
        } catch (Exception e){
@@ -114,9 +114,9 @@
            @ApiImplicitParam(value = "跨城订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<OrderCrossCityInfoWrapper> queryOrderCrossCityInfo(Integer orderId){
    public ResultUtil<OrderCrossCityInfoWrapper> queryOrderCrossCityInfo(Integer language, Integer orderId){
        try {
            Map<String, Object> map = orderCrossCityService.queryOrderCrossCityInfo(orderId);
            Map<String, Object> map = orderCrossCityService.queryOrderCrossCityInfo(language, orderId);
            return ResultUtil.success(OrderCrossCityInfoWrapper.getOrderInfoWarpper(map));
        }catch (Exception e){
            e.printStackTrace();