6.11

luodangjia

2024-06-11 9d2babb8bb99d55d76eab0558fd9f510652b270c

6.11

 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml

@@ -27,23 +27,34 @@


    <select id="queryApplyReassignList" resultType="map">
        select
        a.id as id,
        DATE_FORMAT(a.insertTime, '%Y年%m月%d日%H:%i') as applyTime,
        if(a.orderType = 1, c.startAddress, b.startAddress) as startAddress,
        if(a.orderType = 1, c.endAddress, b.endAddress) as endAddress,
        CONCAT(d.`name`, '-', f.carLicensePlate) applyDriver,
        CONCAT(e.`name`, '-', g.carLicensePlate) nowDriver,
        a.state as state,
        a.orderType as orderType
        from t_reassign a
        left join t_order_cross_city b on (a.orderId = b.id and a.orderType = 3)
        left join t_order_private_car c on (a.orderId = c.id and a.orderType = 1)
        left join t_driver d on (a.originalDriverId = d.id)
        left join t_driver e on (a.nowDriverId = e.id)
        left join t_car f on (d.carId = f.id)
        left join t_car g on (e.carId = g.id)
        where a.orderType in (1, 3)
        SELECT
        a.id AS id,
        DATE_FORMAT(a.insertTime, '%Y年%m月%d日%H:%i') AS applyTime,
        CASE
        WHEN a.orderType = 1 THEN c.startAddress
        WHEN a.orderType = 3 THEN b.startAddress
        WHEN a.orderType = 7 THEN t.startAddress -- 假设t_order_transfer表有startAddress和endAddress字段
        ELSE NULL
        END AS startAddress,
        CASE
        WHEN a.orderType = 1 THEN c.endAddress
        WHEN a.orderType = 3 THEN b.endAddress
        WHEN a.orderType = 7 THEN t.endAddress -- 同样假设t_order_transfer表有这些字段
        ELSE NULL
        END AS endAddress,
        CONCAT(d.name, '-', f.carLicensePlate) AS applyDriver,
        CONCAT(e.name, '-', g.carLicensePlate) AS nowDriver,
        a.state AS state,
        a.orderType AS orderType
        FROM t_reassign a
        LEFT JOIN t_order_cross_city b ON (a.orderId = b.id AND a.orderType = 3)
        LEFT JOIN t_order_private_car c ON (a.orderId = c.id AND a.orderType = 1)
        LEFT JOIN t_order_transfer t ON (a.orderId = t.id AND a.orderType = 7) -- 确保联接条件正确处理orderType=7
        LEFT JOIN t_driver d ON (a.originalDriverId = d.id)
        LEFT JOIN t_driver e ON (a.nowDriverId = e.id)
        LEFT JOIN t_car f ON (d.carId = f.id)
        LEFT JOIN t_car g ON (e.carId = g.id)
        WHERE a.orderType IN (1, 3, 7); -- 更新WHERE子句以包含orderType=7
        <if test="null != companyId">
            and if(d.franchiseeId is null or d.franchiseeId = 0, d.companyId = #{companyId}, d.franchiseeId = #{companyId})
        </if>

 DriverNTTravel/.idea/workspace.xml

@@ -5,74 +5,55 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="a7570672-bfad-4d39-9825-905c049a9d7e" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTransferMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTransferMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTransferCar.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTransferService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverFacialFailMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverFacialFail.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCitySiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/util/Jisuan.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/model/SiteDto.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/misc.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SiteMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SiteMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/git_toolbox_prj.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTransfer.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTransfer.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/transfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/transfer.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/KaiPiaoUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/KaiPiaoUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/InvoiceDetails.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/InvoiceDetails.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/MaterialInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/MaterialInfo.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AmapGeocoding.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AmapGeocoding.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-core/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-core/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -458,6 +439,8 @@
  &quot;keyToString&quot;: {
    &quot;Maven.guns-admin [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-admin [package].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [package].executor&quot;: &quot;Run&quot;,
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
@@ -468,13 +451,13 @@
    &quot;Spring Boot.GunsApplication.executor&quot;: &quot;Debug&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/study/NTTravel/DispatchOKTravel&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/study/NTTravel/DriverNTTravel&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
    &quot;应用程序.CompareFace.executor&quot;: &quot;Debug&quot;
  }
@@ -624,7 +607,17 @@
      <workItem from="1717406236377" duration="1168000" />
      <workItem from="1717408102063" duration="10633000" />
      <workItem from="1717493148714" duration="1613000" />
      <workItem from="1717552295849" duration="3859000" />
      <workItem from="1717552295849" duration="5093000" />
      <workItem from="1717639014479" duration="5163000" />
      <workItem from="1717656444588" duration="594000" />
      <workItem from="1717661464215" duration="5246000" />
      <workItem from="1717728823948" duration="301000" />
      <workItem from="1717730050686" duration="3291000" />
      <workItem from="1717745322950" duration="47000" />
      <workItem from="1717745378685" duration="5488000" />
      <workItem from="1718066731254" duration="8571000" />
      <workItem from="1718088926780" duration="362000" />
      <workItem from="1718089411022" duration="596000" />
    </task>
    <servers />
  </component>
@@ -710,11 +703,6 @@
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java</url>
          <line>722</line>
          <option name="timeStamp" value="15" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java</url>
          <line>96</line>
          <option name="timeStamp" value="20" />
@@ -756,7 +744,7 @@
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java</url>
          <line>529</line>
          <line>532</line>
          <option name="timeStamp" value="31" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
@@ -764,6 +752,26 @@
          <line>522</line>
          <option name="timeStamp" value="33" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java</url>
          <line>524</line>
          <option name="timeStamp" value="42" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java</url>
          <line>201</line>
          <option name="timeStamp" value="44" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java</url>
          <line>109</line>
          <option name="timeStamp" value="45" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java</url>
          <line>195</line>
          <option name="timeStamp" value="46" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <watches-manager>

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -364,9 +364,9 @@
                driverService.updateById(driver);
                return ResultUtil.success();
            }
            driver.setFailCount(driver.getFailCount()==null? 0: driver.getFailCount()+1);
            driver.setFailCount(driver.getFailCount()==null? 2: driver.getFailCount()+1);
            driverService.updateById(driver);
            if (driver.getFailCount()>=5){
            if (driver.getFailCount()>6){
                DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
                List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
                if(list.size() > 0){

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

@@ -620,7 +620,7 @@
    @ApiOperation(value = "提交改派申请", tags = {"司机端-服务中"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车，7=接送机）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额）", name = "payType", required = false, dataType = "int"),
            @ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"),
            @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java

@@ -48,4 +48,5 @@
    List<Map<String, Object>> queryOrderList(@Param("state") Integer state, @Param("driverId") Integer driverId);
    Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId);

    List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("driverId") Integer driverId);
}

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml

@@ -311,14 +311,16 @@
        (select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9) and to_days(insertTime) = to_days(now())) +
        (select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9) and to_days(insertTime) = to_days(now())) +
        (select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9) and to_days(insertTime) = to_days(now())) +
        (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9) and to_days(insertTime) = to_days(now()))
        ) as dayNum,
        (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9) and to_days(insertTime) = to_days(now()))+
        (select count(id) from t_order_transfer where driverId = a.id and state in (7, 8, 9) and to_days(insertTime) = to_days(now()))
            ) as dayNum,
        (
        (select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m')) +
        (select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m')) +
        (select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m')) +
        (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m'))
        ) as mouthNum,
        (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m'))+
        (select count(id) from t_order_transfer where driverId = a.id and state in (7, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m'))
            ) as mouthNum,
        ((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(fraction) from t_order_evaluate where driverId = a.id)) as score,
        if((select count(id) from t_driver_work where driverId = a.id and state = 1) != 0, 1, 2) as `work`
        from t_driver a
@@ -359,10 +361,9 @@
        CONCAT(d.`name`, c.`name`) as brand,
        (
        (select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9)) +
        (select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9)) +
        (select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9)) +
        (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9))
        ) as orderNum,
        (select count(id) from t_order_transfer where driverId = a.id and state in (7, 8, 9))
            ) as orderNum,
        ((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(fraction) from t_order_evaluate where driverId = a.id)) as score
        from t_driver a
        left join t_car b on (a.carId = b.id)

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml

@@ -167,7 +167,7 @@
        <if test="state == 1">
            select
            id as id,
            (7) as type,
            (1) as type,
            ('接送机订单') as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,
@@ -185,7 +185,7 @@

            select
            id as id,
            (7) as type,
            (1) as type,
            ('接送机订单') as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,
@@ -202,7 +202,7 @@
        <if test="state == 2">
            select
            id as id,
            (7) as type,
            (1) as type,
            ('接送机订单') as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,
@@ -237,7 +237,35 @@
            companyId as companyId
        from t_order_transfer where id = #{orderId}
    </select>

    <select id="queryMyAllOrder" resultType="map">
        select
        id as id,
        (7) as type,
        ('接送机订单') as `name`,
        DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        state as state,
        orderType as reservation,
        orderMoney as orderMoney,
        payManner as payManner,
        UNIX_TIMESTAMP(travelTime) as travelTime,
        remark as remark
        from t_order_transfer where driverId = #{driverId}
        <if test="state == 1">
            and state != 1
        </if>
        <if test="state == 2">
            and state = 7
        </if>
        <if test="state == 3">
            and state = 10
        </if>
        <if test="state == 4">
            and state in (6, 7, 8, 9)
        </if>
        order by insertTime desc
    </select>

    <select id="queryOrderInfo" resultType="map">
        select

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java

@@ -58,4 +58,6 @@
    Map<String, Object> queryMoneyInfo(Integer orderId) throws Exception;

    ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception;

    List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
}

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -342,6 +342,9 @@
        driver.setSex(registeredWarpper.getSex());
        driver.setIdCard(registeredWarpper.getIdCard());

        //设置人脸识别照片
        driver.setFaceImgUrl(registeredWarpper.getFaceImgUrl());

        String code = registeredWarpper.getPlaceOfEmployment();
        Company query = companyCityService.query(code);
        if(null == query){

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -206,7 +206,7 @@
        datas.addAll(list3);

        //接送机
        List<Map<String, Object>> list4 = orderTransferService.queryOrderList(state,uid);
        List<Map<String, Object>> list4 = orderTransferService.queryMyAllOrder(state,uid);
        datas.addAll(list4);

        List<OrderListWarpper> orderListWarpper = OrderListWarpper.getOrderListWarpper(datas);

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -85,7 +85,8 @@
    private String callbackPath;



    @Autowired
    private ITOrderTransferService orderTransferService;
    /**
     * 提交改派申请
     * @param uid           申请司机id
@@ -208,6 +209,17 @@
                        //添加已收入明细
                        incomeService.saveData(1, orderLogistics1.getCompanyId(), 4, orderLogistics1.getId(), orderLogistics1.getType(), reassign.getMoney());
                        break;

                    case 7:
                        TOrderTransfer orderTransfer = orderTransferService.selectById(reassign.getOrderId());
                        orderTransfer.setOldState(orderTransfer.getState());
                        orderTransfer.setState(11);
                        orderTransfer.setReassignNotice(2);
                        orderTransferService.updateById(orderTransfer);

                        //添加已收入明细
                        incomeService.saveData(1, orderTransfer.getCompanyId(), 4, orderTransfer.getId(), 7, reassign.getMoney());
                        break;
                }

                systemNoticeService.addSystemNotice(2, "您已使用余额成功支付改派申请费用！", uid);

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java

@@ -206,7 +206,10 @@
    public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
        return this.baseMapper.queryOrderInfo(orderId);
    }

    @Override
    public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
        return this.baseMapper.queryMyAllOrder(state, uid);
    }
    @Override
    public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
        TOrderTransfer orderPrivateCar = this.selectById(orderId);

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -71,11 +71,15 @@
       //从后台获取人脸识别的配置，比对最后一次打卡时间后进行socket推送
        List<Integer> pullDrivers = new ArrayList<>();

        List<Driver> drivers1 = new ArrayList<>();

        List<Driver> todrivers = driverService.selectBatchIds(drivers);
        Date now = new Date();
        for (Driver todriver : todrivers) {
            if (todriver.getLastFacialTime()==null){
                pullDrivers.add(todriver.getId());
                todriver.setFailCount(1);
                drivers1.add(todriver);
                continue;
            }
            Date lastFacialTime = todriver.getLastFacialTime();
@@ -91,7 +95,7 @@
                pullDrivers.add(todriver.getId());
            }
        }

        driverService.updateBatchById(drivers1);
        if (!pullDrivers.isEmpty()){
            for (Integer pullDriver : pullDrivers) {
                pushUtil.pushFaceTime(2,pullDriver);
@@ -154,6 +158,7 @@
    }



//
//    /**
//     * 每月第一天的1点执行的任务

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java

@@ -2,10 +2,12 @@

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@ApiModel("司机注册信息")
@Data
public class RegisteredWarpper {
    @ApiModelProperty("电话")
    private String phone;
@@ -35,6 +37,8 @@
    private String placeOfPractice;
    @ApiModelProperty("头像")
    private String headImgUrl;
    @ApiModelProperty("人脸识别照片")
    private String faceImgUrl;
    @ApiModelProperty("驾驶证照片")
    private String driveCardImgUrl;
    @ApiModelProperty("网约车资格证照片")

 DriverNTTravel/guns-admin/src/main/resources/application.yml

@@ -66,9 +66,9 @@

#spring:
#  datasource:
#    url: jdbc:mysql://127.0.0.1:3306/fbtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: 123456
#    url: jdbc:mysql://120.27.134.189:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: weilai
#    password: WeiLaiChuXing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat

@@ -99,10 +99,10 @@
---

alipay:
  appid: 2021003182697451  #应用程序唯一标识
  appPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDKgxcRcU+RdiXJxmH/vguaZjpAT+C7MZsg6HKH4fDNztUbuxVSwQgWfwfKEnecxrU3K9y6MwHLC3TCQ/NcYGOYKLpz6mZI23Qrqu6XPwIPZZ9sy5e3jNpuZdBM1S+kbCOyEKnUHQjQyO6IacccPU1ZQ/X+uENEBEFGJvWXDYRZcaaiGFJQ6GQTSVBIE9sLSP8IeN8erqkABM5tfdjAHf6QPnDJM1koaSH2GGWYj6dANaG75/BsGXbslgSBsAiAhO4CiclpYp7BtBOAw1Ww3v/KiaGOViu3+ZEYmNRm2SxYkosSmDmTdR8pkn1scwuCsX0hFKBQFU4r4bPxkBeWPmkpAgMBAAECggEAdFlupnnYgjVELrJI2ZtBpVq4evypnEM64mRKcSFxrXz42W7aKGp5EBu5yPJlQHC16tXLgjsN+69ATOCncFp8vg4gWbrBO3jCPNh/LexobZowR1yNdUp6sNTUIWCWd7wdog+K0zA/QV1AFqXXXLUnvHKcYdVR6EEdk4WMslV0xcHNV0XfcabojGWk177HX0CWeN5FmfbJEU0uG8Hh0ViuiKAN/yAezZzuV0iHLsh9RosEniqzbTUlFrY+klbf2jTblhlrzQEXg6uz7EaZXuRfnEm+lyU1JHPffuGgVd9NwKgff/nY+1gW3CEfATI3uP8c5TMU2ZzlpduMnPH3CPzk5QKBgQDuW+XUpGV9DYj/52W1RW13VX0XZx8saQ7k9dzapNg1wBzZB+O8Zk31y8t44WeC63xQBW1Wh5nKuj0PPAyz38UFbskmFbkdXYe6fLTHM8nxqQH90tetKbfjgVLjf0CevJTQHk78//VWCeekLTqdjtnsaiqSNhMonEUM0o0xkpjJ1wKBgQDZgAOL1tpH57SZCP9AS5e7qQZbKC6dh6eO8KSei8qb7KYSjKAT/+dFEzZUI3yAqr3vP96VBnEe9Ox49NtfccjdNas8U7Qiq5ZynumX3ib7BYCTicEppW1cjmEfJcgGnDBsCdYY2nILKr/wH4kxy00ZXTBiAl0KMK8YWNwFuYoE/wKBgAiuejGDh1rFqm6/q9mtXK5TA8pdbCo+7VbziYbBKErU43gYLHhJNZ+1O4T8mLuQ/icf+3qCV9ylaeHrKv9GMDPhdBwaAHMMXAwzzJXQ0hMmN7dZ/ZcGBPeZVz6H/P+LGNR3tiLK49GtbK1zJEZm1JMizsgihhIdlvo/lPrwPvZjAoGAOBOiVm6ZrspVrNM+BFS5FUA6DEyq4CC2mcr/loUSQutb0hKBv0ZOWWffrQfNNNtQxxufhqq3hbS+N11iJhSPJkGNGau3GO1Gh9zi+y3ivPupL+DndZZaQO/QqJg0H0grz98lXRkNKEXoYL+wvq7c/Poi3FIhrNvqeQuIBs3UgP8CgYAY5CMeCy/blBTkoAuPFyncFBM2gwgHuNmMRjJUK+xQC5+hAufmDR6unmF1Oq6izISfiZVSYyIn1PvVoGTOkl9WwoSwaC4Pk90rVRhdtw0fBzmv7kseJLzJdWa9AtIv4+/Ew3GvH/+QOuLaUL1/SlcRZk1bjLqUUgOlW0BGpcb0Ow== #开发者应用私钥
  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyoMXEXFPkXYlycZh/74LmmY6QE/guzGbIOhyh+Hwzc7VG7sVUsEIFn8HyhJ3nMa1NyvcujMBywt0wkPzXGBjmCi6c+pmSNt0K6rulz8CD2WfbMuXt4zabmXQTNUvpGwjshCp1B0I0MjuiGnHHD1NWUP1/rhDRARBRib1lw2EWXGmohhSUOhkE0lQSBPbC0j/CHjfHq6pAATObX3YwB3+kD5wyTNZKGkh9hhlmI+nQDWhu+fwbBl27JYEgbAIgITuAonJaWKewbQTgMNVsN7/yomhjlYrt/mRGJjUZtksWJKLEpg5k3UfKZJ9bHMLgrF9IRSgUBVOK+Gz8ZAXlj5pKQIDAQAB #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsi4M2NzIx0UQVa7pSXZnAqzNWgGaFmfjOrkwtlxnCdnqcl/9TnXNc86N+EBnBa7xKeb6hrGn/ZE+Ex6imZMp5V41+lJZ6Ynqk3zAvaPLgiq2DU4PHRBTaJZlcoBONemHgggGq2NqQRUUNfty9ZHZejDJic1WOX+BypEZgph1yZ6z4CcxeXXCHYlWViKvwGFRZtuvcypP3Uv7juIA460C1y/+etDxaUC4LPIxQJeCI9rPCTQb54rkJd0Htbvv525tVovhJxXvF9J/XE2LzYier7T8tQJ/TYGvVvZoMmyWWIO3SBuWwjp1nSh9tfbfXTRIUJjWVFTMS04WR6oG9tDS+QIDAQAB #支付宝公钥
  appid: 2021004148610407  #应用程序唯一标识
  appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqpEBIZU+2eAOSGq0AjUQL3Od/F7mNomIUlrKrO0teG9HFY8QNhFbz7cWCbhSXdYu0u9tjsvTfvtEmiuV08qEFKHisRYEorm/stCkIiJvph6v8CJwWWsXErJ9vG1Y4ijw18IoQEvE66mUJfIc1qTeUhE2lPLjHyZ1Sli6ddHpvxC5dE4J9Sq5KfKpRhcRWzsVA3RwXi3E/0YeascVzx7C9vgJYPPw5nL7vCORa1o4zlem5LVl13PHte60y8b4fIGrhOY4HLo12VX0vxDrKD7BFH+J4CqUAK2155EMUrf2tgAhel091AR/KO7KdvNaLFpeVu28UkUUUC0q7mUt2+ph9AgMBAAECggEAIIX7xpCgt8t6Cr/Q13kVThmFeeDAufEINppeZWqAu+gbfD6+oEDn/cgEzA5FGHUL8p+XehIiv/5ziKASic6wx/XlwhfhPSq6JGhWJc07wi/cpMXTUiNs7EZmgNu5/D7EqRc2iUfC+JKyPTOh5aVh9Ymd7u963IFd3d7H9bS8nU58Ryz/5vwLv5rHyHhOMuzPZ8KNfM04hRCsPwI3w4k95VFAJ+YeD9iZ6Dc+GVhr6HhFwyMBajCPJ/h+FB06ASkj9nT0P3gMpAY8wT+yyuISOkBqxiZ1wVTQifGvaxDQ7epvjV+ByhYdabv+UweWPQQMMm7+hw0Q1LaKQxfvTJ+0wQKBgQDSNcOavnH07cuDE6yyRqRRK4WojdlxYB7TdEiDCaCBaYB3dMxe01ZmsCHVRU98WWPHYTfnQq6RGRieDxEGfkyHi7ru1KRjCQzDcdv4lwT2bPhKqQE2oGWgf4akdZI/l7Hick0SHaNIeGbdY1znE9MhCdWdm/zADT+yPzALn5bPMQKBgQDPz/pwxhUQ7D83CbUb6plIRj4yW3cSC/u4W6WkQvzK+avLbGFY2GWAdc4RwcE/yIaRWvStLgmagvKvdUwWPp0k3Svue6Nu+veCZWGQ8uVnGbREu1tpgCnG2uGT8ugYiLY93WOb2daQwmFYASz63n1ge/gpbv83vs9jP4RlmgyDDQKBgF8VSqEYO9uaJE/p+le5dGHy2cZgQ1bxL4BePN5o4F0pJ57hCgBqf857JRKfA1Ev7d4lr2+/zc58F5KHJiBVyLAXGDsnnCPf2BIf0mwjg28j4zuCLrZS3yU2CeUh+UEikKfpI8tp9I23SHAjncY4RWvQUvuzryP/2iv6QPVA/qpBAoGAWdXTsuq+cpleXoGQzGenKcpL2uMVXzTU9YaQ3aijtW8nKAJLNugdQOIsWhrDWrpqCe4i9baAKk5PcTAo2zjoH+aItki2hyRw2OrQuaN3LhG7jzbbNolUBgXbHGUWlnyLI8VP6TDLg7qz8CJZ+n0yAAK3bdnw9H1FE+eCaZWlsQUCgYEAxWAzNHpNMqM6zCCjR3ynKH6acknPuzEtbGoSXdqP+5Pz9j0MA0Oc2cIRoitM5/BNdWxXoXxq6wmiH3bKEpxjtY3tdJQQA3aEmZtkn7w7vBhxiIBejIlJ3bygBDGOPkO1CDS3i3NtG7cbyhbCGl7a77Vyr+CxBN9VROZansQoKIw= #开发者应用私钥
  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqRASGVPtngDkhqtAI1EC9znfxe5jaJiFJayqztLXhvRxWPEDYRW8+3Fgm4Ul3WLtLvbY7L0377RJorldPKhBSh4rEWBKK5v7LQpCIib6Yer/AicFlrFxKyfbxtWOIo8NfCKEBLxOuplCXyHNak3lIRNpTy4x8mdUpYunXR6b8QuXROCfUquSnyqUYXEVs7FQN0cF4txP9GHmrHFc8ewvb4CWDz8OZy+7wjkWtaOM5XpuS1Zddzx7XutMvG+HyBq4TmOBy6NdlV9L8Q6yg+wRR/ieAqlACtteeRDFK39rYAIXpdPdQEfyjuynbzWixaXlbtvFJFFFAtKu5lLdvqYfQIDAQAB #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh6DotQ6+AR2etHXyfeN89PrCO/GIVFsgNCupDa64+3m6JJqigUQOMh16eDEAkT4Pk6jTqnTuiYQN0NFyzVZeBFW1/iAKNhctd/oK7mvQDdpvIcpXzBizG2DCg8iBVlK1h6mgZH6OVj1q4kmljaEYvFw2Y/MXwSxPiMW5FE9CfPM4ca11JEFhsNMZAzKER+9gSCCg/FtCOUmj6OofA/+4gi15cmCkxYU1FY6AEp544q3FDwMx+ejC/Zw03FD2YS+jX/jkp10lIZo6G9DOLkA3jviBO/Q/MFZUH2XEqddrGOGeT220h6XYEvgJUcxGoxnf0qF5LE5Ef13kQbO6CqnXSwIDAQAB #支付宝公钥

---

@@ -127,9 +127,9 @@

#支付回调地址
#正式环境
#callbackPath: https://weilaigo.cn/driver
callbackPath: https://weilaigo.cn/driver
#测试环境
callbackPath: http://221.182.45.100:8999/driver
#callbackPath: http://221.182.45.100:8999/driver

---
#交通部推送数据功能开关

 DriverNTTravel/guns-admin/src/main/resources/redis.properties

@@ -7,7 +7,7 @@
spring.redis.port=6379
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=123456
#spring.redis.password=
#spring.redis.password=WeiLaiChuXing@2024!
# Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©
spring.redis.jedis.pool.max-active=1024
# Á¬½Ó³Ø×î´ó×èÈûµÈ´ýʱ¼ä£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©

 ManagementNTTravel/.idea/git_toolbox_prj.xml

New file
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="GitToolBoxProjectSettings">
    <option name="commitMessageIssueKeyValidationOverride">
      <BoolValueOverride>
        <option name="enabled" value="true" />
      </BoolValueOverride>
    </option>
    <option name="commitMessageValidationEnabledOverride">
      <BoolValueOverride>
        <option name="enabled" value="true" />
      </BoolValueOverride>
    </option>
  </component>
</project>

 ManagementNTTravel/.idea/modules.xml

New file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/guns-admin/guns-admin.iml" filepath="$PROJECT_DIR$/guns-admin/guns-admin.iml" />
      <module fileurl="file://$PROJECT_DIR$/guns-core/guns-core.iml" filepath="$PROJECT_DIR$/guns-core/guns-core.iml" />
      <module fileurl="file://$PROJECT_DIR$/guns-generator/guns-generator.iml" filepath="$PROJECT_DIR$/guns-generator/guns-generator.iml" />
      <module fileurl="file://$PROJECT_DIR$/guns-parent.iml" filepath="$PROJECT_DIR$/guns-parent.iml" />
      <module fileurl="file://$PROJECT_DIR$/guns-rest/guns-rest.iml" filepath="$PROJECT_DIR$/guns-rest/guns-rest.iml" />
    </modules>
  </component>
</project>

 ManagementNTTravel/guns-admin/pom.xml

@@ -210,6 +210,11 @@
            <artifactId>dom4j</artifactId>
            <version>1.6.1</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
    </dependencies>



 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java

@@ -36,7 +36,9 @@
import java.awt.image.BufferedImage;
import java.io.*;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -121,7 +123,32 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(activityGeneralizationService.getList(page,beginTime,endTime,activityName,state));
        List<Map<String, Object>> list = activityGeneralizationService.getList(page, beginTime, endTime, activityName, state);

        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDate currentDate = LocalDate.now();
        for (Map<String, Object> item : list) {
            String timeRangeStr = (String) item.get("time");
            if (timeRangeStr != null && !timeRangeStr.isEmpty()) {
                String[] range = timeRangeStr.split(" — ");
                LocalDate startDate = LocalDate.parse(range[0], formatter);
                LocalDate endDate = LocalDate.parse(range[1], formatter);

                // 判断当前日期是否在范围内
                int newState;
                if (currentDate.isBefore(startDate)) {
                    newState = 2;
                } else if (currentDate.isAfter(endDate)) {
                    newState = 3;
                } else {
                    newState = 1;
                }

                // 更新状态
                item.put("state", newState);
            }
        }
        page.setRecords(list);
        return super.packForBT(page);
    }

@@ -149,7 +176,7 @@
        MyQrCodeUtil.createCodeToFile("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        BufferedImage qrCodeImage = QRCodeUtil.createImage("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        MultipartFile qrCodeFile = convert(qrCodeImage, new Date().getTime()+ UUIDUtil.getRandomCode(3)+".PNG");
        String picture = OssUploadUtil.ossUpload(qrCodeFile);
        String picture = OssUploadUtil.ossUpload1(qrCodeFile);
        System.err.println("二维码："+ picture);
        tActivityGeneralization.setQrCode(picture);
        activityGeneralizationService.updateById(tActivityGeneralization);

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml

@@ -25,7 +25,7 @@
               a.qrCode,
        a.participateCount,a.state,IFNULL(b.count, 0) AS `count`
        from t_activity_generalization a
        LEFT join (SELECT userId,couponActivityId, activityType,COUNT(*) AS `count` FROM t_user_coupon_record where activityType = 5 GROUP BY userId) b
        LEFT join (SELECT userId,couponActivityId, activityType,COUNT(*) AS `count` FROM t_user_coupon_record where activityType = 5 GROUP BY couponActivityId) b
        ON a.id = b.couponActivityId
        WHERE a.isDelete = 1
        <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml

@@ -34,10 +34,12 @@
        ui.phone as userPhone,
        oc.* ,
        sc.`name` as serverCarModel,
        sc.price as price
        cs.serviceMoney as price,
        cs.`serviceName` as serviceName
        FROM t_order_chartered_car as oc
        LEFT JOIN t_user as ui on ui.id = oc.userId
        LEFT JOIN t_server_carmodel as sc on (oc.serverCarModelId = sc.id)
        left join t_chartered_service as cs on (oc.serviceId = cs.id)
        ) as o
        <where>
            o.isDelete = 1

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

@@ -86,7 +86,7 @@
        LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
        ) as o
        <where>
            o.isDelete = 1 and o.type = 1
            o.isDelete = 1
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java

@@ -3,7 +3,10 @@
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.DataSource;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -15,6 +18,7 @@
 * @since 2020-09-24
 */
@TableName("t_order_chartered_car")
@Data
public class TOrderCharteredCar extends Model<TOrderCharteredCar> {

    private static final long serialVersionUID = 1L;
@@ -32,6 +36,8 @@
     * 订单编号
     */
    private String orderNumber;

    private Integer serviceId;
    /**
     * 出行时间
     */
@@ -40,6 +46,7 @@
     * 用车时长（天）
     */
    private BigDecimal carTime;

    /**
     * 服务车型id
     */
@@ -68,6 +75,7 @@
     * 处理备注
     */
    private String remark;
    private String newRemark;
    /**
     * 删除状态（1=否，2=是）
     */

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java

@@ -82,16 +82,16 @@
            driverActivityOnline.setMoney(num5);
            driverActivityOnline.insertOrUpdate();
            //添加在线活动-出租车
            driverActivityOnline = new DriverActivityOnline();
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
            driverActivityOnline.setStartTime(startTimes);
            driverActivityOnline.setEndTime(endTimes);
            driverActivityOnline.setInsertTime(nowDay);
            driverActivityOnline.setType(2);
            driverActivityOnline.setOnline(num6);
            driverActivityOnline.setMoney(num7);
            driverActivityOnline.insertOrUpdate();
//            driverActivityOnline = new DriverActivityOnline();
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
//            driverActivityOnline.setDriverActivityId(driverActivity.getId());
//            driverActivityOnline.setStartTime(startTimes);
//            driverActivityOnline.setEndTime(endTimes);
//            driverActivityOnline.setInsertTime(nowDay);
//            driverActivityOnline.setType(2);
//            driverActivityOnline.setOnline(num6);
//            driverActivityOnline.setMoney(num7);
//            driverActivityOnline.insertOrUpdate();
            //添加在线活动-城际
            driverActivityOnline = new DriverActivityOnline();
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java

@@ -54,4 +54,24 @@
        }
        return fileName;
    }


    public static String ossUpload1(MultipartFile file) throws IOException{
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        String fileName = "";
        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
            InputStream content = file.getInputStream();//获得指定文件的输入流
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            meta.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            String originalFilename = file.getOriginalFilename();
            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            ossClient.putObject(bucketName, "img/" + fileName, content, meta);
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);
                fileName = oss_domain+"img/"+fileName;
            }
        }
        return fileName;
    }
}

 ManagementNTTravel/guns-admin/src/main/resources/application.yml

@@ -55,22 +55,22 @@

---

spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: WeiLaiChuXing@2024!
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat

#spring:
#  datasource:
#    url: jdbc:mysql://192.168.110.34:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    url: jdbc:mysql://127.0.0.1:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: 123456
#    password: WeiLaiChuXing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat

spring:
  datasource:
    url: jdbc:mysql://192.168.110.34:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat


#spring:
#  datasource:

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization.html

@@ -20,8 +20,8 @@
                                    <option value="">全部</option>
                                    <option value="1">已开启</option>
                                    <option value="2">未开启</option>
                                    <option value="3">已过期</option>
                                    <option value="4">暂停</option>
                                    <option value="3">已结束</option>
                                    <option value="4">已暂停</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html

@@ -223,6 +223,48 @@
                                        包车
                                    </label>
                                </div>


                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox7" type="checkbox" value="7" ${1 == item.isTransfer ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox7()">
                                    <label for="checkbox7">
                                        接送机
                                    </label>
                                    <fieldset>
                                        <div class="row" style="display: none;" id="jsjDiv">
                                            <div class="col-sm-6">
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="jsj" id="jsj1" value="1" ${1 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="jsj1">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按比例抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjPercent" name="jsjPercent"
                                                                   @if(1 == item.isTransferFixedOrProportional){
                                                                   value="${item.transferMoney}"
                                                                   @}
                                                            >
                                                            <span>%</span>
                                                        </div>
                                                    </label>
                                                </div>
                                                <div class="checkbox checkbox-circle">
                                                    <input type="radio" name="jsj" id="jsj2" value="2" ${2 == item.isTransferFixedOrProportional ? 'checked=checked' : ''}>
                                                    <label for="jsj2">
                                                        <div style="position: relative;top: -8px;">
                                                            <span>按固定金额抽成,每笔订单抽取</span>
                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="jsjMoney" name="jsjMoney"
                                                                   @if(2 == item.isTransferFixedOrProportional){
                                                                   value="${item.transferMoney}"
                                                                   @}
                                                            >
                                                            <span>元</span>
                                                        </div>
                                                    </label>
                                                </div>
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                            </fieldset>
                        </div>
                    </div>

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html

@@ -187,16 +187,17 @@
                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"  name="zc1" id="content5Num1" class="form-control newWidth" />&nbsp;折
                                    <br/>
                                    <!--

                                    <br/>
                                    出租车活动打折：
                                    接送机活动打折：
                                    &nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"  name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;折
                                    <br/>
                                    <br/>
                                    小件物流活动打折：
                                    &nbsp;<input type="text"  name="zc1" id="content5Num3" class="form-control newWidth" />&nbsp;折
                                    -->
                                    <!--
                                   <br/>
                                   小件物流活动打折：
                                   &nbsp;<input type="text"  name="zc1" id="content5Num3" class="form-control newWidth" />&nbsp;折
                                   -->
                                </div>
                            </div>
                        </div>

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html

@@ -334,9 +334,9 @@
                                                 @}
                                                 name="zc1" id="content5Num1" class="form-control newWidth" />&nbsp;
                                    <br/>
                                    <!--

                                    <br/>
                                    出租车活动打折：
                                    接送机活动打折：
                                    &nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"
                                                 @if(isNotEmpty(item4)){
@@ -346,16 +346,17 @@
                                                 @}
                                                 name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;
                                    <br/>
                                    <br/>
                                    小件物流活动打折：
                                    &nbsp;<input type="text"
                                                 @if(isNotEmpty(item4)){
                                                 value="${item4.logistics}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="zc1" id="content5Num3" class="form-control newWidth" />&nbsp;
                                                 -->
                                    <!--
                            <br/>
                            小件物流活动打折：
                            &nbsp;<input type="text"
                                         @if(isNotEmpty(item4)){
                                         value="${item4.logistics}"
                                         @}else{
                                         value=""
                                         @}
                                         name="zc1" id="content5Num3" class="form-control newWidth" />&nbsp;
                                         -->
                                </div>
                            </div>
                        </div>

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization.js

@@ -113,7 +113,7 @@
    var index = layer.open({
        type: 2,
        title: '推广二维码',
        area: ['50%', '50%'], //宽高
        area: ['50%', '65%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/generalization/qrCodeHtml/' + id

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js

@@ -26,15 +26,15 @@
            }
        },
        {title: '用户ID', field: 'userId', visible: false, align: 'center', valign: 'middle', width:'200px'},
        {title: '提交用户', field: 'userName', visible: true, align: 'center', valign: 'middle', width:'200px',
        {title: '所选服务', field: 'serviceName', visible: true, align: 'center', valign: 'middle', width:'200px',
            formatter: function (value, row) {
                var btn = "";
                if(row.userName != '' && row.userName != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.userName + '" onfocus="TUser.tooltip()">' + row.userName + '</p>']
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.serviceName + '" onfocus="TUser.tooltip()">' + row.serviceName + '</p>']
                }
                return btn;
            }
        },
        }, {title: '服务价格', field: 'price', visible: true, align: 'center', valign: 'middle', width:'200px'},
        {title: '用车时间', field: 'traveltime', visible: true, align: 'center', valign: 'middle', width:'200px',
            formatter: function (value, row) {
                if(typeof value != 'undefined'){
@@ -42,28 +42,38 @@
                }
            }
        },
        {title: '用车时长【天】', field: 'carTime', visible: true, align: 'center', valign: 'middle', width:'200px',
        {title: '用车时长', field: 'carTime', visible: true, align: 'center', valign: 'middle', width:'200px',
            formatter: function (value, row) {
                var btn = "";
                if(row.carTime != '' && row.carTime != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.carTime + '" onfocus="TUser.tooltip()">' + row.carTime + '</p>']
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.carTime + '" onfocus="TUser.tooltip()">' + row.carTime + '</p>天']
                }
                return btn;
            }
        },
        {title: '用车类型', field: 'serverCarModel', visible: true, align: 'center', valign: 'middle', width:'200px'},
        {title: '用车需求', field: 'modelUse', visible: true, align: 'center', valign: 'middle', width:'200px',
            formatter: function (value, row) {
                var btn = "";
                if(row.modelUse != '' && row.modelUse != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.modelUse + '" onfocus="TUser.tooltip()">' + row.modelUse + '</p>']
                }
                return btn;
            }
        },
        {title: '乘车人数', field: 'peopleNumber', visible: true, align: 'center', valign: 'middle', width:'200px'},
        {title: '价格区间', field: 'price', visible: true, align: 'center', valign: 'middle', width:'200px'},
        {title: '联系人', field: 'contactPerson', visible: true, align: 'center', valign: 'middle', width:'200px',
            // {title: '乘车人', field: 'userName', visible: true, align: 'center', valign: 'middle', width:'200px',
            //     formatter: function (value, row) {
            //         var btn = "";
            //         if(row.userName != '' && row.userName != null) {
            //             btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.userName + '" onfocus="TUser.tooltip()">' + row.userName + '</p>']
            //         }
            //         return btn;
            //     }
            // },

        // {title: '用车类型', field: 'serverCarModel', visible: true, align: 'center', valign: 'middle', width:'200px'},
        // {title: '用车需求', field: 'modelUse', visible: true, align: 'center', valign: 'middle', width:'200px',
        //     formatter: function (value, row) {
        //         var btn = "";
        //         if(row.modelUse != '' && row.modelUse != null) {
        //             btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.modelUse + '" onfocus="TUser.tooltip()">' + row.modelUse + '</p>']
        //         }
        //         return btn;
        //     }
        // },
        // {title: '乘车人数', field: 'peopleNumber', visible: true, align: 'center', valign: 'middle', width:'200px'},

        {title: '乘车人', field: 'contactPerson', visible: true, align: 'center', valign: 'middle', width:'200px',
            formatter: function (value, row) {
                var btn = "";
                if(row.contactPerson != '' && row.contactPerson != null) {
@@ -81,6 +91,19 @@
                return btn;
            }
        },
        {title: '备注', field: 'newRemark', visible: true, align: 'center', valign: 'middle', width:'300px',
            formatter: function (value, row) {
                var btn = "";
                if(row.remark != '' && row.remark != null) {
                    var str = row.newRemark;
                    if (str.length > 20){
                        str = str.substring(0,20)+'...<br><button class="btn btn-outline btn-primary" onclick="TOrderCharter.buttonClick(' +  row.id + ')">查看更多</button>';
                    }
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.newRemark + '" onfocus="TUser.tooltip()">' + str + '</p>']
                }
                return btn;
            }
        },
        {title: '处理备注', field: 'remark', visible: true, align: 'center', valign: 'middle', width:'300px',
            formatter: function (value, row) {
                var btn = "";

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

@@ -34,6 +34,19 @@
                return btn;
            }
        },
        {title: '订单类型', field: 'type', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
                if(row.orderSource != '' && row.orderSource != null) {
                    if (row.type == 1){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="普通订单" onfocus="TUser.tooltip()">普通订单</p>']
                    } else if (row.type == 2){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="摆渡订单" onfocus="TUser.tooltip()">摆渡订单</p>']
                    }
                }
                return btn;
            }
        },
        {title: '订单来源', field: 'orderSource', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/transfer.js

@@ -246,7 +246,7 @@
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/transfer/tReassign_reassignmentTransfer/' + Transfer.seItem.id
            content: Feng.ctxPath + '/tReassign/tReassign_reassignmentTransfer/' + Transfer.seItem.id
        });
        this.layerIndex = index;
    }

 UserNTTravel/.idea/workspace.xml

@@ -5,74 +5,55 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="202e88b5-454e-4bc8-8ff5-2d4680354082" name="Default Changelist" comment="Default Changelist">
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTransferMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTransferMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTransferCar.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTransferService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverFacialFailMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverFacialFail.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCitySiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/util/Jisuan.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/model/SiteDto.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/misc.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SiteMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SiteMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/git_toolbox_prj.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTransferMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTransfer.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTransfer.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/transfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/transfer.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/KaiPiaoUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/KaiPiaoUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/InvoiceDetails.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/InvoiceDetails.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/MaterialInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/entity/MaterialInfo.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AmapGeocoding.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AmapGeocoding.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-core/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/guns-core/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -402,35 +383,35 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "Maven.guns-admin [clean].executor": "Run",
    "Maven.guns-admin [package].executor": "Run",
    "Maven.guns-parent [clean].executor": "Run",
    "Maven.guns-parent [package].executor": "Run",
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
    "Spring Boot.GunsRestApplication.executor": "Debug",
    "git-widget-placeholder": "master",
    "kotlin-language-version-configured": "true",
    "last_opened_file_path": "D:/study/NTTravel/DispatchOKTravel",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
    "settings.editor.selected.configurable": "MavenSettings",
    "vue.rearranger.settings.migration": "true",
    "应用程序.ALiSendSms.executor": "Debug",
    "应用程序.KaiPiaoUtil.executor": "Debug",
    "应用程序.Main.executor": "Debug"
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;Maven.guns-admin [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-admin [package].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [package].executor&quot;: &quot;Run&quot;,
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;Spring Boot.GunsRestApplication.executor&quot;: &quot;Debug&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/study/NTTravel/ManagementNTTravel&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
    &quot;应用程序.ALiSendSms.executor&quot;: &quot;Debug&quot;,
    &quot;应用程序.KaiPiaoUtil.executor&quot;: &quot;Debug&quot;,
    &quot;应用程序.Main.executor&quot;: &quot;Debug&quot;
  }
}]]></component>
}</component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="D:\study\NTTravel\UserNTTravel\guns-admin\src\main\java\com\stylefeng\guns\modular\system\util" />
@@ -622,7 +603,18 @@
      <workItem from="1717406233505" duration="1384000" />
      <workItem from="1717408091600" duration="20202000" />
      <workItem from="1717493135960" duration="4451000" />
      <workItem from="1717552313971" duration="5726000" />
      <workItem from="1717552313971" duration="14435000" />
      <workItem from="1717586489280" duration="616000" />
      <workItem from="1717637802271" duration="7192000" />
      <workItem from="1717656441746" duration="2223000" />
      <workItem from="1717661460733" duration="3795000" />
      <workItem from="1717728816751" duration="353000" />
      <workItem from="1717730046867" duration="4720000" />
      <workItem from="1717745331348" duration="40000" />
      <workItem from="1717745385424" duration="5212000" />
      <workItem from="1718066732888" duration="8875000" />
      <workItem from="1718088930158" duration="359000" />
      <workItem from="1718089412780" duration="596000" />
    </task>
    <servers />
  </component>
@@ -719,26 +711,6 @@
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java</url>
          <line>787</line>
          <option name="timeStamp" value="35" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java</url>
          <line>778</line>
          <option name="timeStamp" value="36" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java</url>
          <line>581</line>
          <option name="timeStamp" value="37" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java</url>
          <line>132</line>
          <option name="timeStamp" value="39" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/kaipiao/email/KaiPiaoEmail.java</url>
          <line>61</line>
          <option name="timeStamp" value="43" />
@@ -769,21 +741,6 @@
          <option name="timeStamp" value="81" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java</url>
          <line>89</line>
          <option name="timeStamp" value="85" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java</url>
          <line>92</line>
          <option name="timeStamp" value="86" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java</url>
          <line>361</line>
          <option name="timeStamp" value="87" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java</url>
          <line>127</line>
          <option name="timeStamp" value="88" />
@@ -794,19 +751,24 @@
          <option name="timeStamp" value="92" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java</url>
          <line>81</line>
          <option name="timeStamp" value="95" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java</url>
          <line>85</line>
          <option name="timeStamp" value="99" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java</url>
          <line>92</line>
          <option name="timeStamp" value="97" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java</url>
          <line>83</line>
          <option name="timeStamp" value="100" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java</url>
          <line>272</line>
          <option name="timeStamp" value="98" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java</url>
          <line>85</line>
          <option name="timeStamp" value="103" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java</url>
          <line>1020</line>
          <option name="timeStamp" value="104" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java

@@ -20,7 +20,7 @@
    @ApiModelProperty("联系人电话")
    private String contactPhone;
    @ApiModelProperty("备注")
    private String remark;
    private String newRemark;
    private Integer userId;
    private Double startLon;
    private Double startLat;
@@ -29,4 +29,6 @@
    private Double endLat;
    private String endAddress;

    private Integer serviceId;

}

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java

@@ -50,6 +50,8 @@
     */
    @TableField("serverCarModelId")
    private Integer serverCarModelId;
    @TableField("serviceId")
    private Integer serviceId;
    /**
     * 车型用途
     */
@@ -80,6 +82,8 @@
     */
    @TableField("remark")
    private String remark;
    @TableField("newRemark")
    private String newRemark;

    @TableField("startLon")
    private Double startLon;

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java

@@ -21,6 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.time.LocalDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -120,6 +121,24 @@
    }

    @ResponseBody
    @PostMapping("/get/confirm")
    @ApiOperation(value = "校验当前活动是否过期", tags = {"线下推广页面"}, notes = "")
    @ApiImplicitParams(
            {@ApiImplicitParam(value = "活动Id", name = "acId", required = true, dataType = "int")
    })
    public ResultUtil confirm(Integer acId){
        TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
        // 获取当前时间
        Date now = new Date();
        // 将Date转换为比较友好的形式，这里直接使用
        if (now.after(tActivityGeneralization.getStartTime()) && now.before(tActivityGeneralization.getEndTime())) {
           return ResultUtil.success();
        } else {
            return  ResultUtil.error("该活动已失效");
        }
    }

    @ResponseBody
    @PostMapping("/get/coupon")
    @ApiOperation(value = "获取优惠卷", tags = {"线下推广页面"}, notes = "")
    @ApiImplicitParams({
@@ -127,16 +146,34 @@
            @ApiImplicitParam(value = "验证码", name = "code", required = true, dataType = "String")
    })
    public ResultUtil coupon(String phone,String code,Integer acId){
        //判断验证码是否正确
        // 校验验证码是否正确
        String redisCode = redisUtil.getValue("code:"+phone);
        if (redisCode==null&&!code.equals("111111")){
            return ResultUtil.error("验证码错误");
        }
        if (!code.equals(redisCode)&&!code.equals("111111")) {
            return ResultUtil.error("验证码错误");
        }


        //判断该手机号是否注册
        UserInfo byAccount = userInfoService.selectList(new EntityWrapper<UserInfo>().eq("phone",phone).ne("flag",3)).get(0);
        //已注册直接添加优惠卷
        TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
        // 获取当前时间
        Date now = new Date();
        // 将Date转换为比较友好的形式，这里直接使用
//        if (now.after(tActivityGeneralization.getStartTime()) && now.before(tActivityGeneralization.getEndTime())) {
//            System.out.println("当前时间在活动的开始时间和结束时间之间");
//        } else {
//            return  ResultUtil.error("该活动已失效");
//        }


        SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(tActivityGeneralization.getCouponId());
        if (byAccount != null){
            //判断该账号是否领取
            List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("activityType", 5).eq("couponActivityId", acId));
            List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("userId", byAccount.getId()).eq("activityType", 5).eq("couponActivityId", acId));
            if (!userCouponRecords.isEmpty()){
                return ResultUtil.error("当前用户已领取");
            }
@@ -196,6 +233,7 @@
            aliSms.setCode(code);
            String json = JSONObject.toJSONString(aliSms);
            try {
                redisUtil.setStrValue("code:"+phone, code,15 * 60 * 1000);
                aLiSendSms.sendSms(phone, "SMS_467580138", json);

            } catch (Exception e) {

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml

@@ -230,7 +230,7 @@
        updateTime as updateTime,
        updateUser as updateUser
        from t_driver
        where flag != 3 and state = 2 and authState = 2
        where flag != 3 and state = 2 and authState = 2 and failCount = 0
        <if test="null != companyId">
            <choose>
                <when test="companyId != 1">

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java

@@ -4,13 +4,16 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 企业信息
 */
@TableName("t_company")
@Data
public class Company {
    /**
     * 主键
@@ -253,6 +256,13 @@
     */
    @TableField("insertTime")
    private Date insertTime;
    @TableField("isTransfer")
    private Integer isTransfer;
    @TableField("isTransferFixedOrProportional")
    private Integer isTransferFixedOrProportional;
    @TableField("transferMoney")
    private Double transferMoney;


    public Integer getId() {
        return id;

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCitySite.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.models.auth.In;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
@@ -22,6 +23,7 @@
 */

@TableName("t_open_city_site")
@Data
public class TOpenCitySite extends Model<TOpenCitySite> {

    private static final long serialVersionUID = 1L;
@@ -152,6 +154,8 @@
    private Date insertTime;
    @TableField(exist = false)
    private String insertTime1;
    @TableField(exist = false)
    private String address;
    private Integer openCityId;
    @Override
    protected Serializable pkVal() {

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -297,7 +297,7 @@
        userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(sysCouponRecord.getCouponType())));
        userCouponRecord.setCouponUseType(sysCouponRecord.getCouponUseType());
        userCouponRecord.setInsertTime(date);
        userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(sysCouponRecord.getFullMoney())));
        userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(sysCouponRecord.getFullMoney()==null?0:sysCouponRecord.getFullMoney())));
        userCouponRecord.setMoney(Double.valueOf(String.valueOf(sysCouponRecord.getMoney())));
        userCouponRecord.setCompanyId(userInfo.getCompanyId());
        userCouponRecord.setUserId(userInfo.getId());

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AmapGeocoding.java

@@ -61,6 +61,7 @@
        JSONObject jsonObject = new JSONObject(response.toString());
        if ("1".equals(jsonObject.getString("status"))) {
            JSONObject regeocode = jsonObject.getJSONObject("regeocode");
            String regeocodesss = regeocode.getString("formatted_address");
            JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
            String cityName = addressComponent.getString("city"); // 这里改为了获取城市名称
            return cityName;
@@ -71,6 +72,37 @@



    public static String getAddress(double latitude, double longitude) throws Exception {
        String url = AMAP_GEOCODING_API + "?location=" + longitude + "," + latitude
                + "&output=json&key=" + AMAP_KEY + "&radius=1000&extensions=all";

        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
        connection.setRequestMethod("GET");
        connection.connect();

        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
        StringBuilder response = new StringBuilder();
        String line;
        while ((line = reader.readLine()) != null) {
            response.append(line);
        }
        reader.close();
        connection.disconnect();

        JSONObject jsonObject = new JSONObject(response.toString());
        if ("1".equals(jsonObject.getString("status"))) {
            JSONObject regeocode = jsonObject.getJSONObject("regeocode");
            String regeocodesss = regeocode.getString("formatted_address");
            JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
            String cityName = addressComponent.getString("city"); // 这里改为了获取城市名称
            return regeocodesss;
        } else {
            throw new RuntimeException("Failed to fetch city name. Error message: " + jsonObject.getString("info"));
        }
    }



    public static void main(String[] args) throws Exception {
        double lat = 116.3913; // 纬度
        double lng = 39.90539; // 经度

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java

@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.transfer.controller;


import com.aliyuncs.utils.StringUtils;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.TOpenCitySiteMapper;
import com.stylefeng.guns.modular.system.model.OpenCity;
@@ -172,11 +174,16 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil site(double latitude, double longitude) throws Exception {
    public ResultUtil site(double latitude, double longitude,String code) throws Exception {
        //获取当前城市名称
        String cityName = AmapGeocoding.getCityName(latitude, longitude);

        Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag", 3);
        if (!StringUtils.isEmpty(code)){
            ne.eq("code",code);
        }
        //查询ids
        List<OpenCity> cityName1 = openCityService.selectList(new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag",3));
        List<OpenCity> cityName1 = openCityService.selectList(ne);
        List<Integer> ids = new ArrayList<>();
        for (OpenCity openCity : cityName1) {
            ids.add(openCity.getId());
@@ -190,6 +197,9 @@
        List<TOpenCitySite> dongche = new ArrayList<>();

        for (TOpenCitySite tOpenCitySite : tOpenCitySites) {

            String address = AmapGeocoding.getAddress(latitude, longitude);
            tOpenCitySite.setAddress(address);
            if (tOpenCitySite.getType()==1){
                jichang.add(tOpenCitySite);
            }

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java

@@ -358,10 +358,13 @@
            }).start();
        }


        System.err.println("===="+orderPrivateCar.getState());
        //推单操作
        if(orderPrivateCar.getState() == 1){
            this.pushOrder(orderPrivateCar);
        }
        System.err.println("===="+orderPrivateCar.getState());

        //添加消息
        systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
@@ -867,7 +870,7 @@
    @Override
    public List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
        OrderTransferCar orderPrivateCar = this.selectById(orderId);
        List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
        List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 7, orderPrivateCar.getOrderMoney(), pageNum, size);
        List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
        list.addAll(list1);
        return list;
@@ -925,7 +928,7 @@
        //计算折扣
        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
        if(null != query2){
            Double special = query2.getSpecial();
            Double special = query2.getTaxi();
            orderPrivateCar.setDiscount(special);
            double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            if(orderMoney.compareTo(v) > 0){
@@ -1003,14 +1006,14 @@

            //添加已收入明细
            Company company = companyService.selectById(orderPrivateCar.getCompanyId());
            Double speMoney = company.getSpeMoney();
            Double speMoney = company.getTransferMoney();
            BigDecimal d = null;//企业收入
            BigDecimal c = null;//司机收入
            if(company.getIsSpeFixedOrProportional() == 2){//固定
            if(company.getIsTransferFixedOrProportional()!=null&&company.getIsTransferFixedOrProportional() == 2){//固定
                d = new BigDecimal(speMoney);
                c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
            }
            if(company.getIsSpeFixedOrProportional() == 1){//比例
            if(company.getIsTransferFixedOrProportional()!=null&&company.getIsTransferFixedOrProportional() == 1){//比例
                Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
                d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);

 UserNTTravel/guns-admin/src/main/resources/application.yml

@@ -62,9 +62,20 @@
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


#spring:
#  datasource:
#    url: jdbc:mysql://120.27.134.189:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: weilai
#    password: WeiLaiChuXing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat



spring:
  datasource:
    url: jdbc:mysql://192.168.110.34:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.110.34:3306/nttravel?useSSL=false&serverTimezone=GMT&useUnicode=true&amp&characterEncoding=utf-8&amp&serverTimezone=UTC&amp
    username: root
    password: 123456
    db-name: guns #用来搜集数据库的所有表

 UserNTTravel/guns-admin/target/classes/application.yml

@@ -62,9 +62,20 @@
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


#spring:
#  datasource:
#    url: jdbc:mysql://120.27.134.189:10633/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: weilai
#    password: WeiLaiChuXing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat



spring:
  datasource:
    url: jdbc:mysql://192.168.110.34:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.110.34:3306/nttravel?useSSL=false&serverTimezone=GMT&useUnicode=true&amp&characterEncoding=utf-8&amp&serverTimezone=UTC&amp
    username: root
    password: 123456
    db-name: guns #用来搜集数据库的所有表

 UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml

@@ -230,7 +230,7 @@
        updateTime as updateTime,
        updateUser as updateUser
        from t_driver
        where flag != 3 and state = 2 and authState = 2
        where flag != 3 and state = 2 and authState = 2 and failCount = 0
        <if test="null != companyId">
            <choose>
                <when test="companyId != 1">