新增

Pu Zhibing

2026-01-12 bd1bf2bde1db1b2349104808a9214245256784e8

新增

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

@@ -291,7 +291,7 @@
     */
    @ResponseBody
    @PostMapping("/api/order/queryOrderInfo")
    @ApiOperation(value = "获取服务中页面订单详情", tags = {"司机端-服务中"}, notes = "")
    @ApiOperation(value = "获取服务中页面订单详情【202601】", tags = {"司机端-服务中"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml

@@ -261,11 +261,15 @@
        a.thankYouFee,
        a.payManner as payManner,
        a.seatNumber as seatNumber,
        (select phone from t_phone where companyId = a.companyId and `type` = 1) as emergencyCall
        (select phone from t_phone where companyId = a.companyId and `type` = 1) as emergencyCall,
        e.money as personalIncome,
        f.money as serverMoney
        from t_order_cross_city a
        left join t_user b on (a.userId = b.id)
        left join t_line_shift_driver c on (a.lineShiftDriverId = c.id)
        left join t_line_shift d on (c.lineShiftId = d.id)
        left join t_income e on (a.id = e.incomeId and e.orderType = 3 and e.userType = 2)
        left join t_income f on (a.id = f.incomeId and f.orderType = 3 and f.userType = 1)
        where a.id = #{orderId}
    </select>


 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderWarpper.java

@@ -23,6 +23,8 @@
    @ApiModelProperty("报警电话")
    private String emergencyCall;
    private String realPhone;
    @ApiModelProperty("个人收入")
    private Double personalIncome;

    public String getRealPhone() {
        return realPhone;
@@ -91,6 +93,14 @@
        this.emergencyCall = emergencyCall;
    }

    public Double getPersonalIncome() {
        return personalIncome;
    }

    public void setPersonalIncome(Double personalIncome) {
        this.personalIncome = personalIncome;
    }

    public static OrderWarpper getOrderWarpper(Map<String, Object> map){
        OrderWarpper orderWarpper = new OrderWarpper();
        if(null != map){
@@ -102,6 +112,7 @@
            orderWarpper.setOrders(null != map.get("orders") ? JSON.parseArray(map.get("orders").toString(), OrderCrossCityInfoWrapper.class) : new ArrayList<>());
            orderWarpper.setEmergencyCall(null != map.get("emergencyCall") ? map.get("emergencyCall").toString() : "");
            orderWarpper.setRealPhone(null != map.get("realPhone") ? map.get("realPhone").toString() : "");
            orderWarpper.setPersonalIncome(null != map.get("personalIncome") ? Double.valueOf(map.get("personalIncome").toString()) : 0);
        }
        return orderWarpper;
    }

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml

@@ -149,10 +149,14 @@
        a.userImg,
        a.driverImg,
        a.timeOutMoney,
        DATE_FORMAT(a.arriveTimeExpect, '%m月%d日 %H:%i') as arriveTimeExpect
        DATE_FORMAT(a.arriveTimeExpect, '%m月%d日 %H:%i') as arriveTimeExpect,
        d.money as personalIncome,
        e.money as serverMoney
        from t_order_logistics a
        left join t_user b on (a.userId = b.id)
        left join t_order_cancel c on (a.id = c.orderId and c.orderType = a.type and c.state = 2)
        left join t_income d on (a.id = d.incomeId and d.orderType = 2 and d.userType = 2)
        left join t_income e on (a.id = e.incomeId and e.orderType = 2 and e.userType = 1)
        where a.id = #{orderId}
    </select>


 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -340,10 +340,14 @@
        c.remark as cancelRemark,
        c.money as cancelPayMoney,
        if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
        (select isSpecialCar from t_sys_reformist where openCityId = #{openCityId}) as reassign
        (select isSpecialCar from t_sys_reformist where openCityId = #{openCityId}) as reassign,
        d.money as personalIncome,
        e.money as serverMoney
        from t_order_private_car a
        left join t_user b on (a.userId = b.id)
        left join t_order_cancel c on (a.id = c.orderId and c.orderType = 1 and c.state = 2)
        left join t_income d on (a.id = d.incomeId and d.orderType = 1 and d.userType = 2)
        left join t_income e on (a.id = e.incomeId and e.orderType = 1 and e.userType = 1)
        where a.id = #{orderId}



 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java

@@ -59,7 +59,6 @@
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        String format = simpleDateFormat.format(calendar.getTime());


        //开始调用高德接口创建围栏
        String[] s = points.split("_");
        List<String> resoult = new ArrayList<>();

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java

@@ -103,9 +103,6 @@
        String forObject = restTemplate.getForObject(url, String.class);
        JSONObject jsonObject = JSON.parseObject(forObject);
        Map<String, String> map = new HashMap<>();

//        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");

        if(jsonObject.getString("status").equals("1")){
            JSONObject regeocode = jsonObject.getJSONObject("regeocode");
            JSONObject addressComponent = regeocode.getJSONObject("addressComponent");

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java

@@ -109,6 +109,10 @@
    private String note;
    @ApiModelProperty("送达时间")
    private String endServiceTime;
    @ApiModelProperty("个人收入")
    private Double personalIncome;
    @ApiModelProperty("平台服务费")
    private Double serverMoney;

    public Double getReturnMoney() {
        return returnMoney;
@@ -544,6 +548,22 @@
        this.contactPersonPhone = contactPersonPhone;
    }

    public Double getPersonalIncome() {
        return personalIncome;
    }

    public void setPersonalIncome(Double personalIncome) {
        this.personalIncome = personalIncome;
    }

    public Double getServerMoney() {
        return serverMoney;
    }

    public void setServerMoney(Double serverMoney) {
        this.serverMoney = serverMoney;
    }

    @Override
    public String toString() {
        return "OrderInfoWarpper{" +
@@ -647,6 +667,8 @@
            orderInfoWarpper.setNote(null != map.get("note") ? String.valueOf(map.get("note")) : "");
            orderInfoWarpper.setTimeOutMoney(null != map.get("timeOutMoney") ? Double.valueOf(String.valueOf(map.get("timeOutMoney"))) : 0D);
            orderInfoWarpper.setReturnMoney(null != map.get("returnMoney") ? Double.valueOf(String.valueOf(map.get("returnMoney"))) : 0D);
            orderInfoWarpper.setServerMoney(null != map.get("serverMoney") ? Double.valueOf(map.get("serverMoney").toString()) : 0D);
            orderInfoWarpper.setPersonalIncome(null != map.get("personalIncome") ? Double.valueOf(map.get("personalIncome").toString()) : 0D);
        }
        return orderInfoWarpper;
    }

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -295,10 +295,14 @@
        c.remark as cancelRemark,
        c.money as cancelPayMoney,
        if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
        (select isTaxiCar from t_sys_reformist where openCityId = #{openCityId}) as reassign
        (select isTaxiCar from t_sys_reformist where openCityId = #{openCityId}) as reassign,
        d.money as personalIncome,
        e.money as serverMoney
        from t_order_taxi a
        left join t_user b on (a.userId = b.id)
        left join t_order_cancel c on (a.id = c.orderId and c.orderType = 2 and c.state = 2)
        left join t_income d on (a.id = d.incomeId and d.orderType = 2 and d.userType = 2)
        left join t_income e on (a.id = e.incomeId and e.orderType = 2 and e.userType = 1)
        where a.id = #{orderId}
    </select>


 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -653,6 +653,19 @@
            tCarServiceService.insert(service);
        }
        TCar obj = tCarService.selectById(tCar.getId());
        if(null != bindDriverId){
            String[] split = obj.getBindDriverId().split(",");
            List<String> list = Arrays.asList(bindDriverId.split(","));
            for (String s : split) {
                TDriver tDriver = driverService.selectById(s);
                DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", s).eq("state", 1));
                if(null != driverWork && !list.contains(s)){
                    throw new RuntimeException(tDriver.getName() + "上班中，不能取消授权");
                }
            }
        }


        obj.setCompanyId(tCar.getCompanyId());
        obj.setFranchiseeId(tCar.getFranchiseeId());
        obj.setCarColor(tCar.getCarColor());

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -106,7 +106,9 @@
    
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Autowired
    private IDriverWorkService iDriverWorkService;

    /**
     * 跳转投诉页面
     *
@@ -778,6 +780,10 @@
    public Object selectCarOpt(Integer tDriverId,Integer carId) {
        if (SinataUtil.isNotEmpty(tDriverId) && SinataUtil.isNotEmpty(carId)){
            TDriver tDriver = tDriverService.selectById(tDriverId);
            DriverWork driverWork = iDriverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", tDriverId).eq("state", 1));
            if(null != driverWork && !tDriver.getCarId().equals(carId)){
                throw new RuntimeException("司机上班中，不能更换车辆");
            }
            tDriver.setCarId(carId);
            tDriverService.updateById(tDriver);
        }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java

@@ -569,7 +569,7 @@
        List<String> shellList = new ArrayList<String>();
        shellList.add("注册时间");
        shellList.add("用户ID");
        shellList.add("注册地所属分公司");
        shellList.add("注册区域");
        shellList.add("昵称");
        shellList.add("手机号");
        shellList.add("紧急联系人姓名");

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java

@@ -296,7 +296,7 @@
                       Integer rideType,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser,Integer type,Integer abnormalStatus
                       String promotionUser,Integer type,Integer abnormalStatus, String travelId
    ) {
        String beginTime = null;
        String endTime = null;
@@ -313,15 +313,15 @@
        // 快车
        if(type==1){
            page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
                    orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, null));
                    orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, null, travelId));
            return super.packForBT(page);
            // 跨城
        }else if(type==2){
            page.setRecords(tOrderCrossCityService.getCrossCityOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, null, state, abnormal, promotion, promotionUser,abnormalStatus));
            page.setRecords(tOrderCrossCityService.getCrossCityOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, null, state, abnormal, promotion, promotionUser,abnormalStatus, travelId));
            return super.packForBT(page);
            // 出租车
        }else if(type==3){
            page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,abnormalStatus));
            page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,abnormalStatus, travelId));
            return super.packForBT(page);
        }
        return super.packForBT(page);
@@ -344,7 +344,7 @@
                       Integer rideType,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser,Integer type,Integer abnormalStatus, HttpServletRequest request, HttpServletResponse response) {
                       String promotionUser,Integer type,Integer abnormalStatus, String travelId, HttpServletRequest request, HttpServletResponse response) {
        try {
            String beginTime = null;
            String endTime = null;
@@ -357,11 +357,11 @@
            List<Map<String, Object>> list=new ArrayList<>();
            if(type==1){
                list =  tOrderPrivateCarService.getPrivateCarOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
                        orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus);
                        orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, travelId);
            }else if(type==2){
                list =  tOrderCrossCityService.getCrossCityOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, null, state, abnormal, promotion, promotionUser,abnormalStatus);
                list =  tOrderCrossCityService.getCrossCityOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, null, state, abnormal, promotion, promotionUser,abnormalStatus, travelId);
            }else if(type==3){
                list =  tOrderTaxiService.getTaxiOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,abnormalStatus);
                list =  tOrderTaxiService.getTaxiOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,abnormalStatus, travelId);
            }



 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java

@@ -184,7 +184,20 @@
    @RequestMapping(value = "/add")
    @ResponseBody
    public ResultUtil add(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {

        JSONArray jsonArray1 = JSON.parseArray(shuArr);
        int size1 = jsonArray1.size();
        for (int i = 0; i < size1; i++) {
            JSONObject jsonObject = jsonArray1.getJSONObject(i);
            String shiftTime = jsonObject.getString("shiftTime");
            if (SinataUtil.isNotEmpty(shiftTime)){
                String[] timeArray = shiftTime.split(" - ");
                String startTime = timeArray[0].split(":")[0];
                String endTime = timeArray[1].split(":")[0];
                if(Integer.valueOf(startTime) >= Integer.valueOf(endTime)){
                    return ResultUtil.error("班次结束时间不能小于开始时间");
                }
            }
        }
        String name = tLine.getName();
        name = name.replaceAll("& lt;", "<");
        name = name.replaceAll("& gt;", ">");
@@ -355,6 +368,20 @@
    @RequestMapping(value = "/update")
    @ResponseBody
    public ResultUtil update(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {
        JSONArray jsonArray1 = JSON.parseArray(shuArr);
        int size1 = jsonArray1.size();
        for (int i = 0; i < size1; i++) {
            JSONObject jsonObject = jsonArray1.getJSONObject(i);
            String shiftTime = jsonObject.getString("shiftTime");
            if (SinataUtil.isNotEmpty(shiftTime)){
                String[] timeArray = shiftTime.split(" - ");
                String startTime = timeArray[0].split(":")[0];
                String endTime = timeArray[1].split(":")[0];
                if(Integer.valueOf(startTime) >= Integer.valueOf(endTime)){
                    return ResultUtil.error("班次结束时间不能小于开始时间");
                }
            }
        }
        String name = tLine.getName();
        name = name.replaceAll("& lt;", "<");
        name = name.replaceAll("& gt;", ">");

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java

@@ -152,7 +152,7 @@
                       Integer state,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser) {
                       String promotionUser, String travelId) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
@@ -161,7 +161,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderCrossCityService.getCrossCityOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser,null));
        page.setRecords(tOrderCrossCityService.getCrossCityOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser,null, travelId));
        return super.packForBT(page);
    }

@@ -182,7 +182,7 @@
                       Integer state,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser, HttpServletRequest request, HttpServletResponse response) {
                       String promotionUser, String travelId, HttpServletRequest request, HttpServletResponse response) {
        try {
            String beginTime = null;
            String endTime = null;
@@ -191,7 +191,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String, Object>> list = tOrderCrossCityService.getCrossCityOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser,null);
            List<Map<String, Object>> list = tOrderCrossCityService.getCrossCityOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser,null, travelId);

            // 表格数据【封装】
            List<List<String>> dataList = new ArrayList<>();

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java

@@ -118,7 +118,7 @@
                       String recipient,
                       String recipientPhone,
                       String driver,
                       Integer state) {
                       Integer state, String travelId) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)) {
@@ -128,7 +128,7 @@
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderLogisticsService.getLogisticsOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
                orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state));
                orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state, travelId));
        return super.packForBT(page);
    }


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

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

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

            // 表格数据【封装】
            List<List<String>> dataList = new ArrayList<>();

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java

@@ -147,7 +147,7 @@
                       Integer state,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser) {
                       String promotionUser, String travelId) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)) {
@@ -156,7 +156,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,null));
        page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,null, travelId));
        return super.packForBT(page);
    }

@@ -175,7 +175,7 @@
                       Integer state,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser, HttpServletRequest request, HttpServletResponse response) {
                       String promotionUser, String travelId, HttpServletRequest request, HttpServletResponse response) {
        try {
            String beginTime = null;
            String endTime = null;
@@ -185,7 +185,7 @@
                endTime = timeArray[1];
            }

            List<Map<String, Object>> list = tOrderTaxiService.getTaxiOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,null);
            List<Map<String, Object>> list = tOrderTaxiService.getTaxiOrderListExport(null, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser,null, travelId);

            // 表格数据【封装】
            List<List<String>> dataList = new ArrayList<>();

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java

@@ -40,7 +40,8 @@
                                                   @Param("abnormal") Integer abnormal,
                                                   @Param("promotion") Integer promotion,
                                                   @Param("promotionUser") String promotionUser,
                                                   @Param("abnormalStatus") Integer abnormalStatus);
                                                   @Param("abnormalStatus") Integer abnormalStatus,
                                                   @Param("travelId") String travelId);
    List<Map<String,Object>> getCrossCityOrderListExport(
                                                   @Param("beginTime") String beginTime,
                                                   @Param("endTime") String endTime,
@@ -59,7 +60,8 @@
                                                   @Param("abnormal") Integer abnormal,
                                                   @Param("promotion") Integer promotion,
                                                   @Param("promotionUser") String promotionUser,
                                                   @Param("abnormalStatus") Integer abnormalStatus);
                                                   @Param("abnormalStatus") Integer abnormalStatus,
                                                   @Param("travelId") String travelId);

    /**
     * 根据跨城出行订单ID获取跨城出行订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java

@@ -35,7 +35,8 @@
                                                    @Param("recipient") String recipient,
                                                    @Param("recipientPhone") String recipientPhone,
                                                    @Param("driver") String driver,
                                                    @Param("state") Integer state);
                                                    @Param("state") Integer state,
                                                   @Param("travelId") String travelId);

    /**
     * 根据快车订单ID获取小件物流订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java

@@ -42,7 +42,8 @@
                                                    @Param("promotion") Integer promotion,
                                                    @Param("promotionUser") String promotionUser,
                                                    @Param("abnormalStatus") Integer abnormalStatus,
                                                    @Param("payType") Integer payType);
                                                    @Param("payType") Integer payType,
                                                    @Param("travelId") String travelId);
    List<Map<String,Object>> getPrivateCarOrderListExport(
                                                    @Param("beginTime") String beginTime,
                                                    @Param("endTime") String endTime,
@@ -61,7 +62,8 @@
                                                    @Param("abnormal") Integer abnormal,
                                                    @Param("promotion") Integer promotion,
                                                    @Param("promotionUser") String promotionUser,
                                                    @Param("abnormalStatus") Integer abnormalStatus);
                                                    @Param("abnormalStatus") Integer abnormalStatus,
                                                    @Param("travelId") String travelId);

    /**
     * 根据快车订单ID获取快车订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java

@@ -38,7 +38,8 @@
                                              @Param("abnormal") Integer abnormal,
                                              @Param("promotion") Integer promotion,
                                              @Param("promotionUser") String promotionUser,
                                              @Param("abnormalStatus") Integer abnormalStatus);
                                              @Param("abnormalStatus") Integer abnormalStatus,
                                              @Param("travelId") String travelId);
    List<Map<String,Object>> getTaxiOrderListExport(
                                              @Param("beginTime") String beginTime,
                                              @Param("endTime") String endTime,
@@ -55,7 +56,8 @@
                                              @Param("abnormal") Integer abnormal,
                                              @Param("promotion") Integer promotion,
                                              @Param("promotionUser") String promotionUser,
                                              @Param("abnormalStatus") Integer abnormalStatus);
                                              @Param("abnormalStatus") Integer abnormalStatus,
                                              @Param("travelId") String travelId);

    /**
     * 根据出租车订单ID获取出租车订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml

@@ -88,6 +88,9 @@
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="travelId != null and travelId != ''">
                and o.travelId  LIKE CONCAT('%',#{travelId},'%')
            </if>
            <if test="orderSource != null and orderSource != ''">
                and o.orderSource = #{orderSource}
            </if>
@@ -156,6 +159,9 @@
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="travelId != null and travelId != ''">
                and o.travelId  LIKE CONCAT('%',#{travelId},'%')
            </if>
            <if test="orderSource != null and orderSource != ''">
                and o.orderSource = #{orderSource}
            </if>

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml

@@ -85,6 +85,9 @@
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="travelId != null and travelId != ''">
                and o.travelId  LIKE CONCAT('%',#{travelId},'%')
            </if>
            <if test="orderSource != null and orderSource != ''">
                and o.orderSource = #{orderSource}
            </if>

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml

@@ -142,6 +142,9 @@
            <if test="null != abnormalStatus">
                and o.abnormalStatus = #{abnormalStatus}
            </if>
            <if test="null != travelId">
                and o.travelId = #{travelId}
            </if>
        </where>
        order by o.id desc
    </select>
@@ -163,6 +166,9 @@
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="travelId != null and travelId != ''">
                and o.travelId  LIKE CONCAT('%',#{travelId},'%')
            </if>
            <if test="orderSource != null and orderSource != ''">
                and o.orderSource = #{orderSource}
            </if>

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml

@@ -76,6 +76,9 @@
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="travelId != null and travelId != ''">
                and o.travelId  LIKE CONCAT('%',#{travelId},'%')
            </if>
            <if test="orderSource != null and orderSource != ''">
                and o.orderSource = #{orderSource}
            </if>
@@ -135,6 +138,9 @@
            <if test="orderNum != null and orderNum != ''">
                and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            </if>
            <if test="travelId != null and travelId != ''">
                and o.travelId  LIKE CONCAT('%',#{travelId},'%')
            </if>
            <if test="orderSource != null and orderSource != ''">
                and o.orderSource = #{orderSource}
            </if>

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java

@@ -40,7 +40,8 @@
                                                   Integer abnormal,
                                                   Integer promotion,
                                                   String promotionUser,
                                                   Integer abnormalStatus);
                                                   Integer abnormalStatus,
                                                   String travelId);
    List<Map<String,Object>> getCrossCityOrderListExport(@Param("page") Page<Map<String, Object>> page,
                                                   @Param("beginTime") String beginTime,
                                                   @Param("endTime") String endTime,
@@ -59,7 +60,7 @@
                                                   Integer abnormal,
                                                   Integer promotion,
                                                   String promotionUser,
                                                   Integer abnormalStatus);
                                                   Integer abnormalStatus, String travelId);

    /**
     * 根据跨城出行订单ID获取跨城出行订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java

@@ -35,7 +35,7 @@
                                                   @Param("recipient") String recipient,
                                                   @Param("recipientPhone") String recipientPhone,
                                                   @Param("driver") String driver,
                                                   @Param("state") Integer state);
                                                   @Param("state") Integer state, String travelId);

    /**
     * 根据快车订单ID获取小件物流订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java

@@ -42,7 +42,7 @@
                                                    Integer promotion,
                                                    String promotionUser,
                                                    Integer abnormalStatus,
                                                    Integer payType);
                                                    Integer payType, String travelId);
    List<Map<String,Object>> getPrivateCarOrderListExport(@Param("page") Page<Map<String, Object>> page,
                                                    @Param("beginTime") String beginTime,
                                                    @Param("endTime") String endTime,
@@ -61,7 +61,8 @@
                                                    Integer abnormal,
                                                    Integer promotion,
                                                    String promotionUser,
                                                    Integer abnormalStatus);
                                                    Integer abnormalStatus,
                                                          String travelId);

    /**
     * 根据快车订单ID获取快车订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java

@@ -40,7 +40,7 @@
                                              Integer abnormal,
                                              Integer promotion,
                                              String promotionUser,
                                              Integer abnormalStatus);
                                              Integer abnormalStatus, String travelId);

    List<Map<String,Object>> getTaxiOrderListExport(@Param("page") Page<Map<String, Object>> page,
                                              @Param("beginTime") String beginTime,
@@ -58,7 +58,7 @@
                                              Integer abnormal,
                                              Integer promotion,
                                              String promotionUser,
                                              Integer abnormalStatus);
                                              Integer abnormalStatus, String travelId);

    /**
     * 根据出租车订单ID获取出租车订单详情

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java

@@ -36,8 +36,9 @@
    public List<Map<String, Object>> getCrossCityOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer lineId, Integer state, Integer abnormal,
                                                           Integer promotion,
                                                           String promotionUser,
                                                           Integer abnormalStatus) {
        List<Map<String, Object>> crossCityOrderList = this.baseMapper.getCrossCityOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser, abnormalStatus);
                                                           Integer abnormalStatus, String travelId) {
        List<Map<String, Object>> crossCityOrderList = this.baseMapper.getCrossCityOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone,
                serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser, abnormalStatus, travelId);
        for (Map<String, Object> map : crossCityOrderList) {
            if(null != map.get("companyId")){
                TCompany company = companyService.selectById(map.get("companyId").toString());
@@ -52,8 +53,8 @@
    public List<Map<String, Object>> getCrossCityOrderListExport(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer lineId, Integer state, Integer abnormal,
                                                           Integer promotion,
                                                           String promotionUser,
                                                           Integer abnormalStatus) {
        List<Map<String, Object>> crossCityOrderListExport = this.baseMapper.getCrossCityOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser, abnormalStatus);
                                                           Integer abnormalStatus, String travelId) {
        List<Map<String, Object>> crossCityOrderListExport = this.baseMapper.getCrossCityOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser, abnormalStatus, travelId);

        for (Map<String, Object> stringObjectMap : crossCityOrderListExport) {
            if(null != stringObjectMap.get("companyId")){

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java

@@ -22,8 +22,9 @@
public class TOrderLogisticsServiceImpl extends ServiceImpl<TOrderLogisticsMapper, TOrderLogistics> implements ITOrderLogisticsService {

    @Override
    public List<Map<String, Object>> getLogisticsOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, Integer type, String userName, String userPhone, String recipient, String recipientPhone, String driver, Integer state) {
        return this.baseMapper.getLogisticsOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state);
    public List<Map<String, Object>> getLogisticsOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, Integer type, String userName,
                                                           String userPhone, String recipient, String recipientPhone, String driver, Integer state, String travelId) {
        return this.baseMapper.getLogisticsOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state, travelId);
    }

    @Override

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java

@@ -46,8 +46,9 @@
                                                            Integer promotion,
                                                            String promotionUser,
                                                            Integer abnormalStatus,
                                                            Integer payType) {
        List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, payType);
                                                            Integer payType, String travelId) {
        List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId,
                driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, payType, travelId);
        for (Map<String, Object> map : privateCarOrderList) {
            if(null == map.get("serverCarModelName")){
                JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString());
@@ -78,8 +79,9 @@
                                                            String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer abnormal,
                                                            Integer promotion,
                                                            String promotionUser,
                                                            Integer abnormalStatus) {
        List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus);
                                                            Integer abnormalStatus, String travelId) {
        List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone,
                serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, travelId);
        for (Map<String, Object> map : privateCarOrderList) {
            if(null == map.get("serverCarModelName")){
                JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString());

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java

@@ -52,8 +52,8 @@
    @Override
    public List<Map<String, Object>> getTaxiOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, String driver, Integer state,Integer abnormal,
                                                      Integer promotion,
                                                      String promotionUser,Integer abnormalStatus) {
        List<Map<String, Object>> taxiOrderList = this.baseMapper.getTaxiOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser, abnormalStatus);
                                                      String promotionUser,Integer abnormalStatus, String travelId) {
        List<Map<String, Object>> taxiOrderList = this.baseMapper.getTaxiOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser, abnormalStatus, travelId);
        for (Map<String, Object> map : taxiOrderList) {
            if(null != map.get("companyId")){
                TCompany company = companyService.selectById(map.get("companyId").toString());
@@ -69,8 +69,8 @@
    @Override
    public List<Map<String, Object>> getTaxiOrderListExport(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, String driver, Integer state,Integer abnormal,
                                                      Integer promotion,
                                                      String promotionUser,Integer abnormalStatus) {
        List<Map<String, Object>> taxiOrderListExport = this.baseMapper.getTaxiOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser, abnormalStatus);
                                                      String promotionUser,Integer abnormalStatus, String travelId) {
        List<Map<String, Object>> taxiOrderListExport = this.baseMapper.getTaxiOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state, abnormal, promotion, promotionUser, abnormalStatus, travelId);
        for (Map<String, Object> map : taxiOrderListExport) {
            if(null != map.get("companyId")){
                TCompany company = companyService.selectById(map.get("companyId").toString());

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html

@@ -16,6 +16,9 @@
                                <#NameCon id="orderNum" name="订单编号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="travelId" name="订单中心编号" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="orderSource" name="订单来源" >
                                    <option value="">全部</option>
                                    <option value="1">APP下单</option>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html

@@ -16,6 +16,9 @@
                                <#NameCon id="orderNum" name="订单编号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="travelId" name="订单中心编号" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="type" name="订单类型" >
                                    <option value="">全部</option>
                                    <option value="4">同城物流</option>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html

@@ -16,6 +16,9 @@
                                <#NameCon id="orderNum" name="订单编号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="travelId" name="订单中心编号" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="orderSource" name="订单来源" >
                                    <option value="">全部</option>
                                    <option value="1">APP下单</option>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html

@@ -16,6 +16,9 @@
                                <#NameCon id="orderNum" name="订单编号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="travelId" name="订单中心编号" />
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="orderSource" name="订单来源" >
                                    <option value="">全部</option>
<!--                                    <option value="1">APP下单</option>-->

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js

@@ -380,6 +380,7 @@
    var queryData = {};
    queryData['insertTime'] = $("#insertTime").val();
    queryData['orderNum'] = $("#orderNum").val();
    queryData['travelId'] = $("#travelId").val();
    queryData['orderSource'] = $("#orderSource").val();
    queryData['userName'] = $("#userName").val();
    queryData['userPhone'] = $("#userPhone").val();
@@ -402,6 +403,7 @@
    let p = "";
    let insertTime = $('#insertTime').val();
    let orderNum = $('#orderNum').val();
    let travelId = $("#travelId").val();
    let orderSource = $('#orderSource').val();
    let userName = $('#userName').val();
    let userPhone = $('#userPhone').val();
@@ -419,6 +421,9 @@
    }
    if(null != orderNum && '' != orderNum){
        p += "orderNum=" + orderNum + "&";
    }
    if(null != travelId && '' != travelId){
        p += "travelId=" + travelId + "&";
    }
    if(null != orderSource && '' != orderSource){
        p += "orderSource=" + orderSource + "&";
@@ -465,6 +470,7 @@
TOrderCrossCity.resetSearch = function () {
    $("#insertTime").val("");
    $("#orderNum").val("");
    $("#travelId").val("");
    $("#orderSource").val("");
    $("#userName").val("");
    $("#userPhone").val("");

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js

@@ -384,6 +384,7 @@
    var queryData = {};
    queryData['insertTime'] = $("#insertTime").val();
    queryData['orderNum'] = $("#orderNum").val();
    queryData['travelId'] = $("#travelId").val();
    queryData['type'] = $("#type").val();
    queryData['orderSource'] = $("#orderSource").val();
    queryData['userName'] = $("#userName").val();
@@ -398,6 +399,7 @@
TOrderLogistics.resetSearch = function () {
    $("#insertTime").val("");
    $("#orderNum").val("");
    $("#travelId").val("");
    $("#type").val("");
    $("#orderSource").val("");
    $("#userName").val("");

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js

@@ -419,6 +419,7 @@
    var queryData = {};
    queryData['insertTime'] = $("#insertTime").val();
    queryData['orderNum'] = $("#orderNum").val();
    queryData['travelId'] = $("#travelId").val();
    queryData['orderSource'] = $("#orderSource").val();
    queryData['userName'] = $("#userName").val();
    queryData['userPhone'] = $("#userPhone").val();
@@ -441,6 +442,7 @@
    let p = "";
    let insertTime = $('#insertTime').val();
    let orderNum = $('#orderNum').val();
    let travelId = $('#travelId').val();
    let orderSource = $('#orderSource').val();
    let userName = $('#userName').val();
    let userPhone = $('#userPhone').val();
@@ -459,6 +461,9 @@
    }
    if(null != orderNum && '' != orderNum){
        p += "orderNum=" + orderNum + "&";
    }
    if(null != travelId && '' != travelId){
        p += "travelId=" + travelId + "&";
    }
    if(null != orderSource && '' != orderSource){
        p += "orderSource=" + orderSource + "&";
@@ -510,6 +515,7 @@
TOrderPrivateCar.resetSearch = function () {
    $("#insertTime").val("");
    $("#orderNum").val("");
    $("#travelId").val("");
    $("#orderSource").val("");
    $("#userName").val("");
    $("#userPhone").val("");

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js

@@ -401,6 +401,7 @@
    var queryData = {};
    queryData['insertTime'] = $("#insertTime").val();
    queryData['orderNum'] = $("#orderNum").val();
    queryData['travelId'] = $("#travelId").val();
    queryData['orderSource'] = $("#orderSource").val();
    queryData['userName'] = $("#userName").val();
    queryData['userPhone'] = $("#userPhone").val();
@@ -420,6 +421,7 @@
    let p = "";
    let insertTime = $('#insertTime').val();
    let orderNum = $('#orderNum').val();
    let travelId = $('#travelId').val();
    let orderSource = $('#orderSource').val();
    let userName = $('#userName').val();
    let userPhone = $('#userPhone').val();
@@ -435,6 +437,9 @@
    }
    if(null != orderNum && '' != orderNum){
        p += "orderNum=" + orderNum + "&";
    }
    if(null != travelId && '' != travelId){
        p += "travelId=" + travelId + "&";
    }
    if(null != orderSource && '' != orderSource){
        p += "orderSource=" + orderSource + "&";
@@ -478,6 +483,7 @@
TOrderTaxi.resetSearch = function () {
    $("#insertTime").val("");
    $("#orderNum").val("");
    $("#travelId").val("");
    $("#orderSource").val("");
    $("#userName").val("");
    $("#userPhone").val("");

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js

@@ -42,7 +42,7 @@
            }
        },*/
        {title: '注册地所<br/>属分公司ID', field: 'companyId', visible: false, align: 'center', valign: 'middle',width:'8%'},
        {title: '注册地所<br/>属分公司', field: 'companyName', visible: true, align: 'center', valign: 'middle',width:'8%',
        {title: '注册区域', field: 'companyName', visible: true, align: 'center', valign: 'middle',width:'8%',
            formatter: function (value, row) {
                var btn = "";
                if(row.companyName != '' && row.companyName != null) {

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TripOrderVo.java

@@ -45,16 +45,10 @@
    private Integer serverCarModelId;
    @ApiModelProperty("车型")
    private String serverCarModel;
//    @ApiModelProperty("订单金额")
//    private Double orderMoney;
    @ApiModelProperty("支付金额")
    private Double payMoney;
//    @ApiModelProperty("差价金额")
//    private Double differenceMoney;
    @ApiModelProperty("感谢费")
    private Double thankYouFee;
//    @ApiModelProperty("开票状态（1=未开票，2=已开票）")
//    private Integer invoice;
    @ApiModelProperty("订单名称")
    private String orderName;
    @ApiModelProperty("订单类型（1=专车，2=出租车，3=跨城出行，4=小件物流，5=包车）")

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java

@@ -64,7 +64,7 @@

    private void addLogoAndTitle(Document document) throws DocumentException {
        try {
            document.setMargins(10, 50, 50, 50); // 左=0，右=50，上=50，下=50（单位：pt）
            document.setMargins(0, 50, 50, 50); // 左=0，右=50，上=50，下=50（单位：pt）
            Resource logoResource = new ClassPathResource("static/img/logo.png");
            if (logoResource.exists()) {
                Image logo = Image.getInstance(logoResource.getURL());
@@ -73,7 +73,7 @@
                // 1. 调整表格列宽：左列刚好容纳logo，右列仅够放下文字（缩小间距）
                // 列宽比例：左列100pt（logo宽度），右列80pt（文字宽度，足够放下“贵人家园”）
                PdfPTable layoutTable = new PdfPTable(new float[]{81f, 100f}); // 左列（Logo），右列100f（文字）
                layoutTable.setWidthPercentage(35);
                layoutTable.setWidthPercentage(25);
                layoutTable.setSpacingAfter(15f); // 与下方主标题的间距不变
                layoutTable.setHorizontalAlignment(Element.ALIGN_LEFT); // 整体左对齐，避免居中导致的空隙

@@ -142,7 +142,7 @@
        Font infoFont = getChineseFont(10, Font.NORMAL);
        // 申请时间现在的时间
        String applyTime = DATE_TIME_FORMATTER.format(LocalDateTime.now());
// 首先定义SimpleDateFormat（可以是类的静态成员）
        // 首先定义SimpleDateFormat（可以是类的静态成员）
        SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        String tripTimeStart = first.getBoardingTime() != null
@@ -167,7 +167,7 @@
        line1Table.setWidthPercentage(100);
        line1Table.setSpacingAfter(5f);
        // 列宽比例：分隔条列固定为8pt，内容列按比例分配
        line1Table.setWidths(new float[]{4, 200, 4, 374});
        line1Table.setWidths(new float[]{1, 300, 1, 374});

        // 列1：申请时间前的蓝色分隔条（宽度由表格列宽控制）
        line1Table.addCell(createBlueSeparatorCell());
@@ -195,7 +195,7 @@
        line2Table.setWidthPercentage(100);
        line2Table.setSpacingAfter(15f);
        // 与第一行保持完全相同的列宽比例（确保分隔条对齐）
        line2Table.setWidths(new float[]{4, 200, 4, 374});
        line2Table.setWidths(new float[]{1, 300, 1, 374});

        // 列1：手机号前的蓝色分隔条
        line2Table.addCell(createBlueSeparatorCell());
@@ -243,6 +243,8 @@
        cell.setHorizontalAlignment(Element.ALIGN_LEFT);
        return cell;
    }


    private void addOrderTable(Document document, List<TripOrderVo> orders) throws DocumentException {
        // 调整列宽：第1列（序号）加宽至1.5f
        float[] columnWidths = {1.5f, 2f, 2f, 3f, 2f, 3f, 3f, 2f};
@@ -259,13 +261,15 @@
        for (String header : headers) {
            PdfPCell cell = new PdfPCell(new Paragraph(header, headerFont));
            cell.setBackgroundColor(headerBg);
            cell.setPadding(5);
            cell.setPadding(8);
            cell.setHorizontalAlignment(Element.ALIGN_CENTER);
            cell.setBorder(Rectangle.NO_BORDER); // 无边框
            table.addCell(cell);
        }
           SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 格式可根据需求调整
        SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 格式可根据需求调整
        // 单元格样式（居中对齐，统一处理）
        Font cellFont = getChineseFont(9, Font.NORMAL);
        cellFont.setColor(new BaseColor(80, 80, 80));
        for (int i = 0; i < orders.size(); i++) {
            TripOrderVo order = orders.get(i);
            // 序号列：强制居中，内容为 i+1
@@ -289,6 +293,9 @@
            );
            moneyCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
            moneyCell.setPadding(5);
            moneyCell.setBorder(Rectangle.NO_BORDER); // 无边框
            moneyCell.setBorderWidthBottom(0.5f);
            moneyCell.setBorderColorBottom(new BaseColor(190, 190, 190));
            table.addCell(moneyCell);
        }

@@ -297,9 +304,13 @@

    // 辅助方法：创建居中对齐的单元格
    private void addCenteredCell(PdfPTable table, String text, Font font) {
        PdfPCell cell = new PdfPCell(new Paragraph(text != null ? text : "", font));
        Paragraph elements = new Paragraph(text != null ? text : "", font);
        PdfPCell cell = new PdfPCell(elements);
        cell.setPadding(5);
        cell.setHorizontalAlignment(Element.ALIGN_CENTER);
        cell.setBorder(Rectangle.NO_BORDER); // 无边框
        cell.setBorderWidthBottom(0.5f);
        cell.setBorderColorBottom(new BaseColor(190, 190, 190));
        table.addCell(cell);
    }


 UserQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -128,4 +128,4 @@
# pdf生成位置
trip:
  sheet:
    filePath: /etraffic/server/qytPdf/
    filePath: E:\etraffic\server\qytPdf\

 UserQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java

@@ -1,99 +1,121 @@
//package com.stylefeng.guns;
//
//import com.alibaba.fastjson.JSON;
//import com.stylefeng.guns.core.util.ToolUtil;
//import com.stylefeng.guns.modular.shunfeng.model.DriverRide;
//import com.stylefeng.guns.modular.shunfeng.model.Evaluate;
//import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
//import com.stylefeng.guns.modular.shunfeng.service.IDriverRideService;
//import com.stylefeng.guns.modular.shunfeng.service.IEvaluateService;
//import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
//import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
//import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
//import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
//import com.stylefeng.guns.modular.system.model.Company;
//import com.stylefeng.guns.modular.system.model.Driver;
//import com.stylefeng.guns.modular.system.model.SensitiveWords;
//import com.stylefeng.guns.modular.system.model.UserInfo;
//import com.stylefeng.guns.modular.system.service.ICompanyService;
//import com.stylefeng.guns.modular.system.service.IDriverService;
//import com.stylefeng.guns.modular.system.service.IUserInfoService;
//import com.stylefeng.guns.modular.system.util.EmailUtil;
//import com.stylefeng.guns.modular.system.util.ResultUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.AESUtils;
//import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
//import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.BeanUtils;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import javax.annotation.Resource;
//import javax.mail.MessagingException;
//import java.io.UnsupportedEncodingException;
//import java.math.BigDecimal;
//import java.util.Date;
//import java.util.HashSet;
//import java.util.List;
//import java.util.Set;
//
///**
// * SpringBoot方式启动类
// *
// * @author stylefeng
// * @Date 2017/5/21 12:06
// */
//@Slf4j
//@RunWith(SpringRunner.class)
//@SpringBootTest
//public class GunsApplicationTest {
//
//    @Autowired
//    private IOrderPrivateCarService orderPrivateCarService;
//
//    @Autowired
//    private IUserInfoService userInfoService;
//
//    @Autowired
//    private IDriverService driverService;
//    @Autowired
//    private ICompanyService companyService;
//    @Autowired
//    private IPaymentRecordService paymentRecordService;
//    @Autowired
//    private EmailUtil emailUtil;
//    /*顺风车司机*/
//    @Autowired
//    private IDriverRideService driverRideService;
//
//    @Resource
//    private SensitiveWordsMapper sensitiveWordsMapper;
//    /*评价*/
//    @Autowired
//    private IEvaluateService evaluateService;
//    /*顺风车订单*/
//    @Autowired
//    private IOrderRideService orderRideService;
//
//
//
//
//    @Test
//    public void test(){
//        RegisterViaMobileRequest request = new RegisterViaMobileRequest();
//        request.setMobile("15828353222");
//        request.setEncryptType("aesbase64");
//        request.setPassword(AESUtils.encryptBase64("123456"));
//        request.setNickname("测试");
////        request.setVerify_code(code);
////        request.setVerify_code_type("0");
//        RegisterViaMobile register = UserUtil.registerViaMobile(request);
//        System.err.println(register);
//    }
//}
package com.stylefeng.guns;

import com.alibaba.fastjson.JSON;
import com.itextpdf.text.DocumentException;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.shunfeng.model.DriverRide;
import com.stylefeng.guns.modular.shunfeng.model.Evaluate;
import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
import com.stylefeng.guns.modular.shunfeng.service.IDriverRideService;
import com.stylefeng.guns.modular.shunfeng.service.IEvaluateService;
import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.SensitiveWords;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.model.vo.TripOrderVo;
import com.stylefeng.guns.modular.system.pdf.TripSheetGenerator;
import com.stylefeng.guns.modular.system.service.ICompanyService;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.AESUtils;
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;

import javax.annotation.Resource;
import javax.mail.MessagingException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.*;

/**
 * SpringBoot方式启动类
 *
 * @author stylefeng
 * @Date 2017/5/21 12:06
 */
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
public class GunsApplicationTest {

    @Autowired
    private IOrderPrivateCarService orderPrivateCarService;

    @Autowired
    private IUserInfoService userInfoService;

    @Autowired
    private IDriverService driverService;
    @Autowired
    private ICompanyService companyService;
    @Autowired
    private IPaymentRecordService paymentRecordService;
    @Autowired
    private EmailUtil emailUtil;
    /*顺风车司机*/
    @Autowired
    private IDriverRideService driverRideService;

    @Resource
    private SensitiveWordsMapper sensitiveWordsMapper;
    /*评价*/
    @Autowired
    private IEvaluateService evaluateService;
    /*顺风车订单*/
    @Autowired
    private TripSheetGenerator tripSheetGenerator;




    @Test
    public void test(){
        List<TripOrderVo> tripOrderVos = new ArrayList<>();
        TripOrderVo tripOrderVo = new TripOrderVo();
        tripOrderVo.setOrderId(1);
        tripOrderVo.setOrderTime("2026-01-07 12:00:01");
        tripOrderVo.setStartAddress("测试地址1");
        tripOrderVo.setEndAddress("测试地址2");
        tripOrderVo.setCompanyName("fuwushang");
        tripOrderVo.setCity("成都市");
        tripOrderVo.setBoardingTime(new Date());
        tripOrderVo.setPayMoney(10D);
        tripOrderVo.setServerCarModel("网约车");
        tripOrderVos.add(tripOrderVo);
        tripOrderVo = new TripOrderVo();
        tripOrderVo.setOrderId(1);
        tripOrderVo.setOrderTime("2026-01-07 12:00:01");
        tripOrderVo.setStartAddress("测试地址1");
        tripOrderVo.setEndAddress("测试地址2");
        tripOrderVo.setCompanyName("fuwushang");
        tripOrderVo.setCity("成都市");
        tripOrderVo.setBoardingTime(new Date());
        tripOrderVo.setPayMoney(10D);
        tripOrderVo.setServerCarModel("网约车");
        tripOrderVos.add(tripOrderVo);
        try {
            String filePath = tripSheetGenerator.generatePdf(tripOrderVos);
        } catch (DocumentException e) {
            throw new RuntimeException(e);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
}