新增需求

曾富康

2026-06-22 e4f50565f585ac3bb7355fe7b9da794bb855113f

 ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -139,6 +139,7 @@
                       String driver,
                       Integer state,
                       Integer rideType,
                       Integer callType,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser,
@@ -153,7 +154,7 @@
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(),
                orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null, payType, travelId));
                orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, callType, abnormal, promotion, promotionUser,null, payType, travelId));
        return super.packForBT(page);
    }

@@ -171,6 +172,7 @@
                       String driver,
                       Integer state,
                       Integer rideType,
                       Integer callType,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser, Integer payType, String travelId, HttpServletRequest request, HttpServletResponse response) {
@@ -183,7 +185,7 @@
                endTime = timeArray[1];
            }
            List<Map<String, Object>> list = tOrderPrivateCarService.getPrivateCarOrderListExport(null, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(),
                    orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null, travelId);
                    orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, callType, abnormal, promotion, promotionUser,null, travelId);

            // 表格数据【封装】
            List<List<String>> dataList = new ArrayList<>();
@@ -201,6 +203,7 @@
            shellList.add("订单中心编号");
            shellList.add("订单来源");
            shellList.add("订单类型");
            shellList.add("叫车方式");
            shellList.add("乘车时间");
            shellList.add("下单用户昵称");
            shellList.add("下单用户手机");
@@ -283,6 +286,12 @@
                            break;
                    }

                }

                if(SinataUtil.isNotEmpty(object.get("callType")) && "2".equals(object.get("callType").toString())){
                    shellList.add("快捷叫车");
                }else{
                    shellList.add("普通叫车");
                }

                if(SinataUtil.isNotEmpty(object.get("travelTime"))){
@@ -609,6 +618,11 @@
    @RequestMapping("/add")
    @ResponseBody
    public Object add(TOrderPrivateCar privateCar) {
        // 管理端未选择叫车方式时按普通叫车处理。
        if (privateCar.getCallType() == null) {
            privateCar.setCallType(1);
        }
        boolean quickCall = Integer.valueOf(2).equals(privateCar.getCallType());
        TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("phone", privateCar.getPassengersPhone()));
        if (ToolUtil.isNotEmpty(user)) {///  用户是平台用户
            if (hasUnfinishedTravelOrder(user.getId())) {
@@ -628,11 +642,17 @@
            privateCar.setPlacementLat(privateCar.getStartLat());
            privateCar.setPlacementLon(privateCar.getStartLon());
            privateCar.setStartAddress(ToolUtil.formatting(privateCar.getStartAddress()));
            privateCar.setEndAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            // 快捷叫车允许暂不填写终点，终点由司机服务中补充。
            if (!quickCall) {
                privateCar.setEndAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            }
            ///   判断是否为预约单
            long travelTime = privateCar.getTravelTime().getTime();
            long momengtTime = new Date().getTime();
            if ((travelTime - momengtTime) > 10 * 60 * 1000) {
            // 快捷叫车只支持实时单。
            if (quickCall) {
                privateCar.setOrderType(1);
            } else if ((travelTime - momengtTime) > 10 * 60 * 1000) {
                privateCar.setOrderType(2);
            } else {
                privateCar.setOrderType(1);
@@ -662,12 +682,18 @@
            privateCar.setPlacementLat(privateCar.getStartLat());
            privateCar.setPlacementLon(privateCar.getStartLon());
            privateCar.setStartAddress(ToolUtil.formatting(privateCar.getStartAddress()));
            privateCar.setEndAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            // 快捷叫车允许暂不填写终点，终点由司机服务中补充。
            if (!quickCall) {
                privateCar.setEndAddress(ToolUtil.formatting(privateCar.getEndAddress()));
            }

            ///   判断是否为预约单
            long travelTime = privateCar.getTravelTime().getTime();
            long momengtTime = new Date().getTime();
            if ((travelTime - momengtTime) > 10 * 60 * 1000) {
            // 快捷叫车只支持实时单。
            if (quickCall) {
                privateCar.setOrderType(1);
            } else if ((travelTime - momengtTime) > 10 * 60 * 1000) {
                privateCar.setOrderType(2);
            } else {
                privateCar.setOrderType(1);