Merge remote-tracking branch 'origin/master'

xuhy

2023-05-06 0ad75f90e6464b95bef06c88227f521c5c03d41d

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java

@@ -122,6 +122,24 @@
    }

    /**
     * 跳转详情页面
     */
    @RequestMapping("/orderDetail")
    public String orderDetail(Integer orderId, Model model) {
        tOrderService.orderDetail(orderId,model);
        return PREFIX + "tOrderDetail.html";
    }

    /**
     * 跳转异常详情页面
     */
    @RequestMapping("/orderExceptionDetail")
    public String orderExceptionDetail(Integer orderId, Model model) {
        tOrderService.orderExceptionDetail(orderId,model);
        return PREFIX + "tOrderExceptionDetail.html";
    }

    /**
     * 获取列表
     */
    @ApiOperation(value = "用户获取订单列表")
@@ -132,6 +150,7 @@
        if(Objects.nonNull(userId)){
            wrapper.eq("user_id",userId);
        }
        wrapper.orderBy("createTime",false);
        return tOrderService.selectList(wrapper);
    }

@@ -186,11 +205,16 @@
            TAppUserDetailOrderResp tAppUserDetailOrderResp = new TAppUserDetailOrderResp();
            BeanUtils.copyProperties(tOrder,tAppUserDetailOrderResp);

            // TODO 计算总里程

            // 计算总里程
            if(Objects.nonNull(tOrder.getActualMileage())){
                tAppUserDetailOrderResp.setMileageSum(tOrder.getActualMileage()/1000);
            }

            // 计算总时长
            long travelTimeSum = DateUtil.between(tAppUserDetailOrderResp.getBoardingTime(), tAppUserDetailOrderResp.getGetoffTime(), DateUnit.MINUTE);
            long travelTimeSum = 0;
            if(Objects.nonNull(tAppUserDetailOrderResp.getBoardingTime()) && Objects.nonNull(tAppUserDetailOrderResp.getGetoffTime())){
                travelTimeSum = DateUtil.between(tAppUserDetailOrderResp.getBoardingTime(), tAppUserDetailOrderResp.getGetoffTime(), DateUnit.MINUTE);
            }
            tAppUserDetailOrderResp.setTravelTimeSum(Integer.valueOf(Long.toString(travelTimeSum)));

            list.add(tAppUserDetailOrderResp);
@@ -277,7 +301,11 @@
                }else if(2 == source1){
                    values[i][2] = "司机创建";
                }
                values[i][3] = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d.getStartTime());
                if(Objects.nonNull(d.getStartTime())){
                    values[i][3] = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d.getStartTime());
                }else {
                    values[i][3] = "";
                }
                values[i][4] = d.getUserName();
                values[i][5] = d.getUserPhone();
                values[i][6] = d.getStartAddress();
@@ -354,7 +382,11 @@
                }else if(2 == source1){
                    values[i][2] = "司机创建";
                }
                values[i][3] = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d.getStartTime());
                if(Objects.nonNull(d.getStartTime())){
                    values[i][3] = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d.getStartTime());
                }else {
                    values[i][3] = "";
                }
                values[i][4] = d.getUserName();
                values[i][5] = d.getUserPhone();
                values[i][6] = d.getStartAddress();