Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

6 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

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

@@ -60,6 +60,10 @@

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

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


    @Autowired
    private ISysTimeoutMoneyService sysTimeoutMoneyService;
    

    /**
     * 获取服务中页面订单详情
@@ -304,8 +307,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,7 +327,6 @@
                }
            }
            return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
            //return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -348,8 +350,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() + "%费用");