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

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

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


 Conflicts:

	ManagementNTTravel/.idea/modules.xml

 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java

@@ -80,7 +80,7 @@
            return ResultUtil.success(CarInfoWarpper.getCarInfoWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
            return ResultUtil.error("当前车辆未绑定司机");
        }
    }


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

@@ -2,10 +2,7 @@


import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.OrderCrossCity;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.model.Reassign;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
//import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
@@ -305,6 +302,12 @@
                    orderPrivateCar.setOldState(null);
                    orderPrivateCarService.updateAllColumnById(orderPrivateCar);
                }
                if(reassign.getOrderType() == 7){//专车
                    OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
                    orderPrivateCar.setState(orderPrivateCar.getOldState());
                    orderPrivateCar.setOldState(null);
                    orderTransferService.updateAllColumnById(orderPrivateCar);
                }
                if(reassign.getOrderType() == 3){//跨城
                    OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
                    orderCrossCity.setState(orderCrossCity.getOldState());

 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java

@@ -24,6 +24,7 @@
     * @return
     */
    List<Map<String, Object>> queryReassignDriverPrivateCar(@Param("companyId") Integer companyId, @Param("serverCarModelId") Integer serverCarModelId);
    List<Map<String, Object>> queryReassignOrderTransferCar(@Param("companyId") Integer companyId, @Param("serverCarModelId") Integer serverCarModelId);




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

@@ -91,6 +91,19 @@
        and b.type = 1 and c.type = 1 and e.type = 1 and e.serverCarModelId = #{serverCarModelId}
    </select>

    <select id="queryReassignOrderTransferCar" resultType="map">
        select
            a.id as id,
            CONCAT(a.`name`, '-', d.carLicensePlate) as `name`
        from t_driver a
                 left join t_driver_service b on (a.id = b.driverId)
                 left join t_driver_orders c on (a.id = c.driverId)
                 left join t_car d on (a.carId = d.id)
                 left join t_car_service e on (d.id = e.carId)
        where a.authState = 2 and a.state = 2 and a.flag != 3 and if(a.franchiseeId is null or a.franchiseeId = 0, a.companyId = #{companyId}, a.franchiseeId = #{companyId})
          and a.id in (select driverId from t_driver_work where state = 1 and type like '%1%')
          and b.type = 7 and c.type = 7 and e.type = 7 and e.serverCarModelId = #{serverCarModelId}
    </select>

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

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

@@ -33,13 +33,13 @@
        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字段
        WHEN a.orderType = 7 THEN t.startAddress
        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表有这些字段
        WHEN a.orderType = 7 THEN t.endAddress
        ELSE NULL
        END AS endAddress,
        CONCAT(d.name, '-', f.carLicensePlate) AS applyDriver,
@@ -49,17 +49,17 @@
        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_order_transfer t ON (a.orderId = t.id AND a.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
        WHERE a.orderType IN (1, 3, 7)
        <if test="null != companyId">
            and if(d.franchiseeId is null or d.franchiseeId = 0, d.companyId = #{companyId}, d.franchiseeId = #{companyId})
        </if>
        <if test="state == 1">
            and a.state in (2) and (b.state not in (10, 12) or c.state not in (10, 12))
            and a.state in (2) and (b.state not in (10, 12) or c.state not in (10, 12) or t.state NOT IN ( 10, 12 ))
        </if>
        <if test="state == 2">
            and a.state in (3, 4, 5)
@@ -72,31 +72,47 @@


    <select id="queryReassignInfo" resultType="map">
        select
        a.id as id,
        DATE_FORMAT(a.insertTime, '%Y.%m.%d-%H:%i') as applyTime,
        CONCAT(d.`name`, '-', e.carLicensePlate) as applyDriver,
        a.reason as reason,
        if(a.orderType = 1, f.nickName, g.nickName) as `user`,
        if(a.orderType = 1, DATE_FORMAT(b.travelTime, '%Y.%m.%d-%H:%i'), DATE_FORMAT(c.travelTime, '%Y.%m.%d-%H:%i')) as travelTime,
        if(a.orderType = 1, b.startAddress, c.startAddress) as startAddress,
        if(a.orderType = 1, b.endAddress, c.endAddress) as endAddress,
        if(a.orderType = 1, b.state, c.state) as state,
        a.state as `status`,
        if(a.reviewerType = 1, i.`name`, h.`name`) as reviewer,
        CONCAT(j.`name`, '-', k.carLicensePlate) as nowDriver,
        a.orderType as orderType
        from t_reassign a
        left join t_order_private_car b on (a.orderId = b.id and a.orderType = 1)
        left join t_order_cross_city c on (a.orderId = c.id and a.orderType = 3)
        left join t_driver d on (a.originalDriverId = d.id)
        left join t_car e on (a.originalCarId = e.id)
        left join t_user f on (b.userId = f.id)
        left join t_user g on (c.userId = g.id)
        left join sys_user h on (a.reviewer = h.id and a.reviewerType = 2)
        left join t_dispatch i on (a.reviewer = i.id and a.reviewerType = 1)
        left join t_driver j on (a.nowDriverId = j.id)
        left join t_car k on (a.nowCarId = k.id)
        SELECT
            a.id AS id,
            DATE_FORMAT( a.insertTime, '%Y.%m.%d-%H:%i' ) AS applyTime,
            CONCAT( d.`name`, '-', e.carLicensePlate ) AS applyDriver,
            a.reason AS reason,
            IF
            ( a.orderType = 1, f.nickName, g.nickName ) AS `user`,
            IF
            (
                    a.orderType = 1,
                    DATE_FORMAT( b.travelTime, '%Y.%m.%d-%H:%i' ),
                    DATE_FORMAT( c.travelTime, '%Y.%m.%d-%H:%i' )) AS travelTime,
            IF(a.orderType = 1, b.startAddress,
               IF(a.orderType = 3, c.startAddress,
                  IF(a.orderType = 7, t.startAddress, NULL))) AS startAddress,

            IF(a.orderType = 1, b.endAddress,
               IF(a.orderType = 3, c.endAddress,
                  IF(a.orderType = 7, t.endAddress, NULL))) AS endAddress,

            IF(a.orderType = 1, b.state,
               IF(a.orderType = 3, c.state,
                  IF(a.orderType = 7, t.state, NULL))) AS state,
            a.state AS `status`,
            IF
            ( a.reviewerType = 1, i.`name`, h.`name` ) AS reviewer,
            CONCAT( j.`name`, '-', k.carLicensePlate ) AS nowDriver,
            a.orderType AS orderType
        FROM
            t_reassign a
                LEFT JOIN t_order_private_car b ON ( a.orderId = b.id AND a.orderType = 1 )
                LEFT JOIN t_order_cross_city c ON ( a.orderId = c.id AND a.orderType = 3 )
                LEFT JOIN t_order_transfer t ON ( a.orderId = t.id AND a.orderType = 7 )
                LEFT JOIN t_driver d ON ( a.originalDriverId = d.id )
                LEFT JOIN t_car e ON ( a.originalCarId = e.id )
                LEFT JOIN t_user f ON ( b.userId = f.id )
                LEFT JOIN t_user g ON ( c.userId = g.id )
                LEFT JOIN sys_user h ON ( a.reviewer = h.id AND a.reviewerType = 2 )
                LEFT JOIN t_dispatch i ON ( a.reviewer = i.id AND a.reviewerType = 1 )
                LEFT JOIN t_driver j ON ( a.nowDriverId = j.id )
                LEFT JOIN t_car k ON ( a.nowCarId = k.id )
        where a.id = #{id}
    </select>
</mapper>

 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java

@@ -54,6 +54,9 @@
        Map<String, Object> map = carMapper.queryCarInfo(id);
        List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("authState", 2)
                .ne("flag", 3).eq("carId", map.get("id")));
        if (drivers.isEmpty()){
            throw new Exception("该车辆还未绑定司机");
        }
        StringBuffer sb = new StringBuffer();
        for (Driver driver : drivers) {
            sb.append(driver.getName() + "-" + driver.getPhone() + "/");

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

@@ -143,6 +143,8 @@
        return ResultUtil.success();
    }

    @Autowired
    private IOrderTransferService orderTransferService;

    /**
     * 获取改派司机列表
@@ -166,6 +168,12 @@
            list = driverMapper.queryReassignDriverCrossCity(companyId, orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId(),
                    lineShiftDriver.getLineShiftId(), orderCrossCity.getTravelTime(), orderCrossCity.getPeopleNumber());
        }
        if(reassign.getOrderType() == 7){//专车
            OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
            list = driverMapper.queryReassignOrderTransferCar(companyId, orderPrivateCar.getServerCarModelId());
        }


        for(int i = 0; i < list.size(); i++){
            if(Integer.valueOf(list.get(i).get("id").toString()).compareTo(reassign.getOriginalDriverId()) == 0){
                list.remove(i);

 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java

@@ -72,7 +72,7 @@

    @Override
    public ResultUtil cancelOrder(Integer orderId) throws Exception {
        OrderTransferCar orderPrivateCar = this.selectById(orderId);
        OrderTransferCar orderPrivateCar = this.baseMapper.selectById(orderId);
        if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
            return ResultUtil.error("不允许重复取消");
        }
@@ -80,12 +80,12 @@
            return ResultUtil.error("订单已完成，不允许取消");
        }
        orderPrivateCar.setState(10);
        this.updateById(orderPrivateCar);
        this.baseMapper.updateById(orderPrivateCar);

        //添加取消记录
        OrderCancel orderCancel = new OrderCancel();
        orderCancel.setOrderId(orderId);
        orderCancel.setOrderType(1);
        orderCancel.setOrderType(7);
        orderCancel.setReason("调度端取消");
        orderCancel.setRemark("调度端取消");
        orderCancel.setState(2);

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

@@ -5,6 +5,7 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
import com.stylefeng.guns.modular.system.dao.OrderCrossCityMapper;
import com.stylefeng.guns.modular.system.dao.OrderTransferMapper;
import com.stylefeng.guns.modular.system.dao.ReassignMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -262,6 +263,32 @@
            //添加消息
            systemNoticeService.addSystemNotice(1, "调度已成功取消出行订单，谢谢使用！", orderPrivateCar.getUserId(), 1);
        }

        if(reassign.getOrderType() == 7){//专车
            OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
            if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
                return ResultUtil.error("订单状态不在可取消范围内");
            }
            orderPrivateCar.setState(10);//取消
            orderTransferService.updateById(orderPrivateCar);

            new Thread(new Runnable() {//发送消息提醒
                @Override
                public void run() {
                    pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), reassign.getOrderId(), 7, 10, 0);
                    if(null != orderPrivateCar.getDriverId()){
                        //修改司机为空闲
                        Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                        driver.setState(2);
                        driverService.updateById(driver);
                        pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), reassign.getOrderId(), 7, 10, 0);
                    }
                }
            }).start();
            //添加消息
            systemNoticeService.addSystemNotice(1, "调度已成功取消出行订单，谢谢使用！", orderPrivateCar.getUserId(), 1);
        }

        if(reassign.getOrderType() == 3){//跨城
            OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
            if(orderCrossCity.getState() > 5 && orderCrossCity.getState() != 11){
@@ -433,6 +460,13 @@
                return ResultUtil.error("订单状态不在可改派范围内");
            }
        }
        if(reassign.getOrderType() == 7){//专车
            OrderTransferCar orderTransferCar = orderTransferService.selectById(reassign.getOrderId());
            if(orderTransferCar.getState() != 11){
                return ResultUtil.error("订单状态不在可改派范围内");
            }
        }

        if(reassign.getOrderType() == 3){//跨城
            OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
            if(orderCrossCity.getState() != 11){
@@ -469,6 +503,13 @@
                        orderPrivateCar.setOldState(null);
                        orderPrivateCarService.updateAllColumnById(orderPrivateCar);
                    }
                    if(reassign.getOrderType() == 7){//专车
                        OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
                        orderPrivateCar.setState(orderPrivateCar.getOldState());
                        orderPrivateCar.setOldState(null);
                        orderTransferService.updateAllColumnById(orderPrivateCar);
                    }

                    if(reassign.getOrderType() == 3){//跨城
                        OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
                        orderCrossCity.setState(orderCrossCity.getOldState());
@@ -498,6 +539,14 @@
                    orderPrivateCar.setOldState(null);
                    orderPrivateCarService.updateAllColumnById(orderPrivateCar);
                }

                if(reassign.getOrderType() == 7){//专车
                    OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
                    orderPrivateCar.setState(orderPrivateCar.getOldState());
                    orderPrivateCar.setOldState(null);
                    orderTransferService.updateAllColumnById(orderPrivateCar);
                }

                if(reassign.getOrderType() == 3){//跨城
                    OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
                    orderCrossCity.setState(orderCrossCity.getOldState());
@@ -518,6 +567,14 @@
                orderPrivateCar.setOldState(null);
                orderPrivateCarService.updateAllColumnById(orderPrivateCar);
            }
            if(reassign.getOrderType() == 7){//专车
                OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
                orderPrivateCar.setState(orderPrivateCar.getOldState());
                orderPrivateCar.setOldState(null);
                orderTransferService.updateAllColumnById(orderPrivateCar);
            }


            if(reassign.getOrderType() == 3){//跨城
                OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());
                orderCrossCity.setState(orderCrossCity.getOldState());
@@ -529,6 +586,8 @@
    }


    @Autowired
    private IOrderTransferService orderTransferService;
    /**
     * 执行改派操作
     * @param id
@@ -578,6 +637,26 @@
            orderPrivateCarService.updateAllColumnById(orderPrivateCar);
        }

        if(reassign.getOrderType() == 7){//专车
            //修改原司机信息
            Driver driver = driverService.selectById(reassign.getOriginalDriverId());
            driver.setState(2);
            driverService.updateById(driver);

            //修改新司机信息
            nowDriver.setState(3);
            driverService.updateById(nowDriver);

            //修改订单数据
            OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId());
            orderPrivateCar.setDriverId(driverId);
            orderPrivateCar.setCarId(nowDriver.getCarId());
            orderPrivateCar.setState(orderPrivateCar.getOldState());
            orderPrivateCar.setOldState(null);
            orderTransferService.updateAllColumnById(orderPrivateCar);
        }


        if(reassign.getOrderType() == 3){//跨陈
            //修改原司机信息
            OrderCrossCity orderCrossCity = orderCrossCityService.selectById(reassign.getOrderId());

 DriverNTTravel/.idea/workspace.xml

@@ -5,56 +5,229 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="a7570672-bfad-4d39-9825-905c049a9d7e" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/git_toolbox_prj.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/TLineSiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/TLineSite.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/ICarMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/ICar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java" 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/DriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.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$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" 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/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/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/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/dao/mapping/LineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.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/crossCity/warpper/LineWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.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/CarMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml" 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/OrderCancelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.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/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/model/Car.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.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/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/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.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/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java" 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$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderTransferController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderTransferController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java" 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/dao/mapping/TCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.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/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.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/404.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/addHtml.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/addHtml.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/editHtml.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/editHtml.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/sysCouponRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/sysCouponRecord.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_edit.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/tCompany/tCompany_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverFacialFail/tDriverFacialFail_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverFacialFail/tDriverFacialFail_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_orderDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_orderDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTransfer.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTransfer.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.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_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.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/favicon1.ico" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/home.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/index4.png" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/index4.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/logo.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCharteredService/tCharteredService_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCharteredService/tCharteredService_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverFacialFail/tDriverFacialFail.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverFacialFail/tDriverFacialFail.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter_info.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$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTape/tOrderTape.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTape/tOrderTape.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectTransferDriver.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectTransferDriver.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tSite/tSite.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tSite/tSite.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.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/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/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/GunsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.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/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/FrequentPassengersController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FrequentPassengersController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.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/api/UserInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.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/dao/mapping/OrderCrossCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Line.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Line.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/system/dao/DriverWorkMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverWorkMapper.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/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/dao/mapping/DriverWorkMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.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/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/OrderEvaluateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.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/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/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/util/WeChatUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.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/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/crossCity/dao/mapping/OrderCrossCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" 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-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" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-core/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserNTTravel/guns-generator/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserNTTravel/guns-generator/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulNTTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulNTTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulNTTravel/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulNTTravel/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulNTTravel/target/classes/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulNTTravel/target/classes/redis.properties" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -451,7 +624,7 @@
    &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/DriverNTTravel&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/study/NTTravel/UserNTTravel&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;,
@@ -468,11 +641,11 @@
      <recent name="E:\IDEA Workspaces\KYTravel\DriverOKTravel\guns-admin\src\test" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.stylefeng.guns.modular.system.util" />
      <recent name="com.stylefeng.guns.modular.system.service" />
      <recent name="com.stylefeng.guns.modular.system.service.impl" />
      <recent name="com.stylefeng.guns.modular.system.dao" />
      <recent name="com.stylefeng.guns.modular.system.model" />
      <recent name="com.stylefeng.guns.modular.system.util" />
    </key>
  </component>
  <component name="RunDashboard">
@@ -533,18 +706,25 @@
      </method>
    </configuration>
    <list>
      <item itemvalue="Application.CompareFace" />
      <item itemvalue="JUnit.GunsApplicationTest.queryVipLevelList" />
      <item itemvalue="Spring Boot.GunsRestApplication" />
      <item itemvalue="Spring Boot.GunsApplication" />
      <item itemvalue="应用程序.CompareFace" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="Spring Boot.GunsApplication" />
        <item itemvalue="应用程序.CompareFace" />
        <item itemvalue="JUnit.GunsApplicationTest.queryVipLevelList" />
      </list>
    </recent_temporary>
  </component>
  <component name="SharedIndexes">
    <attachedChunks>
      <set>
        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
      </set>
    </attachedChunks>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
  <component name="SvnConfiguration">
@@ -617,7 +797,35 @@
      <workItem from="1717745378685" duration="5488000" />
      <workItem from="1718066731254" duration="8571000" />
      <workItem from="1718088926780" duration="362000" />
      <workItem from="1718089411022" duration="596000" />
      <workItem from="1718089411022" duration="3765000" />
      <workItem from="1718154361642" duration="19281000" />
      <workItem from="1718269596277" duration="8628000" />
      <workItem from="1718361855925" duration="1567000" />
      <workItem from="1718586068247" duration="596000" />
      <workItem from="1718609696544" duration="381000" />
      <workItem from="1718610366045" duration="595000" />
      <workItem from="1718679234239" duration="598000" />
      <workItem from="1718682194078" duration="226000" />
      <workItem from="1718848836076" duration="1922000" />
      <workItem from="1718852079808" duration="7948000" />
      <workItem from="1718936610517" duration="100000" />
      <workItem from="1719209712960" duration="162000" />
      <workItem from="1719210379441" duration="9000" />
      <workItem from="1719211233411" duration="2514000" />
      <workItem from="1719295326979" duration="595000" />
      <workItem from="1719370211060" duration="114000" />
      <workItem from="1719383399805" duration="942000" />
      <workItem from="1719386673160" duration="299000" />
      <workItem from="1719387161376" duration="641000" />
      <workItem from="1720159582291" duration="218000" />
      <workItem from="1720159865381" duration="3561000" />
      <workItem from="1720419888769" duration="34000" />
      <workItem from="1720490816311" duration="2901000" />
      <workItem from="1720576586997" duration="2542000" />
      <workItem from="1720597948555" duration="1000" />
      <workItem from="1721097604663" duration="3068000" />
      <workItem from="1729214168362" duration="111000" />
      <workItem from="1729214683407" duration="869000" />
    </task>
    <servers />
  </component>
@@ -714,7 +922,7 @@
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java</url>
          <line>790</line>
          <line>800</line>
          <option name="timeStamp" value="22" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
@@ -729,7 +937,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/OrderServiceImpl.java</url>
          <line>278</line>
          <line>279</line>
          <option name="timeStamp" value="26" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
@@ -738,40 +946,65 @@
          <option name="timeStamp" value="28" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineSiteController.java</url>
          <line>106</line>
          <option name="timeStamp" value="30" />
        </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>532</line>
          <option name="timeStamp" value="31" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java</url>
          <line>522</line>
          <line>524</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>
          <line>196</line>
          <option name="timeStamp" value="46" />
        </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/LineSiteServiceImpl.java</url>
          <line>259</line>
          <option name="timeStamp" value="52" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java</url>
          <line>96</line>
          <option name="timeStamp" value="54" />
        </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>852</line>
          <option name="timeStamp" value="55" />
        </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>1180</line>
          <option name="timeStamp" value="56" />
        </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>1040</line>
          <option name="timeStamp" value="58" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java</url>
          <line>748</line>
          <option name="timeStamp" value="61" />
        </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>784</line>
          <option name="timeStamp" value="65" />
        </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>479</line>
          <option name="timeStamp" value="66" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java</url>
          <line>606</line>
          <option name="timeStamp" value="71" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <watches-manager>

 DriverNTTravel/guns-admin/pom.xml

@@ -235,6 +235,10 @@
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
        </dependency>
    </dependencies>

    <build>

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

@@ -574,7 +574,8 @@
    }



    @Autowired
    private WeChatUtil weChatUtil;

    /**
     * 获取个人中心详情
@@ -589,12 +590,21 @@
    })
    public ResultUtil<DriverInfoWarpper> queryInfo(HttpServletRequest request){
        try {
            System.err.println("=====");
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            Map<String, Object> map = driverService.queryInfo(uid);
            return ResultUtil.success(DriverInfoWarpper.getDriverInfoWarpper(map));
            DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(map);
            if (driverInfoWarpper.getWechatPic()==null){
                Driver driver = driverService.selectById(uid);
                String rid = weChatUtil.rid("/pages/home/scanPage/scanPage", uid);
                driver.setWechatPic(rid);
                driverService.updateById(driver);
                driverInfoWarpper.setWechatPic(rid);
            }
            return ResultUtil.success(driverInfoWarpper);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -883,6 +893,8 @@
        }
    }

    @Autowired
    private ITOrderTransferService orderTransferService;

    /**
     * 获取收入明细
@@ -913,19 +925,22 @@
                baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
                switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){
                    case 1:
                        baseWarpper.setName("快车");
                        baseWarpper.setName("专车");
                        break;
                    case 2:
                        baseWarpper.setName("出租车");
                        break;
                    case 3:
                        baseWarpper.setName("直通车");
                        baseWarpper.setName("跨城");
                        break;
                    case 4:
                        baseWarpper.setName("同城小件物流");
                        break;
                    case 5:
                        baseWarpper.setName("跨城小件物流");
                        break;
                    case 7:
                        baseWarpper.setName("接送机/站");
                        break;
                }
                Map<String, Object> map1 = new HashMap<>();
@@ -987,6 +1002,17 @@
                            map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
                        }
                        break;
                    case 7:
                        TOrderTransfer orderTransfer = orderTransferService.selectById(map.get("incomeId").toString());
                        if(null != orderTransfer){
                            List<Income> incomes = incomeService.queryData(1, null, 2, orderTransfer.getId(), 1);
                            map1.put("travelMoney", null != orderTransfer.getOrderMoney() ? orderTransfer.getOrderMoney() : 0);//行程费
                            map1.put("parkMoney", null != orderTransfer.getParkMoney() ? orderTransfer.getParkMoney() : 0);//停车费
                            map1.put("tipMoney", 0);//小费
                            map1.put("roadTollMoney", null != orderTransfer.getRoadTollMoney() ? orderTransfer.getRoadTollMoney() : 0);//过路费
                            map1.put("rakeMoney", incomes.size() > 0 ? incomes.get(0).getMoney() : 0);//抽成
                        }
                        break;
                }

                baseWarpper.setData(map1);

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

@@ -456,6 +456,8 @@
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            endAddress = endAddress.replaceAll("& #40;", "\\(");
            endAddress = endAddress.replaceAll("& #41;", "\\)");
            return orderService.specail(orderId, uid, lon, lat,endAddress);
        }catch (Exception e){
            e.printStackTrace();

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java

@@ -95,7 +95,8 @@
    public ResultUtil<List<LineWarpper>> queryLines(Integer startId, Integer endId, Integer driverId){
        try {
            List<Map<String, Object>> list = lineService.queryLines(startId, endId, driverId);
            return ResultUtil.success(LineWarpper.getLineWarppers(list));
            List<LineWarpper> lineWarppers = LineWarpper.getLineWarppers(list);
            return ResultUtil.success(lineWarppers);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/TLineSiteMapper.java

New file
@@ -0,0 +1,16 @@
package com.stylefeng.guns.modular.crossCity.dao;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.crossCity.model.TLineSite;

/**
 * <p>
 * 线路-站点关系表 Mapper 接口
 * </p>
 *
 * @author 吕雪
 * @since 2020-09-16
 */
public interface TLineSiteMapper extends BaseMapper<TLineSite> {

}

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineMapper.xml

@@ -19,7 +19,7 @@
        a.name as name
        from t_line a
        left join t_line_site b on (a.id = b.lineId)
        where a.state = 1 and b.siteId = #{siteId} and b.type = #{type}
        where a.state = 1  and b.type = #{type}
    </select>



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

@@ -73,7 +73,7 @@
        select
        a.id as orderId,
        a.state as orderState,
        ('直通车订单') as orderName,
        ('跨城订单') as orderName,
        CONCAT(DATE_FORMAT(a.travelTime, '%m月%d日'), ' ', c.startTime) as travelTime,
        a.startAddress as startAddress,
        a.endAddress as endAddress,
@@ -99,7 +99,7 @@
            select
            a.id as id,
            (3) as type,
            ('直通车订单') as `name`,
            ('跨城订单') as `name`,
            CONCAT(DATE_FORMAT(a.travelTime, '%Y-%m-%d'), ' ', c.startTime) as time,
            a.startAddress as startAddress,
            a.endAddress as endAddress,
@@ -122,7 +122,7 @@
            select
            a.id as id,
            (3) as type,
            ('直通车订单') as `name`,
            ('跨城订单') as `name`,
            CONCAT(DATE_FORMAT(a.travelTime, '%Y-%m-%d'), ' ', c.startTime) as time,
            a.startAddress as startAddress,
            a.endAddress as endAddress,
@@ -144,7 +144,7 @@
            select
            a.id as id,
            (3) as type,
            ('直通车行订单') as `name`,
            ('跨城行订单') as `name`,
            CONCAT(DATE_FORMAT(a.travelTime, '%Y-%m-%d'), ' ', c.startTime) as time,
            a.startAddress as startAddress,
            a.endAddress as endAddress,
@@ -170,7 +170,7 @@
        select
        a.id as id,
        (3) as type,
        ('直通车订单') as `name`,
        ('跨城订单') as `name`,
        CONCAT(DATE_FORMAT(a.travelTime, '%Y-%m-%d'), ' ', c.startTime) as time,
        a.startAddress as startAddress,
        a.endAddress as endAddress,

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/TLineSite.java

New file
@@ -0,0 +1,87 @@
package com.stylefeng.guns.modular.crossCity.model;

import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

/**
 * <p>
 * 线路-站点关系表
 * </p>
 *
 * @author 吕雪
 * @since 2020-09-16
 */
@TableName("t_line_site")
public class TLineSite extends Model<TLineSite> {

    private static final long serialVersionUID = 1L;

    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 线路id
     */
    private Integer lineId;
    /**
     * 站点id
     */
    private Integer siteId;
    /**
     * 类型（1=起点，2=终点）
     */
    private Integer type;


    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getLineId() {
        return lineId;
    }

    public void setLineId(Integer lineId) {
        this.lineId = lineId;
    }

    public Integer getSiteId() {
        return siteId;
    }

    public void setSiteId(Integer siteId) {
        this.siteId = siteId;
    }

    public Integer getType() {
        return type;
    }

    public void setType(Integer type) {
        this.type = type;
    }

    @Override
    protected Serializable pkVal() {
        return this.id;
    }

    @Override
    public String toString() {
        return "TLineSite{" +
        "id=" + id +
        ", lineId=" + lineId +
        ", siteId=" + siteId +
        ", type=" + type +
        "}";
    }
}

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java

@@ -2,12 +2,8 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.crossCity.dao.LineMapper;
import com.stylefeng.guns.modular.crossCity.dao.LineShiftDriverMapper;
import com.stylefeng.guns.modular.crossCity.dao.LineShiftMapper;
import com.stylefeng.guns.modular.crossCity.model.Line;
import com.stylefeng.guns.modular.crossCity.model.LineShift;
import com.stylefeng.guns.modular.crossCity.model.LineShiftDriver;
import com.stylefeng.guns.modular.crossCity.dao.*;
import com.stylefeng.guns.modular.crossCity.model.*;
import com.stylefeng.guns.modular.crossCity.server.ILineService;
import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +78,13 @@
    }




    @Resource
    private SiteMapper siteMapper;

    @Resource
    private TLineSiteMapper tLineSiteMapper;
    /**
     * 根据站点id获取线路
     * @param startId
@@ -117,7 +120,31 @@
                    }
                }
            }
            list = lists;

            for (Map<String, Object> stringObjectMap : lists) {
                Line id = lineMapper.selectById(stringObjectMap.get("id").toString());
                List<TLineSite> start = tLineSiteMapper.selectList(new EntityWrapper<TLineSite>().eq("lineId", id.getId()).eq("type", 1));
                List<TLineSite> end = tLineSiteMapper.selectList(new EntityWrapper<TLineSite>().eq("lineId", id.getId()).eq("type", 2));

                Site startSite = siteMapper.selectById(start.get(0).getSiteId());
                Site endSite = siteMapper.selectById(end.get(0).getSiteId());

                stringObjectMap.put("startSiteName",startSite.getName());
                stringObjectMap.put("endSiteName",endSite.getName());
                stringObjectMap.put("startCityName",startSite.getCity());
                stringObjectMap.put("endCityName",endSite.getCity());
//                stringObjectMap.put("city",endSite.getCity());
                stringObjectMap.put("startCityId",startSite.getId());
                stringObjectMap.put("endCityId",endSite.getId());



            }



            return lists;
//            list = lists;
        }
        return list;
    }

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -510,7 +510,7 @@
        lineShiftDriverMapper.updateById(lineShiftDriver);

        //添加消息
        systemNoticeService.addSystemNotice(1, "您的直通车订单已下单成功！", orderCrossCity.getUserId());
        systemNoticeService.addSystemNotice(1, "您的跨城订单已下单成功！", orderCrossCity.getUserId());

        BaseWarpper baseWarpper = new BaseWarpper();
        baseWarpper.setId(orderCrossCity.getId());

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.java

@@ -2,12 +2,14 @@

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

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@ApiModel("线路")
@Data
public class LineWarpper {
    @ApiModelProperty("线路id")
    private Integer id;
@@ -17,6 +19,12 @@
    private String startAddress;
    @ApiModelProperty("终点")
    private String endAddress;
    private String startSiteName;
    private String endSiteName;
    private String startCityName;
    private String endCityName;
    private String startCityId;
    private String endCityId;

    public Integer getId() {
        return id;
@@ -68,6 +76,12 @@
            lineWarpper.setName(null != map.get("name") ? map.get("name").toString() : "");
            lineWarpper.setStartAddress(null != map.get("startAddress") ? map.get("startAddress").toString() : "");
            lineWarpper.setEndAddress(null != map.get("endAddress") ? map.get("endAddress").toString() : "");
            lineWarpper.setStartSiteName(null != map.get("startSiteName") ? map.get("startSiteName").toString() : "");
            lineWarpper.setEndSiteName(null != map.get("endSiteName") ? map.get("endSiteName").toString() : "");
            lineWarpper.setStartCityName(null != map.get("startCityName") ? map.get("startCityName").toString() : "");
            lineWarpper.setEndCityName(null != map.get("endCityName") ? map.get("endCityName").toString() : "");
            lineWarpper.setStartCityId(null != map.get("startCityId") ? map.get("startCityId").toString() : "");
            lineWarpper.setEndCityId(null != map.get("endCityId") ? map.get("endCityId").toString() : "");
        }
        return lineWarpper;
    }

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -279,6 +279,7 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
        System.err.println("==========="+orderId);
        switch (state){
            case 3://出发前往预约点
                orderPrivateCar.setState(3);

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

@@ -17,6 +17,7 @@
     * @throws Exception
     */
    List<Map<String, Object>> queryIdleData(@Param("companyId") Integer companyId) throws Exception;
    List<Map<String, Object>> queryIdleData1(@Param("companyId") Integer companyId,@Param("driverId")Integer driverId) throws Exception;


    /**

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

@@ -46,6 +46,26 @@
    </select>


    <select id="queryIdleData1" resultType="map">
        select
        a.id as id,
        CONCAT(a.carLicensePlate, '-',c.`name`, b.`name`, ' ', a.carColor) as name
        from t_car a
        left join t_car_model b on (a.carModelId = b.id)
        left join t_car_brand c on (b.brandId = c.id)
        where a.state = 1 and a.createBy = #{driverId}
        <choose>
            <when test="companyId != 1">
                and  a.companyId = #{companyId} or a.franchiseeId = #{companyId}
            </when>
            <otherwise>
                and a.isPlatCar = 1
            </otherwise>

        </choose>
    </select>


    <select id="query" resultType="com.stylefeng.guns.modular.system.model.Car">
        select
        id as id,

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

@@ -338,6 +338,7 @@
        a.sex as sex,
        a.`name` as `name`,
        a.phone as phone,
        a.wechatPic as wechatPic,
        a.laveActivityMoney as balance,
        a.laveActivityMoney as laveActivityMoney,
        a.activityMoney as activityMoney,

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

@@ -55,7 +55,7 @@
        select
        (money * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '直通车', if(orderType = 4, '同城小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '跨城', if(orderType = 4, '同城小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cancel where state = 2 and userType = 1 and money is not null and userId = #{uid}
        <choose>

 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,
            (1) as type,
            (7) 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,
            (1) as type,
            (7) 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,
            (1) as type,
            (7) as type,
            ('接送机订单') as `name`,
            DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
            startAddress as startAddress,

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java

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

import java.util.Date;

@@ -11,6 +12,7 @@
 * 车辆
 */
@TableName("t_car")
@Data
public class Car {
    /**
     * 主键
@@ -103,6 +105,8 @@
     */
    @TableField("addObjectId")
    private Integer addObjectId;
    @TableField("createBy")
    private Integer createBy;

    public Integer getId() {
        return id;

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java

@@ -160,6 +160,7 @@
     */
    @TableField("driveCard")
    private String driveCard;
    private String wechatPic;
    /**
     * 驾驶证照片
     */

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

@@ -139,6 +139,7 @@
        car.setDrivingLicensePhoto(drivingLicensePhoto);
        car.setCarPhoto(carPhoto);
        car.setInsurancePhoto(insurancePhoto);
        car.setCreateBy(uid);

        Driver driver = driverService.selectById(uid);
        car.setCompanyId(driver.getCompanyId());

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

@@ -48,7 +48,7 @@
                Driver driver = driverService.selectById(uid);
                CarService query1 = carServiceMapper.query(3, driver.getCarId());
                if(query1 == null){
                    return ResultUtil.error("车辆未添加直通车服务");
                    return ResultUtil.error("车辆未添加跨城服务");
                }
            }
            query = new DriverOrders();

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

@@ -566,6 +566,9 @@
    public ResultUtil work(Integer uid, String type) throws Exception {
        DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
        Driver driver = this.selectById(uid);
        if (driver.getCarId()==null){
            return ResultUtil.error("请先绑定车辆");
        }
        if(null != driverWork){//作下班操作
            //检测是否有未完成的订单
            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
@@ -666,7 +669,7 @@
                if(Integer.valueOf(t) == 3){
                    CarService query1 = carServiceMapper.query(3, driver.getCarId());
                    if(query1 == null){
                        return ResultUtil.error("车辆未添加直通车服务");
                        return ResultUtil.error("车辆未添加跨城服务");
                    }
                }
                DriverOrders query = driverOrdersMapper.query(uid, Integer.valueOf(t));
@@ -748,7 +751,7 @@
                    baseWarpper.setName("包车");
                    break;
                    case 7:
                    baseWarpper.setName("接送机");
                    baseWarpper.setName("接送机/站");
                    break;
            }
            maps.add(baseWarpper);
@@ -793,6 +796,34 @@
        this.updateById(driver1);

        smsrecordService.saveData(7, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");

        DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
        if (driverWork==null){
            return ResultUtil.success();
        }

        //检测是否有未完成的订单
        List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
        if(list.size() > 0){
            return ResultUtil.error("还有未完成的订单，不能进行下班操作");
        }
        driverWork.setEndTime(new Date());
        driverWork.setState(2);
        driverWorkMapper.updateById(driverWork);
        driver1.setState(1);
        this.updateById(driver1);

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.operateLogout(uid);
                }
            }
        }).start();



        return ResultUtil.success();
    }

@@ -990,7 +1021,7 @@

                            break;
                        case 3:
                            sb.append("直通车");
                            sb.append("跨城");
                            break;
                        case 4:
                            break;
@@ -1003,10 +1034,11 @@
                    DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
                    activityWarpper.setId(driverActivityOrder.getId());
                    activityWarpper.setContent("今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元");
                    SimpleDateFormat sdf = new SimpleDateFormat("H:m");
                    Date start = sdf.parse(driverActivityOrder.getStart());
                    Date end = sdf.parse(driverActivityOrder.getEnd());
                    Integer integer = orderService.queryOrderNum(uid, start, end);
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

                    Integer integer = orderService.queryOrderNum(uid, sdf1.parse(sdf.format(new Date()) + " " + driverActivityOrder.getStart() + ":00"), sdf1.parse(sdf.format(new Date()) + " " + driverActivityOrder.getEnd() + ":59"));
                    activityWarpper.setCarryOut(integer > driverActivityOrder.getOrderNum() ? driverActivityOrder.getOrderNum() + "/" + driverActivityOrder.getOrderNum() : integer + "/" + driverActivityOrder.getOrderNum());
                    break;
            }
@@ -1145,6 +1177,7 @@
            DriverActivityOrder dao = driverActivityOrderMapper.selectById(dah.getActivityId());
            Integer integer = orderService.queryOrderNum(dah.getDriverId(), sdf1.parse(sdf.format(new Date()) + " " + dao.getStart() + ":00"),
                    sdf1.parse(sdf.format(new Date()) + " " + dao.getEnd() + ":59"));
            dao.setOrderNum(integer);
            if(dao.getOrderNum() <= integer){
                dah.setCarryOut(2);//完成状态
                driverActivityHistoryMapper.updateById(dah);
@@ -1161,6 +1194,7 @@
                //添加收入记录
                incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney());
            }
            driverActivityHistoryMapper.updateById(dah);
        }
    }


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

@@ -16,6 +16,7 @@
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.model.Region;
import com.stylefeng.guns.modular.system.model.TOrderTransfer;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IOrderService;
import com.stylefeng.guns.modular.system.service.ITOrderTransferService;
@@ -680,8 +681,6 @@
                break;
            case 7://专车
                return orderTransferService.process(orderId, state, lon, lat, address);


        }
        return null;
    }
@@ -853,7 +852,12 @@
        //出租车
        Integer[] state = new Integer[]{6, 7, 8, 9};
        int i = orderTaxiService.selectCount(new EntityWrapper<OrderTaxi>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));
        return i;
        int i1 = orderTransferService.selectCount(new EntityWrapper<TOrderTransfer>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));
        int i2 = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));
        int i3 = orderCrossCityService.selectCount(new EntityWrapper<OrderCrossCity>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));


        return i+i1+i2+i3;
    }



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

@@ -459,6 +459,16 @@
                        //添加已收入明细
                        incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, 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;
                    case 2:
                        OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
                        orderTaxi.setOldState(orderTaxi.getState());

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

New file
@@ -0,0 +1,54 @@
package com.stylefeng.guns.modular.system.util;

import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.ObjectMetadata;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;

public class OssUploadUtil {
    //OSS图片访问域名
    public static String oss_domain = "http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/";
    public static String accessKeyId = "LTAI5tR4whv88Y5CUucCJEu6";
    public static String accessKeySecret = "2fObO6LE6U2OzrUfXw9YBlQWHohFvg";
    public static String bucketName="bao-weiqing";
    public static String endpoint = "oss-cn-hangzhou.aliyuncs.com";

    public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);

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

    public static String ossUpload(MultipartFile file,Integer driverId) throws IOException{
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        String fileName = "DRIVER"+driverId+".jpg";
            InputStream content = file.getInputStream();//获得指定文件的输入流
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            String originalFilename = file.getOriginalFilename();
            ossClient.putObject(bucketName,"img/"+fileName,content,meta);// 上传Object.
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);
                fileName = oss_domain+"img/"+fileName;
            }
        return fileName;
    }
}

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

New file
@@ -0,0 +1,198 @@
package com.stylefeng.guns.modular.system.util;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.entity.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;

import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;

/**
 * 微信工具类
 */
@Component
public class WeChatUtil {

    @Value("${wx.appletsAppid}")
    private String wxAppletsAppid;

    @Value("${wx.appletsAppSecret}")
    private String wxAppletsAppSecret;

    @Autowired
    private RestTemplate restTemplate;



    /**
     * 小程序使用jscode获取openid
     * @param jscode
     * @return
     */
    public Map<String, String> code2Session(String jscode){
        String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret
                + "&js_code=" + jscode + "&grant_type=authorization_code";
        String forObject = restTemplate.getForObject(url, String.class);
        JSONObject jsonObject = JSON.parseObject(forObject);
        int errcode = jsonObject.getIntValue("errcode");
        Map<String, String> map = new HashMap<>();
        if(errcode == 0){//成功
            map.put("openid", jsonObject.getString("openid"));
            map.put("sessionKey", jsonObject.getString("session_key"));
            map.put("unionid", jsonObject.getString("unionid"));
            return map;
        }
        if(errcode == -1){//系统繁忙，此时请开发者稍候再试
            map.put("msg", jsonObject.getString("errmsg"));
            return map;
        }
        if(errcode == 40029){//code 无效
            map.put("msg", jsonObject.getString("errmsg"));
            return map;
        }
        if(errcode == 45011){//频率限制，每个用户每分钟100次
            map.put("msg", jsonObject.getString("errmsg"));
            return map;
        }
        return null;
    }


    /**
     * 通过config接口注入权限验证配置(公众号)
     * 附录1-JS-SDK使用权限签名算法,
     * @return
     */
    public Map<String,Object> getSignatureConfig(String url){
        //获取token
        try {
            url = URLDecoder.decode(url, "UTF-8");
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        }
        String ticket = getJSApiTicket();
        String noncestr = UUIDUtil.getRandomCode();
        Long timestamp = System.currentTimeMillis();
        String content = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "&timestamp=" + timestamp + "&url=" + url;
        String signature = DigestUtils.sha1Hex(content);
        Map<String,Object> map=new HashMap<>();
        map.put("appId", "wx0e72f86394831b34");
        map.put("timestamp", timestamp);
        map.put("nonceStr", noncestr);
        map.put("signature", signature);
        return  map;
    }



    /***
     * 获取jsapiTicket（公众号）
     * 来源 www.vxzsk.com
     * @return
     */
    public String getJSApiTicket(){
        //获取token
        String acess_token= this.getAccessToken();
        String urlStr = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + acess_token + "&type=jsapi";
        String backData = restTemplate.getForObject(urlStr, String.class);
        System.out.println(backData);
        String ticket = JSONObject.parseObject(backData).getString("ticket");
        return  ticket;
    }


    /***
     * 获取acess_token (公众号)
     * 来源www.vxzsk.com
     * @return
     */
    public String getAccessToken(){
        String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxc89ecab90d24edd8&secret=bca863174d22736a4a9758a67484947e";
        String backData = restTemplate.getForObject(url, String.class);
        String accessToken = JSONObject.parseObject(backData).getString("access_token");
        return accessToken;
    }

    public String getUrlLink(String path, String query) throws Exception{
        String wxAppletsAccessToken = getAccessToken();
        String url = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + wxAppletsAccessToken;
        Map<String, Object> param = new HashMap<>();
        param.put("expire_type", 1);
        param.put("expire_interval", 1);
        param.put("path", path);
        param.put("query", query);
        param.put("env_version", "trial");
        HttpHeaders httpHeaders = new HttpHeaders();
        MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
        httpHeaders.setContentType(type);
        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
        ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
        String body1 = exchange.getBody();
        return body1;
    }

    public String getPhone(String code) throws Exception{
        String wxAppletsAccessToken = getAccessToken();
        String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + wxAppletsAccessToken;
        Map<String, Object> param = new HashMap<>();
        param.put("code",code);
        HttpHeaders httpHeaders = new HttpHeaders();
        MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
        httpHeaders.setContentType(type);
        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
        ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
        String body1 = exchange.getBody();
//        String body1 ="{\"errcode\":0,\"errmsg\":\"ok\",\"phone_info\":{\"phoneNumber\":\"15708179461\",\"purePhoneNumber\":\"15708179461\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1720420413,\"appid\":\"wxc89ecab90d24edd8\"}}}";

        JSONObject jsonObject = JSON.parseObject(body1);
        // 从JSON对象中获取phone_info子对象
        JSONObject phoneInfo = jsonObject.getJSONObject("phone_info");
        // 从phone_info中获取phoneNumber
        String phoneNumber = phoneInfo.getString("phoneNumber");
        System.out.println("Phone Number: " + phoneNumber);


        return phoneNumber;
    }

    public String rid(String path, Integer driverId) throws Exception{
        // 获取access_token
        String accessToken = getAccessToken();
        // 替换CREATE_CODE_URL
        String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token="+accessToken;
        // 发送请求
        String stringApiResult = null;
        try {
            HashMap<String, String> map = new HashMap<>();
            map.put("path", path+"?driverId="+driverId);
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity requestEntity = new HttpEntity(map, headers);
            ResponseEntity<byte[]> rep = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class);
            byte[] bytes = rep.getBody();
            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
            MultipartFile file = new MockMultipartFile(ContentType.APPLICATION_OCTET_STREAM.toString(), byteArrayInputStream);
//            ResultUtil resultUtil = userInfoController.uploadImg(file, null, null);
            String s = OssUploadUtil.ossUpload(file,driverId);
            System.err.println("===url"+s);
//            StringBuilder sb = new StringBuilder(stringApiResult);
//            stringApiResult = sb.toString();
            return s;

        } catch (Exception e) {
        }
        return stringApiResult;
    }

}

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

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

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

import java.util.Map;

@ApiModel("个人中心详情")
@Data
public class DriverInfoWarpper {
    @ApiModelProperty("司机id（用于生成二维码）")
    private Integer id;
@@ -63,6 +65,7 @@
    private String driveCardImgUrl;
    @ApiModelProperty("网约车资格证照片")
    private String networkCarlssueImg;
    private String wechatPic;

    public Integer getId() {
        return id;
@@ -353,6 +356,8 @@
            driverInfoWarpper.setPlaceOfEmployment(null != map.get("placeOfEmployment") ? String.valueOf(map.get("placeOfEmployment")) : "");
            driverInfoWarpper.setLaveActivityMoney(null != map.get("laveActivityMoney") ? Double.valueOf(String.valueOf(map.get("laveActivityMoney"))) : 0);
            driverInfoWarpper.setLaveBusinessMoney(null != map.get("laveBusinessMoney") ? Double.valueOf(String.valueOf(map.get("laveBusinessMoney"))) : 0);
            driverInfoWarpper.setLaveBusinessMoney(null != map.get("laveBusinessMoney") ? Double.valueOf(String.valueOf(map.get("laveBusinessMoney"))) : 0);
            driverInfoWarpper.setWechatPic(null != map.get("wechatPic") ? String.valueOf(map.get("wechatPic")) : null);
        }
        return driverInfoWarpper;
    }

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

@@ -48,24 +48,24 @@

---

#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
    url: jdbc:mysql://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    password: Xiwang2024!
    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
#    username: root
#    password: 123456
#    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!

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

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

 ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml

@@ -9,6 +9,16 @@
    <inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="myValues">
        <value>
          <list size="1">
            <item index="0" class="java.lang.String" itemvalue="取消规则：" />
          </list>
        </value>
      </option>
      <option name="myCustomValuesEnabled" value="true" />
    </inspection_tool>
    <inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
</component>

 ManagementNTTravel/guns-admin/pom.xml

@@ -25,6 +25,7 @@
            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
        </dependency>-->


        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>

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

@@ -87,8 +87,8 @@
        DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",1));
        model.addAttribute("id3",driverActivityOnline.getId());
        //统计专车在线
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
        model.addAttribute("id4",driverActivityOnline.getId());
//        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
//        model.addAttribute("id4",driverActivityOnline.getId());
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
        model.addAttribute("id5",driverActivityOnline.getId());
        DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
@@ -156,43 +156,43 @@
        map.put("number3",number);
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
                .eq("type",2).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
        //统计出租车在线
        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
        money=0d;
        number=0;
        for(DriverActivityHistory history:historyList){
            totalMOney+=history.getMoney();
            money+=history.getMoney();
            number+=1;
        }
        map.put("money4",money);
        map.put("number4",number);
        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
                .eq("type",3).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
//        //统计出租车在线
//        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
//        money=0d;
//        number=0;
//        for(DriverActivityHistory history:historyList){
//            totalMOney+=history.getMoney();
//            money+=history.getMoney();
//            number+=1;
//        }
//        map.put("money4",money);
//        map.put("number4",number);
//        driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
//                .eq("type",3).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
        //统计城际在线
        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
        money=0d;
        number=0;
        for(DriverActivityHistory history:historyList){
            totalMOney+=history.getMoney();
            money+=history.getMoney();
            number+=1;
        }
        map.put("money5",money);
        map.put("number5",number);
        DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>()
                .eq("driverActivityId",activityId).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
//        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
//        money=0d;
//        number=0;
//        for(DriverActivityHistory history:historyList){
//            totalMOney+=history.getMoney();
//            money+=history.getMoney();
//            number+=1;
//        }
//        map.put("money5",money);
//        map.put("number5",number);
//        DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>()
//                .eq("driverActivityId",activityId).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
        //统计订单数
        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",4).eq("activityId",driverActivityOrder.getId()).eq("carryOut",2));
        money=0d;
        number=0;
        for(DriverActivityHistory history:historyList){
            totalMOney+=history.getMoney();
            money+=history.getMoney();
            number+=1;
        }
        map.put("money6",money);
        map.put("number6",number);
//        historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",4).eq("activityId",driverActivityOrder.getId()).eq("carryOut",2));
//        money=0d;
//        number=0;
//        for(DriverActivityHistory history:historyList){
//            totalMOney+=history.getMoney();
//            money+=history.getMoney();
//            number+=1;
//        }
//        map.put("money6",money);
//        map.put("number6",number);
        map.put("totalMOney",totalMOney);
        return map;
    }

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

@@ -15,6 +15,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
import com.stylefeng.guns.modular.system.service.ITActivityGeneralizationService;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import com.stylefeng.guns.modular.system.util.GaoDeMapUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
@@ -86,12 +87,23 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        model.addAttribute("startTime", sdf.format(data.getStartTime()));
        model.addAttribute("endTime", sdf.format(data.getEndTime()));
        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        model.addAttribute("insertTime", sdf1.format(data.getInsertTime()));
        model.addAttribute("item",data);
        List<SysCouponRecord> siteList = sysCouponRecordService.selectList(new EntityWrapper<SysCouponRecord>()
                .eq("id",data.getCouponId()));

        List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("couponId", siteList.get(0).getId()).groupBy("userId"));
        siteList.get(0).setReceive(userCouponRecords==null?0:userCouponRecords.size());


        model.addAttribute("siteList",siteList);
        return PREFIX + "editHtml.html";
    }

    @Autowired
    private IUserCouponRecordService userCouponRecordService;
    @RequestMapping("/generalization_detail/{id}")
    public String generalization_detail(Model model,@PathVariable("id") Integer id) {
        TActivityGeneralization data = activityGeneralizationService.selectById(id);
@@ -101,7 +113,13 @@
        model.addAttribute("item",data);
        List<SysCouponRecord> siteList = sysCouponRecordService.selectList(new EntityWrapper<SysCouponRecord>()
                .eq("id",data.getCouponId()));
        List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("couponId", siteList.get(0).getId()).groupBy("userId"));
        siteList.get(0).setReceive(userCouponRecords==null?0:userCouponRecords.size());
        model.addAttribute("siteList",siteList);

        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        model.addAttribute("insertTime", sdf1.format(data.getInsertTime()));
        return PREFIX + "generalization_detail.html";
    }

@@ -125,29 +143,29 @@
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        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);
            }
        }
//        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);
    }

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

@@ -9,6 +9,8 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,6 +23,7 @@
import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;

import java.util.Date;
import java.util.List;
import java.util.Map;

/**
@@ -96,6 +99,42 @@
        return super.packForBT(sysCouponRecordService.selectPage(page,wrapper));
    }

    @Autowired
    private IUserCouponRecordService userCouponRecordService;
    @RequestMapping(value = "/list1")
    @ResponseBody
    public Object list1(String createTime,Integer couponUseType,Integer couponType) {

        Date startTimes = null;
        Date endTimes = null;
        if (SinataUtil.isNotEmpty(createTime)){
            String[] timeArray = createTime.split(" - ");
            startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
            endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
        }
        Page<SysCouponRecord> page = new PageFactory<SysCouponRecord>().defaultPage();
        Wrapper wrapper = new EntityWrapper<SysCouponRecord>();
        if(SinataUtil.isNotEmpty(createTime)){
            wrapper.between("insertTime",startTimes,endTimes);
        }
        if(SinataUtil.isNotEmpty(couponUseType)){
            wrapper.eq("couponUseType",couponUseType);
        }
        if(SinataUtil.isNotEmpty(couponType)){
            wrapper.eq("couponType",couponType);
        }
        wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
        wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
        wrapper.orderBy("id",false);
        Page page1 = sysCouponRecordService.selectPage(page, wrapper);
        List<SysCouponRecord> records = page1.getRecords();
        for (SysCouponRecord record : records) {
            int couponId = userCouponRecordService.selectCount(new EntityWrapper<UserCouponRecord>().eq("couponId", record.getId()));
            record.setReceive(couponId);
        }
        return super.packForBT(page1);
    }

    /**
     * 新增
     */

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

@@ -597,7 +597,7 @@
        shellList.add("所属加盟商[提示:加盟车辆选填]");
        shellList.add("服务模式:专车[是/否]");
        shellList.add("服务模式:出租车[是/否]");
        shellList.add("服务模式:直通车[是/否]");
        shellList.add("服务模式:跨城[是/否]");
        shellList.add("服务模式:小件同城物流[是/否]");
        shellList.add("服务模式:小件跨城物流[是/否]");
        shellList.add("服务模式:包车[是/否]");
@@ -758,7 +758,7 @@
                    }
                    //判断服务模式【跨城出行】
                    if (!five.equals("是") && !five.equals("否")){
                        return new ErrorTip(500, "服务模式【直通车】内容不正确");
                        return new ErrorTip(500, "服务模式【跨城】内容不正确");
                    }
                    //判断服务模式【小件同城物流】
                    if (!six.equals("是") && !six.equals("否")){

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

@@ -153,6 +153,21 @@
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TCharteredService charteredService) {
        String priceRule = charteredService.getPriceRule();
        priceRule = priceRule.replaceAll("& lt;", "<");
        priceRule = priceRule.replaceAll("& gt;", ">");
        priceRule = priceRule.replaceAll("& #40;", "(");
        priceRule = priceRule.replaceAll("& #41;", ")");
        charteredService.setPriceRule(priceRule);

        String cancelRule = charteredService.getCancelRule();
        cancelRule = cancelRule.replaceAll("& lt;", "<");
        cancelRule = cancelRule.replaceAll("& gt;", ">");
        cancelRule = cancelRule.replaceAll("& #40;", "(");
        cancelRule = cancelRule.replaceAll("& #41;", ")");
        charteredService.setCancelRule(cancelRule);


        charteredService.setInsertTime(new Date());
        charteredService.setStatus(1);
        charteredServiceService.insert(charteredService);
@@ -203,6 +218,20 @@
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TCharteredService charteredService) {
        String priceRule = charteredService.getPriceRule();
        priceRule = priceRule.replaceAll("& lt;", "<");
        priceRule = priceRule.replaceAll("& gt;", ">");
        priceRule = priceRule.replaceAll("& #40;", "(");
        priceRule = priceRule.replaceAll("& #41;", ")");
        charteredService.setPriceRule(priceRule);

        String cancelRule = charteredService.getCancelRule();
        cancelRule = cancelRule.replaceAll("& lt;", "<");
        cancelRule = cancelRule.replaceAll("& gt;", ">");
        cancelRule = cancelRule.replaceAll("& #40;", "(");
        cancelRule = cancelRule.replaceAll("& #41;", ")");
        charteredService.setCancelRule(cancelRule);

        charteredServiceService.updateById(charteredService);
        return SUCCESS_TIP;
    }

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

@@ -299,7 +299,7 @@
    @ResponseBody
    public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
        //判断账号是否已存在
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("status",3));
        if (count > 0){
            return "error";
        }
@@ -359,7 +359,7 @@
    @ResponseBody
    public Object addFranchisee(TCompany tCompany,String account,String password) {
        //判断账号是否已存在
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("status",3));
        if (count > 0){
            return "error";
        }
@@ -412,7 +412,7 @@
        if (SinataUtil.isNotEmpty(account) && SinataUtil.isNotEmpty(password)){
            if (!user.getAccount().equals(account)){
                //判断账号是否已存在
                int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
                int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("flag",3));
                if (count > 0){
                    return "error";
                }
@@ -456,7 +456,7 @@
        User user = userService.selectById(userId);
        if (!user.getAccount().equals(account)){
            //判断账号是否已存在
            int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
            int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("status",3));
            if (count > 0){
                return "error";
            }

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

@@ -102,7 +102,7 @@
     */
    @RequestMapping("/tDriver_add")
    public String tDriverAdd(Model model) {
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
        List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).ne("flag", 3));
        model.addAttribute("companyList",companyList);

        Integer roleType = ShiroKit.getUser().getRoleType();
@@ -181,12 +181,12 @@
        model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());

        if (1 == roleType){
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
            List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).ne("flag", 3));
            model.addAttribute("companyList",companyList);
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
            model.addAttribute("franchiseeList",franchiseeList);
        }else if (2 == roleType){
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
            List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).ne("flag", 3));
            model.addAttribute("franchiseeList",franchiseeList);
        }

@@ -882,7 +882,7 @@
            shellList.add("工号[选填]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:直通车[是/否]");
            shellList.add("经营业务:跨城[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
            shellList.add("经营业务:小件跨城物流[是/否]");
            shellList.add("经营业务:包车[是/否]");
@@ -902,7 +902,7 @@
            shellList.add("工号[选填]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:直通车[是/否]");
            shellList.add("经营业务:跨城[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
            shellList.add("经营业务:小件跨城物流[是/否]");
            shellList.add("经营业务:包车[是/否]");
@@ -921,7 +921,7 @@
            shellList.add("工号[选填]");
            shellList.add("经营业务:专车[是/否]");
            shellList.add("经营业务:出租车[是/否]");
            shellList.add("经营业务:直通车[是/否]");
            shellList.add("经营业务:跨城[是/否]");
            shellList.add("经营业务:小件同城物流[是/否]");
            shellList.add("经营业务:小件跨城物流[是/否]");
            shellList.add("经营业务:包车[是/否]");
@@ -1100,7 +1100,7 @@
                        }
                        //判断经营业务【跨城出行】
                        if (!thirteen.equals("是") && !thirteen.equals("否")){
                            return new ErrorTip(500, "经营业务【直通车】内容不正确");
                            return new ErrorTip(500, "经营业务【跨城】内容不正确");
                        }
                        //判断经营业务【小件同城物流】
                        if (!fourteen.equals("是") && !fourteen.equals("否")){
@@ -1359,7 +1359,7 @@
                        }
                        //判断经营业务【跨城出行】
                        if (!eleven.equals("是") && !eleven.equals("否")){
                            return new ErrorTip(500, "经营业务【直通车】内容不正确");
                            return new ErrorTip(500, "经营业务【跨城】内容不正确");
                        }
                        //判断经营业务【小件同城物流】
                        if (!twelve.equals("是") && !twelve.equals("否")){
@@ -1598,7 +1598,7 @@
                        }
                        //判断经营业务【跨城出行】
                        if (!ten.equals("是") && !ten.equals("否")){
                            return new ErrorTip(500, "经营业务【直通车】内容不正确");
                            return new ErrorTip(500, "经营业务【跨城】内容不正确");
                        }
                        //判断经营业务【小件同城物流】
                        if (!eleven.equals("是") && !eleven.equals("否")){

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

@@ -235,7 +235,7 @@
                businessType = 1;
            }else if ("出租车".equals(type)){
                businessType = 2;
            }else if ("直通车".equals(type)){
            }else if ("跨城".equals(type)){
                businessType = 3;
            }else if ("跨城小件物流".equals(type)){
                businessType = 4;

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

@@ -5,9 +5,10 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TComplaint;
import com.stylefeng.guns.modular.system.model.TSystemNotice;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import org.springframework.stereotype.Controller;
@@ -18,9 +19,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.stylefeng.guns.modular.system.service.ITPubWithdrawalService;

import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -108,6 +109,11 @@
        return SUCCESS_TIP;
    }

    @Autowired
    private ITUserService userService;

    @Autowired
    private ITDriverService driverService;
    /**
     * 立即处理操作
     */
@@ -124,6 +130,26 @@
            if (2 == state){   //同意提现
                stateObj = 1;
            }else if (3 == state){  //拒绝提现


                //退钱给司机
                TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());


                if (tPubWithdrawal.getType()!=null&&tPubWithdrawal.getType()==1) {
                    tDriver.setLaveActivityMoney(tDriver.getLaveActivityMoney()+tPubWithdrawal.getMoney().doubleValue());
                    driverService.updateById(tDriver);

                }else if (tPubWithdrawal.getType()==null){
                        TUser tUser = userService.selectById(tPubWithdrawal.getUserId());
                        tUser.setBalance(BigDecimal.valueOf(tUser.getBalance().doubleValue()+tPubWithdrawal.getMoney().doubleValue()));
                        userService.updateById(tUser);
                }else {
                    tDriver.setLaveBusinessMoney(tDriver.getLaveBusinessMoney()+tPubWithdrawal.getMoney().doubleValue());
                    driverService.updateById(tDriver);

                }

                stateObj = 2;
            }
            tPubWithdrawalService.updateById(tPubWithdrawal);

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java

@@ -20,7 +20,7 @@
import java.util.Map;

/**
 * 旅游包车订单控制器
 * 包车订单控制器
 *
 * @author fengshuonan
 * @Date 2020-09-02 10:39:00
@@ -35,7 +35,7 @@
    private ITOrderCharterService tOrderCharterService;

    /**
     * 跳转到旅游包车订单首页
     * 跳转到包车订单首页
     */
    @RequestMapping("")
    public String index() {
@@ -53,7 +53,7 @@
    }

    /**
     * 跳转到修改旅游包车订单
     * 跳转到修改包车订单
     */
    @RequestMapping("/tOrderCharter_immediately/{tOrderCharterId}")
    public String tOrderCharterUpdate(@PathVariable Integer tOrderCharterId, Model model) {
@@ -62,7 +62,7 @@
    }

    /**
     * 获取旅游包车订单列表
     * 获取包车订单列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -95,7 +95,7 @@
    }

    /**
     * 删除旅游包车订单
     * 删除包车订单
     */
    @RequestMapping(value = "/delete")
    @ResponseBody

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java

@@ -21,7 +21,7 @@
import java.util.Map;

/**
 * 旅游包车订单控制器
 * 包车订单控制器
 *
 * @author fengshuonan
 * @Date 2020-09-24 11:08:23
@@ -36,7 +36,7 @@
    private ITOrderCharteredCarService tOrderCharteredCarService;

    /**
     * 跳转到旅游包车订单首页
     * 跳转到包车订单首页
     */
    @RequestMapping("")
    public String index() {
@@ -44,7 +44,7 @@
    }

    /**
     * 跳转到修改旅游包车订单
     * 跳转到修改包车订单
     */
    @RequestMapping("/tOrderCharteredCar_immediately/{tOrderCharteredCarId}")
    public String tOrderCharteredCarUpdate(@PathVariable Integer tOrderCharteredCarId, Model model) {
@@ -53,7 +53,7 @@
    }

    /**
     * 获取旅游包车订单列表
     * 获取包车订单列表
     */
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -95,7 +95,7 @@
    }

    /**
     * 删除旅游包车订单
     * 删除包车订单
     */
    @RequestMapping(value = "/delete")
    @ResponseBody

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

@@ -272,7 +272,7 @@
                tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
                userService.updateById(tUser);
                //添加交易明细
                transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
                transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
            } else {
                PaymentRecord query = paymentRecordService.query(1, null, null, tOrderCrossCityId, 3, null, 2).get(0);
                if (null == query) {
@@ -284,14 +284,14 @@
                        return ResultUtil.error(map.get("return_msg"));
                    }
                    //添加交易明细
                    transactionDetailsService.saveData(query.getUserId(), "直通车取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                    transactionDetailsService.saveData(query.getUserId(), "跨城取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                }else{//支付宝
                    Map<String, String> map = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
                    if(!"10000".equals(map.get("code"))){
                        return ResultUtil.error(map.get("msg"));
                    }
                    //添加交易明细
                    transactionDetailsService.saveData(query.getUserId(), "直通车取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                    transactionDetailsService.saveData(query.getUserId(), "跨城取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                }
            }

@@ -331,7 +331,7 @@
        map1.put("id", tOrderCrossCity.getId().toString());
        map1.put("orderType", "3");
        String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map1);
        System.out.println("直通车取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);
        System.out.println("跨城取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);

        return SUCCESS_TIP;
    }

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderTransferController.java

@@ -76,7 +76,7 @@
    @RequestMapping("")
    public String index(Model model) {
        //服务接送机车型
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
        model.addAttribute("carmodelList",carmodelList);
        return PREFIX + "tOrderTransfer.html";
    }

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -407,7 +407,7 @@
                    tReassign.setReviewerType(2);
                    tReassignService.updateById(tReassign);
                    //添加交易明细
                    transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
                    transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
                }
                if(tReassign.getPayType() == 2){//支付宝
                    Map<String, String> map = payMoneyUtil.aliRefund(tReassign.getPayOrder(), money.toString());
@@ -416,7 +416,7 @@
                        tReassign.setReviewerType(2);
                        tReassignService.updateById(tReassign);
                        //添加交易明细
                        transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
                        transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
                    }
                    if(null == map || !"10000".equals(map.get("code"))){
                        System.err.println(map.get("msg"));
@@ -527,7 +527,7 @@
                map.put("id", orderCrossCity.getId().toString());
                map.put("orderType", "3");
                String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
                System.out.println("直通车取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
                System.out.println("跨城取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);


                //已支付的情况下进行退款操作
@@ -537,7 +537,7 @@
                        tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
                        userService.updateById(tUser);
                        //添加交易明细
                        transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车改派取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
                        transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城改派取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
                    }else{
                        PaymentRecord query = paymentRecordService.query(1, null, null, tReassign.getOrderId(), 3, null, 2).get(0);
                        if(null == query){
@@ -550,14 +550,14 @@
                                return ResultUtil.error(map1.get("return_msg"));
                            }
                            //添加交易明细
                            transactionDetailsService.saveData(query.getUserId(), "直通车改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                            transactionDetailsService.saveData(query.getUserId(), "跨城改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                        }else{//支付宝
                            Map<String, String> map1 = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
                            if(!"10000".equals(map1.get("code"))){
                                return ResultUtil.error(map1.get("msg"));
                            }
                            //添加交易明细
                            transactionDetailsService.saveData(query.getUserId(), "直通车改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                            transactionDetailsService.saveData(query.getUserId(), "跨城改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
                        }
                    }

@@ -606,7 +606,7 @@
                    tReassign.setReviewerType(2);
                    tReassignService.updateById(tReassign);
                    //添加交易明细
                    transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
                    transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
                }
                if(tReassign.getPayType() == 2){//支付宝
                    Map<String, String> map = payMoneyUtil.aliRefund(tReassign.getPayOrder(), money.toString());
@@ -615,7 +615,7 @@
                        tReassign.setReviewerType(2);
                        tReassignService.updateById(tReassign);
                        //添加交易明细
                        transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
                        transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
                    }
                    if(null == map || !"10000".equals(map.get("code"))){
                        System.err.println(map.get("msg"));
@@ -1045,7 +1045,7 @@
        map.put("orderId", tOrderCrossCity.getId().toString());
        map.put("orderType", "3");
        String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
        System.out.println("直通车改派:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
        System.out.println("跨城改派:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
        return SUCCESS_TIP;
    }


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

@@ -10,7 +10,7 @@

/**
 * <p>
 * 订单-直通车 Mapper 接口
 * 订单-跨城 Mapper 接口
 * </p>
 *
 * @author 吕雪
@@ -19,7 +19,7 @@
public interface TOrderCrossCityMapper extends BaseMapper<TOrderCrossCity> {

    /**
     * 根据条件查询直通车出行订单列表
     * 根据条件查询跨城出行订单列表
     * @return
     */
    List<Map<String,Object>> getCrossCityOrderList(@Param("page") Page<Map<String, Object>> page,
@@ -39,7 +39,7 @@
                                                   @Param("state") Integer state);

    /**
     * 根据直通车出行订单ID获取直通车出行订单详情
     * 根据跨城出行订单ID获取跨城出行订单详情
     * @param orderId
     * @return
     */

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java

@@ -5,7 +5,7 @@

/**
 * <p>
 * 用户活动-折扣2（直通车） Mapper 接口
 * 用户活动-折扣2（跨城） Mapper 接口
 * </p>
 *
 * @author stylefeng

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

@@ -25,7 +25,16 @@
               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 couponActivityId) b
        LEFT join (SELECT
        couponActivityId,
        activityType,
        COUNT(DISTINCT userId) 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 != ''">
@@ -37,6 +46,7 @@
        <if test="state != null">
            and a.state=#{state}
        </if>
        order by a.insertTime desc
    </select>

</mapper>

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

@@ -63,7 +63,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'
@@ -124,7 +124,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'

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

@@ -66,7 +66,7 @@
        SELECT * FROM (SELECT ui.account,IFNULL(ci.num,0) as franchiseeNum,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
        CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
        case when cc.isTaxi = 1 then '出租车,' else '' end,
        case when cc.isCross = 1 then '直通车,' else '' end,
        case when cc.isCross = 1 then '跨城,' else '' end,
        case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
        case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
        case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
@@ -125,7 +125,7 @@
        SELECT * FROM (SELECT ui.account,ci.`name` as companyName,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
        CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
        case when cc.isTaxi = 1 then '出租车,' else '' end,
        case when cc.isCross = 1 then '直通车,' else '' end,
        case when cc.isCross = 1 then '跨城,' else '' end,
        case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
        case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
        case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,

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

@@ -82,7 +82,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'
@@ -125,7 +125,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'
@@ -145,7 +145,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'
@@ -210,7 +210,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'
@@ -275,7 +275,7 @@
        SELECT
        GROUP_CONCAT(case when type = 1 then '专车'
        when type = 2 then '出租车'
        when type = 3 then '直通车'
        when type = 3 then '跨城'
        when type = 4 then '小件物流-同城'
        when type = 5 then '小件物流-跨城'
        when type = 6 then '包车'

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

@@ -31,7 +31,7 @@
        SELECT GROUP_CONCAT(
        CONCAT((case when businessType = 1 then '专车'
        when businessType = 2 then '出租车'
        when businessType = 3 then '直通车'
        when businessType = 3 then '跨城'
        when businessType = 4 then '同城小件物流'
        when businessType = 5 then '跨城小件物流'
        when businessType = 6 then '包车'
@@ -55,7 +55,7 @@
        SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
        case when bb.businessType = 1 then '专车'
        when bb.businessType = 2 then '出租车'
        when bb.businessType = 3 then '直通车'
        when bb.businessType = 3 then '跨城'
        when bb.businessType = 4 then '同城小件物流'
        when bb.businessType = 5 then '跨城小件物流'
        when bb.businessType = 6 then '包车'

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

@@ -85,7 +85,7 @@
        LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
        ) as o
        <where>
            o.isDelete = 1 and o.type = 7
            o.isDelete = 1 and o.type = 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/dao/mapping/UserCouponRecordMapper.xml

@@ -30,9 +30,10 @@
            c.id,
            c.money,
            c.fullMoney,
            c.expirationTime,
            c.insertTime,
            c.companyId,
        DATE(c.expirationTime) AS expirationTime,
        DATE(c.insertTime) AS insertTime,
        DATE(c.endTime) AS endTime,
        c.companyId,
            c.state,
            c.couponUseType,
            c.couponType,

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

@@ -24,7 +24,7 @@
    @TableField("orderId")
    private Integer orderId;
    /**
     * 订单类型（1=专车，2=出租车，3=直通车，4=小件物流-同城，5=小件物流-跨城，6=包车）
     * 订单类型（1=专车，2=出租车，3=跨城，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    @TableField("orderType")
    private Integer orderType;

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

@@ -1,11 +1,14 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -17,6 +20,7 @@
 * @since 2020-06-15
 */
@TableName("t_sys_coupon_record")
@Data
public class SysCouponRecord extends Model<SysCouponRecord> {

    private static final long serialVersionUID = 1L;
@@ -47,6 +51,8 @@
     * 优惠券类型(1=抵扣，2=满减)
     */
    private Integer couponType;
    @TableField(exist = false)
    private Integer receive;
    /**
     * 优惠券名称
     */

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

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

import java.io.Serializable;
import java.util.Date;
@@ -19,12 +20,14 @@
 * @since 2020-06-09
 */
@TableName("t_activity_generalization")
@Data
public class TActivityGeneralization extends Model<TActivityGeneralization> {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Integer effective;

    @ApiModelProperty(value = "活动名称")
    @TableField(value = "activityName")

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

@@ -29,7 +29,7 @@
     */
    private Integer carId;
    /**
     * 类型(1=专车，2=出租车，3=城际(直通车)，4=小件物流-同城，5=小件物流-跨城，6=包车)
     * 类型(1=专车，2=出租车，3=城际(跨城)，4=小件物流-同城，5=小件物流-跨城，6=包车)
     */
    private Integer type;
    /**

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

@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -19,6 +21,7 @@
 * @since 2020-06-04
 */
@TableName("t_driver")
@Data
public class TDriver extends Model<TDriver> {

    private static final long serialVersionUID = 1L;
@@ -266,6 +269,7 @@
     */
    @TableField("businessMoney")
    private Double businessMoney;
    private Double laveActivityMoney;
    /**
     * 剩余未提现业务总收入
     * @return

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

@@ -29,7 +29,7 @@
     */
    private Integer driverId;
    /**
     * 类型(1=专车，2=出租车，3=直通车，4=小件物流-同城，5=小件物流-跨城，6=包车)
     * 类型(1=专车，2=出租车，3=跨城，4=小件物流-同城，5=小件物流-跨城，6=包车)
     */
    private Integer type;


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

@@ -30,7 +30,7 @@
     */
    private Integer openCityId;
    /**
     * 业务类型(1=专车，2=出租车，3=直通车，4=同城小件物流，5=跨城小件物流，6=包车)
     * 业务类型(1=专车，2=出租车，3=跨城，4=同城小件物流，5=跨城小件物流，6=包车)
     */
    private Integer businessType;
    /**

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

@@ -23,7 +23,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 订单类型（1=专车，2=出租车，3=直通车，4=小件物流-同城，5=小件物流-跨城，6=包车）
     * 订单类型（1=专车，2=出租车，3=跨城，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    private Integer orderType;
    /**

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

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -17,6 +19,7 @@
 * @since 2020-06-09
 */
@TableName("t_pub_withdrawal")
@Data
public class TPubWithdrawal extends Model<TPubWithdrawal> {

    private static final long serialVersionUID = 1L;
@@ -30,6 +33,7 @@
     * 用户id
     */
    private Integer userId;
    private Integer type;
    /**
     * 处理时间
     */

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

@@ -24,7 +24,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 订单类型（1=专车，2=出租车，3=直通车，4=小件物流-同城，5=小件物流-跨城，6=包车）
     * 订单类型（1=专车，2=出租车，3=跨城，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    private Integer orderType;
    /**

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

@@ -26,7 +26,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 业务类型（1=专车，2=出租车，3=直通车，4=小件物流-同城，5=小件物流-跨城，6=包车）
     * 业务类型（1=专车，2=出租车，3=跨城，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    private Integer type;
    /**

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

@@ -168,19 +168,19 @@
            driverActivityOnline.setMoney(num5);
            driverActivityOnline.insertOrUpdate();
            //添加在线活动-出租车
            driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
            if(driverActivityOnline==null){
                driverActivityOnline = new DriverActivityOnline();
                driverActivityOnline.setInsertTime(nowDay);
            }
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
            driverActivityOnline.setStartTime(startTimes);
            driverActivityOnline.setEndTime(endTimes);
            driverActivityOnline.setType(2);
            driverActivityOnline.setOnline(num6);
            driverActivityOnline.setMoney(num7);
            driverActivityOnline.insertOrUpdate();
//            driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
//            if(driverActivityOnline==null){
//                driverActivityOnline = new DriverActivityOnline();
//                driverActivityOnline.setInsertTime(nowDay);
//            }
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
//            driverActivityOnline.setDriverActivityId(driverActivity.getId());
//            driverActivityOnline.setStartTime(startTimes);
//            driverActivityOnline.setEndTime(endTimes);
//            driverActivityOnline.setType(2);
//            driverActivityOnline.setOnline(num6);
//            driverActivityOnline.setMoney(num7);
//            driverActivityOnline.insertOrUpdate();
            //添加在线活动-城际
            driverActivityOnline =driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",3));
            if(driverActivityOnline==null){

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

@@ -391,9 +391,9 @@
        list.add("出租车券领取总数");
        list.add("出租车券使用总数");
        list.add("出租车券使用总金额");
        list.add("直通车券领取总数");
        list.add("直通车券使用总数");
        list.add("直通车券使用总金额");
        list.add("跨城券领取总数");
        list.add("跨城券使用总数");
        list.add("跨城券使用总金额");
        lists.add(list);

        List<List<List<String>>> lists1 = new ArrayList<>();

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

@@ -2,7 +2,9 @@


import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.modular.system.model.TActivityGeneralization;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.service.ITActivityGeneralizationService;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITLocationService;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
@@ -11,6 +13,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;


@@ -32,7 +35,8 @@
    @Autowired
    private ITDriverService driverService;


    @Autowired
    private ITActivityGeneralizationService activityGeneralizationService;

    /**
     * 每隔一分钟去处理的定时任务
@@ -40,6 +44,25 @@
    @Scheduled(fixedRate = 1000 * 60)
    public void taskMinute(){
        try {
            Date date = new Date();

            List<TActivityGeneralization> tActivityGeneralizations = activityGeneralizationService.selectList(null);
            for (TActivityGeneralization tActivityGeneralization : tActivityGeneralizations) {
                if (tActivityGeneralization.getState()!=4){
                    if (tActivityGeneralization.getStartTime().before(date)){
                        tActivityGeneralization.setState(2);
                    }
                    if (date.after(tActivityGeneralization.getStartTime()) && date.before(tActivityGeneralization.getEndTime())){
                        tActivityGeneralization.setState(1);
                    }
                    if (date.after(tActivityGeneralization.getEndTime())){
                        tActivityGeneralization.setState(3);
                    }
                }
            }
            activityGeneralizationService.updateBatchById(tActivityGeneralizations);


        } catch (Exception e) {
            e.printStackTrace();
        }

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

@@ -65,12 +65,19 @@

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://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    password: Xiwang2024!
    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:

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

@@ -7,7 +7,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">


    <title>未来出行 - 404 页面</title>
    <title>环球出行 - 404 页面</title>
    <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico"> <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
    <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
    <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html

@@ -182,6 +182,19 @@
            return currentdate;
        }


        function alertImg(imageSrc) {
            // 设置模态框内图片的src属性
            document.getElementById('modalImage').src = imageSrc;

            // 显示模态框
            document.getElementById('imageModal').style.display = 'block';
        }

        // 添加关闭模态框的函数
        function hideImage() {
            document.getElementById('imageModal').style.display = 'none';
        }
    </script>
</head>


 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html

@@ -4,7 +4,7 @@
            <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
                <form role="search" class="navbar-form-custom" method="post" action="search_results.html">
                    <div class="form-group">
                        <input type="text" placeholder="未来出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="未来出行后台管理系统" disabled>
                        <input type="text" placeholder="环球出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="环球出行后台管理系统" disabled>
                    </div>
                </form>
                <h3 style="float: right;line-height: 50px;color: red;">${passwordHint}</h3>
@@ -53,7 +53,7 @@
        <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe>
    </div>
    <div class="footer">
        <div class="pull-right">&copy; 2023-2023 <a href="#" onclick="return false" target="_blank">未来出行</a>
        <div class="pull-right">&copy; 2023-2023 <a href="#" onclick="return false" target="_blank">环球出行</a>
        </div>
    </div>
</div>

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag

@@ -7,12 +7,17 @@
    <label class="col-sm-3 control-label head-scu-label">${name}</label>
    <div class="col-sm-4">
        <div id="${id}PreId">
            <div><img width="100px" height="100px"
            <div><img  width="100px"  height="100px"
                @if(isEmpty(avatarImg)){
                      src="${ctxPath}/static/img/NoPIC.png"></div>
                @}else{
                      src="${avatarImg}"></div>
                      src="${avatarImg}" onclick=alertImg(this.src)></div>
                @}

        <div id="imageModal" style="display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.8); z-index:999;">
            <img id="modalImage" src="" alt="放大图片" style="max-width:90%; max-height:90%; margin:auto; display:block; position:absolute; top:50%; left:50%; transform:translate(-50%, -50%);">
            <button onclick="hideImage();" style="position:absolute; top:10px; right:10px;">×</button>
        </div>
        </div>
    </div>
    <div class="col-sm-2">
@@ -20,7 +25,7 @@
            <i class="fa fa-upload"></i>&nbsp;上传
        </div>
    </div>
    <input type="hidden" id="${id}" value="${avatarImg!}"/>
    <input type="hidden" id="${id}" value="${avatarImg!} "/>
</div>
@if(isNotEmpty(underline) && underline == 'true'){
    <div class="hr-line-dashed"></div>

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag

@@ -5,7 +5,7 @@
<div class="form-group">
    <div class="col-sm-4">
        <div id="${id}PreId">
            <div><img width="100px" height="100px"
            <div><img width="200px" height="100px"
                @if(isEmpty(fileImg)){
                      src="${ctxPath}/static/img/NoPIC.png">
                @}else{

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

@@ -56,7 +56,7 @@
                        <!--</div>-->
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail3">0</h1>
                            <small>直通车订单</small>
                            <small>跨城订单</small>
                        </div>
                        <!--<div class="ibox-content">-->
                            <!--<h1 class="no-margins" id="orderDetail4">0</h1>-->
@@ -126,7 +126,7 @@
                        <!--</div>-->
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail31">0</h1>
                            <small>直通车订单数</small>
                            <small>跨城订单数</small>
                        </div>
                        <!--<div class="ibox-content">-->
                            <!--<h1 class="no-margins" id="orderDetail41">0</h1>-->
@@ -180,7 +180,7 @@
                            <h1 class="no-margins">
                                <span class="dynamicsparkline" id="orderDetail32">Loading..</span>
                            </h1>
                            <small>直通车订单趋势图</small>
                            <small>跨城订单趋势图</small>
                        </div>
                        <!--<div class="ibox-content">-->
                            <!--<h1 class="no-margins">-->

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

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="renderer" content="webkit">
    <title>未来出行 - 主页</title>
    <title>环球出行 - 主页</title>
    <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
    <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
    <link href="${ctxPath}/static/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">

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

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">

    <title>未来出行 - 登录</title>
    <title>环球出行 - 登录</title>

    <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
    <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
@@ -58,7 +58,7 @@
<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">
<div  style="position: relative;left: -30px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
    <div style="max-height: 100%">
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;未来出行管理后台</h3>
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;环球出行管理后台</h3>
        <br/>
        <h4 style="color: red;">${tips!}</h4>
        <form class="m-t" role="form" action="${ctxPath}/login" method="post">

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

@@ -42,7 +42,7 @@
                            <br/>
                            -->
                            <br/>
                            直通车累计在线&nbsp;<input type="text"   id="num8" class="form-control newWidth" />&nbsp;小时奖励
                            跨城累计在线&nbsp;<input type="text"   id="num8" class="form-control newWidth" />&nbsp;小时奖励
                            &nbsp;<input type="text"   id="num9" class="form-control newWidth" />&nbsp;元
                            <br/>
                            <br/>

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

@@ -72,7 +72,7 @@
                            <br/>
                            -->
                            <br/>
                            直通车累计在线&nbsp;<input type="text" @if(isNotEmpty(online3)){
                            跨城累计在线&nbsp;<input type="text" @if(isNotEmpty(online3)){
                                                 value="${online3.online}"
                                                 @}else{
                                                 value=""

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

@@ -73,7 +73,7 @@
                            <br/>
                            -->
                            <br/>
                            直通车累计在线&nbsp;<input type="text" @if(isNotEmpty(online3)){
                            跨城累计在线&nbsp;<input type="text" @if(isNotEmpty(online3)){
                                                 value="${online3.online}"
                                                 @}else{
                                                 value=""

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

@@ -133,24 +133,11 @@
            <h4><a href="#" onclick="driverActivityHistory(3,${id3})">领取列表</a></h4>
        </div>
    </div>
    <!--

    <div class="col-sm-3">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>出租车累计在线</h3>
            </div>
            <div class="ibox-content">
                <h1 class="no-margins text-navy">领取人数：<span id="number4"></span></h1>
                <h1 class="no-margins text-navy">领取金额：<span id="money4"></span></h1>
            </div>
            <h4><a href="#" onclick="driverActivityHistory(3,${id4})">领取列表</a></h4>
        </div>
    </div>
    -->
    <div class="col-sm-3">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h3>直通车累计在线</h3>
                <h3>跨城累计在线</h3>
            </div>
            <div class="ibox-content">
                <h1 class="no-margins text-navy">领取人数：<span id="number5"></span></h1>

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

@@ -29,7 +29,7 @@
                                    <label class="control-label" >最多可参与人数:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <input id="participateCount" name="participateCount" type="number" max="1000000" min="1" class="form-control" style="height: 30px;width: 300px" placeholder="请输入最多可参与人数" required="required">
                                    <input id="participateCount" name="participateCount" type="number" max="1000000" min="1" class="form-control" style="height: 30px;width: 300px" placeholder="请输入最多可参与人数">
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <label class="control-label" >【注：不填表示无上限】</label>
@@ -72,7 +72,7 @@
                                                    <th style="width: 300px;">添加时间</th>
                                                    <th style="width: 300px;">优惠券类型</th>
                                                    <th style="width: 300px;">优惠金额</th>
                                                    <th style="width: 300px;">有效期</th>
<!--                                                    <th style="width: 300px;">有效期</th>-->
                                                    <th style="width: 300px;">领取人数</th>
                                                    <th style="width: 300px;">操作</th>
                                                </tr>
@@ -87,6 +87,19 @@
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >

                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >优惠卷有效期:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <input id="effective11" name="effective11" type="number" maxlength="11" style="height: 30px;width: 300px" class="form-control" required="required">
                                </div>
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >天</label>
                                </div>
                            </div>

                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >每个人发放:</label>

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

@@ -25,11 +25,11 @@
                                </div>
                            </div>
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <label class="control-label" >最多可参与人数:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <input id="participateCount" name="participateCount" value="${item.participateCount}" type="number" max="1000000" min="1" class="form-control" style="height: 30px;width: 300px" placeholder="请输入最多可参与人数" required="required">
                                    <input id="participateCount" name="participateCount" value="${item.participateCount}" type="number" max="1000000" min="1" class="form-control" style="height: 30px;width: 300px" placeholder="请输入最多可参与人数" >
                                </div>
                            </div>
                        </div>
@@ -69,7 +69,7 @@
                                                    <th style="width: 300px;">添加时间</th>
                                                    <th style="width: 300px;">优惠券类型</th>
                                                    <th style="width: 300px;">优惠金额</th>
                                                    <th style="width: 300px;">有效期</th>
<!--                                                    <th style="width: 300px;">有效期</th>-->
                                                    <th style="width: 300px;">领取人数</th>
                                                    <th style="width: 300px;">操作</th>
                                                </tr>
@@ -78,7 +78,7 @@
                                                    @for(obj in siteList){
                                                    <tr class="siteClass">
                                                        <td><input type="hidden" name="id" value="${obj.id}">
                                                            <input type="hidden" id="insertTime" name="insertTime" value="${obj.insertTime}">${obj.insertTime}</td>
                                                            <input type="hidden" id="insertTime" name="insertTime" value="${insertTime}">${insertTime}</td>
                                                        @if(obj.couponUseType == 0){
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="0">通用券</td>
                                                        @}else if(obj.couponUseType == 1){
@@ -86,13 +86,13 @@
                                                        @}else if(obj.couponUseType == 2){
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="2">出租券</td>
                                                        @}else if(obj.couponUseType == 3){
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="3">直通车出行券</td>
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="3">跨城出行券</td>
                                                        @}else{
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="7">接送机出行券</td>
                                                        @}
                                                        <td><input type="hidden" id="money" name="money" value="${obj.money}">${obj.money}</td>
                                                        <td><input type="hidden" id="effective" name="effective" value="${obj.effective}">${obj.effective}天</td>
                                                        <td><input type="hidden" id="receive" name="receive">-</td>
<!--                                                        <td><input type="hidden" id="effective" name="effective" value="${obj.effective}">${obj.effective}天</td>-->
                                                        <td><input type="hidden" id="receive" name="receive" value="${obj.receive}">${obj.receive}</td>
                                                        <td><button onclick="deleteSub(this)">移除</button></td></td>
                                                    </tr>
                                                    @}
@@ -107,6 +107,18 @@
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >优惠卷有效期:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <input id="effective11" name="effective11" value="${item.effective}" type="number" maxlength="11" style="height: 30px;width: 300px" class="form-control" required="required">
                                </div>
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >天</label>
                                </div>
                            </div>

                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >每个人发放:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >

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

@@ -25,7 +25,7 @@
                                </div>
                            </div>
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <label class="control-label" >最多可参与人数:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
@@ -64,7 +64,7 @@
                                                    <th style="width: 300px;">添加时间</th>
                                                    <th style="width: 300px;">优惠券类型</th>
                                                    <th style="width: 300px;">优惠金额</th>
                                                    <th style="width: 300px;">有效期</th>
<!--                                                    <th style="width: 300px;">有效期</th>-->
                                                    <th style="width: 300px;">领取人数</th>
                                                </tr>
                                                </thead>
@@ -72,7 +72,7 @@
                                                    @for(obj in siteList){
                                                    <tr class="siteClass">
                                                        <td><input type="hidden" name="id" value="${obj.id}">
                                                            <input type="hidden" id="insertTime" name="insertTime" value="${obj.insertTime}">${obj.insertTime}</td>
                                                            <input type="hidden" id="insertTime" name="insertTime" value="${insertTime}">${insertTime}</td>
                                                        @if(obj.couponUseType == 0){
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="0">通用券</td>
                                                        @}else if(obj.couponUseType == 1){
@@ -80,13 +80,13 @@
                                                        @}else if(obj.couponUseType == 2){
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="2">出租券</td>
                                                        @}else if(obj.couponUseType == 3){
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="3">直通车出行券</td>
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="3">跨城出行券</td>
                                                        @}else{
                                                        <td><input type="hidden" id="couponUseType" name="couponUseType" value="7">接送机出行券</td>
                                                        @}
                                                        <td><input type="hidden" id="money" name="money" value="${obj.money}">${obj.money}</td>
                                                        <td><input type="hidden" id="effective" name="effective" value="${obj.effective}">${obj.effective}天</td>
                                                        <td><input type="hidden" id="receive" name="receive" >-</td>
<!--                                                        <td><input type="hidden" id="effective" name="effective" value="${obj.effective}">${obj.effective}天</td>-->
                                                        <td><input type="hidden" id="receive" name="receive" value="${obj.receive}">${obj.receive}</td>
                                                    </tr>
                                                    @}
                                                </tbody>
@@ -100,6 +100,17 @@
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >优惠卷有效期:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <input id="effective11" name="effective11" value="${item.effective}" type="number" maxlength="11" style="height: 30px;width: 300px" class="form-control" disabled>
                                </div>
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >天</label>
                                </div>
                            </div>
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >每个人发放:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >

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

@@ -18,7 +18,7 @@
                                <option value="0">通用券</option>
                                <option value="1">专车券</option>
                                <option value="2">出租券</option>
                                <option value="3">直通车出行券</option>
                                <option value="3">跨城出行券</option>
                                <option value="7">接送机出行券</option>
                            </#SelectCon>
                            </div>

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

@@ -13,7 +13,7 @@
                                <#SelectCon id="type" name="类别" >
                                    <!--<option value="2">出租车</option>-->
                                    <option value="1">专车</option>
                                    <option value="3">直通车</option>
                                    <option value="3">跨城</option>
                                    <!--<option value="4">小件物流</option>-->
                                </#SelectCon>
                            </div>

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

@@ -18,7 +18,7 @@
                                    <option value="0">通用券</option>
                                    <option value="1">专车券</option>
                                    <!--<option value="2">出租车券</option>-->
                                    <option value="3">直通车券</option>
                                    <option value="3">跨城券</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

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

@@ -10,7 +10,7 @@
                    <#input id="name" name="活动标题" underline="true" value="${item.name}"/>
                    <#button name="选择优惠券" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectCouponOpt()" style="margin-left: 12%;"/>
                    <#input id="couponType" name="优惠券类型" readonly="true" value="${item.couponType==1?'抵扣':'满减'}"/>
                    <#input id="couponUseType" name="服务类型" underline="true" readonly="true"  value="${item.couponUseType==0?'通用券':item.couponUseType==1?'专车券':item.couponUseType==2?'出租券':'直通车券'}"/>
                    <#input id="couponUseType" name="服务类型" underline="true" readonly="true"  value="${item.couponUseType==0?'通用券':item.couponUseType==1?'专车券':item.couponUseType==2?'出租券':'跨城券'}"/>
                    <#input id="money" name="金额" underline="true" readonly="true"  value="${item.money}"/>
                    <#input id="effective" name="有效天数" underline="true"  value="${item.effective}"/>
                    <#input id="number" name="张数" underline="true"  value="${item.number}"/>

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

@@ -18,7 +18,7 @@
                                    <option value="0">通用券</option>
                                    <option value="1">专车券</option>
                                    <!--<option value="2">出租车券</option>-->
                                    <option value="3">直通车券</option>
                                    <option value="3">跨城券</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

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

@@ -20,7 +20,7 @@
                    <#select id="couponUseType" name="服务类型" underline="true">
                        <option value="1">专车券</option>
                        <!--<option value="2">出租车券</option>-->
                        <option value="3">直通车券</option>
                        <option value="3">跨城券</option>
                        <option value="7">接送机券</option>
                        <option value="0">通用券</option>
                    </#select>

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

@@ -13,7 +13,7 @@
                </div>

                <div class="col-sm-6">
                            <#input id="couponUseType" name="优惠券使用类型(0=通用，3=直通车，4=小件物流)" value="${item.couponUseType}" underline="true"/>
                            <#input id="couponUseType" name="优惠券使用类型(0=通用，3=跨城，4=小件物流)" value="${item.couponUseType}" underline="true"/>
                            <#input id="couponType" name="优惠券类型(1=抵扣，2=满减)" value="${item.couponType}" underline="true"/>
                            <#input id="name" name="优惠券名称" value="${item.name}" underline="true"/>
                            <#input id="effective" name="有效天数" value="${item.effective}" />

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

@@ -12,7 +12,7 @@
                    <div class="col-sm-12">
                        <div class="tabs-container">
                            <ul class="nav nav-tabs">
                                <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">直通车乘车须知</a></li>
                                <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">跨城乘车须知</a></li>
                            </ul>
                            <div class="tab-content">
                                <div id="tab-1" class="tab-pane active">

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

@@ -57,7 +57,7 @@
                                -->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="TCarInfoDlg.kcServerClick()">
                                    <label for="serverBox3"> 直通车 </label>
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                                <!--
                                <div class="checkbox checkbox-success  checkbox-inline">
@@ -92,7 +92,7 @@
                        </div>
                    </div>
                    <div class="form-group" style="display: none;" id="kcModelDiv">
                        <label class="col-sm-3 control-label">直通车车型：</label>
                        <label class="col-sm-3 control-label">跨城车型：</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="kcModel" name="kcModel">
                                <option value="">选择车型</option>

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

@@ -59,7 +59,7 @@
                                -->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="TCarInfoDlg.kcServerClick()">
                                    <label for="serverBox3"> 直通车 </label>
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                                <!--
                                <div class="checkbox checkbox-success  checkbox-inline">
@@ -94,7 +94,7 @@
                        </div>
                    </div>
                    <div class="form-group" id="kcModelDiv">
                        <label class="col-sm-3 control-label">直通车车型：</label>
                        <label class="col-sm-3 control-label">跨城车型：</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="kcModel" name="kcModel">
                                <option value="">选择车型</option>

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

@@ -67,7 +67,7 @@
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >价格:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                <div class="initialLevel col-sm-5 control-label form-group"  >
                                    <input id="serviceMoney" name="serviceMoney" type="text" maxlength="20" style="height: 30px;width: 300px" placeholder="请输入价格" required="required">
                                </div>
                                <div class="initialLevel col-sm-2 control-label form-group"  >
@@ -78,40 +78,51 @@

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >计价规则:</label>
<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
<!--                                    <label class="control-label" >计价规则:</label>-->
<!--                                </div>-->
<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
<!--                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;"></textarea>-->
<!--                                </div>-->

                                <label class="col-sm-3 control-label">计价规则：</label>
                                <div class="col-sm-9">
                                    <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
                                </div>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;"></textarea>
                                </div>

                            </div>
                        </div>
<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                    <#avatar id="priceRulePicture" name=" "/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-6 control-label form-group"  >
                                    <#avatar id="priceRulePicture" name=" "/>
<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
<!--                                    <label class="control-label" >取消规则:</label>-->
<!--                                </div>-->
<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
<!--                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;"></textarea>-->
<!--                                </div>-->

                                <label class="col-sm-3 control-label">取消规则：</label>
                                <div class="col-sm-9">
                                    <textarea type="text/plain" id="editor1" style="width:100%;height:350px;"></textarea>
                                </div>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >取消规则:</label>
                                </div>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;"></textarea>
                                </div>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-6 control-label form-group"  >
                                    <#avatar id="cancelRulePicture" name=" "/>
                                </div>
                            </div>
                        </div>
<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                    <#avatar id="cancelRulePicture" name=" "/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >

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

@@ -78,40 +78,49 @@

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >计价规则:</label>
                                </div>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;" disabled="disabled">${item.priceRule}</textarea>
<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
<!--                                    <label class="control-label" >计价规则:</label>-->
<!--                                </div>-->
<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
<!--                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;" disabled="disabled">${item.priceRule}</textarea>-->
<!--                                </div>-->

                                <label class="col-sm-3 control-label">计价规则：</label>
                                <div class="col-sm-9">
                                    <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.priceRule}</textarea>
                                </div>
                            </div>
                        </div>
<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                <div class="initialLevel col-sm-4 control-label form-group"  >-->
<!--                                    <img src="${item.priceRulePicture}" style="height: 100px;width: 100px" disabled="disabled"/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <img src="${item.priceRulePicture}" style="height: 100px;width: 100px" disabled="disabled"/>
<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
<!--                                    <label class="control-label" >取消规则:</label>-->
<!--                                </div>-->
<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
<!--                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;" disabled="disabled">${item.cancelRule}</textarea>-->
<!--                                </div>-->
                                <label class="col-sm-3 control-label">取消规则：</label>
                                <div class="col-sm-9">
                                    <textarea type="text/plain" id="editor1" style="width:100%;height:350px;">${item.cancelRule}</textarea>
                                </div>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >取消规则:</label>
                                </div>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;" disabled="disabled">${item.cancelRule}</textarea>
                                </div>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <img src="${item.cancelRulePicture}" style="height: 100px;width: 100px" disabled="disabled"/>
                                </div>
                            </div>
                        </div>
<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                <div class="initialLevel col-sm-4 control-label form-group"  >-->
<!--                                    <img src="${item.cancelRulePicture}" style="height: 100px;width: 100px" disabled="disabled"/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >

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

@@ -78,40 +78,51 @@

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >计价规则:</label>
                                </div>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;">${item.priceRule}</textarea>
<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
<!--                                    <label class="control-label" >计价规则:</label>-->
<!--                                </div>-->
<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
<!--                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;">${item.priceRule}</textarea>-->
<!--                                </div>-->


                                <label class="col-sm-3 control-label">计价规则：</label>
                                <div class="col-sm-9">
                                    <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.priceRule}</textarea>
                                </div>
                            </div>
                        </div>
<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                    <#avatar id="priceRulePicture" name=" " avatarImg="${item.priceRulePicture}"/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-6 control-label form-group"  >
                                    <#avatar id="priceRulePicture" name=" " avatarImg="${item.priceRulePicture}"/>
<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
<!--                                    <label class="control-label" >取消规则:</label>-->
<!--                                </div>-->
<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
<!--                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;">${item.cancelRule}</textarea>-->
<!--                                </div>-->

                                <label class="col-sm-3 control-label">取消规则：</label>
                                <div class="col-sm-9">
                                    <textarea type="text/plain" id="editor1" style="width:100%;height:350px;">${item.cancelRule}</textarea>
                                </div>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                    <label class="control-label" >取消规则:</label>
                                </div>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;">${item.cancelRule}</textarea>
                                </div>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-6 control-label form-group"  >
                                    <#avatar id="cancelRulePicture" name=" " avatarImg="${item.cancelRulePicture}"/>
                                </div>
                            </div>
                        </div>
<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                <div class="initialLevel col-sm-6 control-label form-group"  >-->
<!--                                    <#avatar id="cancelRulePicture" name=" " avatarImg="${item.cancelRulePicture}"/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >

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

@@ -132,7 +132,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        直通车
                                        跨城
                                    </label>
                                </div>
                                <!--
@@ -395,11 +395,16 @@
        TCompanyInfoDlg.checkbox4();
        TCompanyInfoDlg.checkbox5();
        TCompanyInfoDlg.checkbox6();

        TCompanyInfoDlg.checkbox7();
        var jsj = $("input[name='jsj']:checked").val();
        var zc = $("input[name='zc']:checked").val();
        var cz = $("input[name='cz']:checked").val();
        var tcx = $("input[name='tcx']:checked").val();
        var kcx = $("input[name='kcx']:checked").val();
        if (jsj == "" || jsj == null || jsj == undefined){
            $("#jsj1").attr("checked","checked")
        }

        if (zc == "" || zc == null || zc == undefined){
            $("#zc1").attr("checked","checked")
        }

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

@@ -116,7 +116,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        直通车
                                        跨城
                                    </label>
                                </div>
                                <!--

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

@@ -97,7 +97,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        直通车
                                        跨城
                                    </label>
                                </div>
                                <!--

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

@@ -173,7 +173,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
                                    <label for="checkbox3">
                                        直通车
                                        跨城
                                    </label>
                                </div>
                                <!--

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

@@ -105,7 +105,7 @@
                            <div class="checkbox checkbox-success">
                                <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
                                <label for="checkbox3">
                                    直通车
                                    跨城
                                </label>
                            </div>
                            <!--

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

@@ -132,7 +132,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        直通车
                                        跨城
                                    </label>
                                </div>
                                <!--

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

@@ -113,7 +113,7 @@
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        直通车
                                        跨城
                                    </label>
                                </div>
                                <!--

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

@@ -80,7 +80,7 @@
                                <!--</div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
                                    <label for="serverBox3"> 直通车 </label>
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                                <!--<div class="checkbox checkbox-success  checkbox-inline">-->
                                    <!--<input type="checkbox" name="serverBox" id="serverBox4" value="4">-->

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

@@ -83,7 +83,7 @@
                                <!--</div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.checkBox()" >
                                    <label for="serverBox3"> 直通车 </label>
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                                <!--<div class="checkbox checkbox-success  checkbox-inline">-->
                                    <!--<input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>-->

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

@@ -9,7 +9,7 @@
                    <#label id="phone" name="手机号" value="${item.phone}"/>
                    <#label id="sexStr" name="性别" value="${item.sexStr}"/>
                    <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
                    <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
<!--                    <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>-->
                    <div class="form-group">
                        <label class="col-sm-3 control-label">驾驶证照片：</label>
                        <div class="col-sm-9">
@@ -31,7 +31,7 @@
                    </div>
                    <#label id="idCard" name="身份证号码" value="${item.idCard}"/>
                    <#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
                    <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
<!--                    <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>-->
                    <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">审核结果：</label>

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

@@ -9,7 +9,7 @@
                    <#label id="phone" name="手机号" value="${item.phone}"/>
                    <#label id="sexStr" name="性别" value="${item.sexStr}"/>
                    <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
                    <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
<!--                    <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>-->
                    <div class="form-group">
                        <label class="col-sm-3 control-label">驾驶证照片：</label>
                        <div class="col-sm-9">
@@ -31,7 +31,7 @@
                    </div>
                    <#label id="idCard" name="身份证号码" value="${item.idCard}"/>
                    <#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
                    <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
<!--                    <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>-->
                    <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
                    <#label id="authStateStr" name="审核结果" value="${item.authStateStr}"/>
                </div>

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

@@ -28,7 +28,7 @@

            <div class="row btn-group-m-t">
                <div class="col-sm-11 col-sm-offset-5">
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDriverFacialFailInfoDlg.close()"/>
                    <#button btnCss="default" name="关闭" id="cancel" icon="fa-eraser" clickFun="TDriverFacialFailInfoDlg.close()"/>
                </div>
            </div>
        </div>

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

@@ -230,9 +230,10 @@
        ,range: '-'
        ,format: 'HH:mm'
    });
    var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
    var regDouble = /^(\d+)(\.\d{1,2})?$/;
    // var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
    var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
    var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
    var regBiLi = /^(100|[1-9]?[0-9])$/;
    var regInt = /^[0-9]{0,3}$/;
    function checkIsYuan(obj){
        var num = $(obj).val();
@@ -249,7 +250,7 @@
    function checkIsBiLi(obj){
        var num = $(obj).val();
        if(!regBiLi.test(num)){
            layer.msg("【比例】输入框大于等于0小于100");
            layer.msg("【比例】输入框大于等于0小于100的正整数");
        }
    }
    function checkIsMinute(obj){

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

@@ -28,7 +28,7 @@
                                <option value="">选择经营业务</option>
                                <option value="1">专车</option>
                                <!--<option value="2">出租车</option>-->
                                <option value="3">直通车</option>
                                <option value="3">跨城</option>
                                <!--<option value="4">跨城小件物流</option>-->
                                <!--<option value="5">同城小件物流</option>-->
                                <option value="6">包车</option>
@@ -64,14 +64,15 @@
                    </div>

                    <div class="form-group">
                        <label class="col-sm-3 control-label">机场/动车站点：</label>
                        <div class="col-sm-2" >
                            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">
                        </div>
                        <label class="col-sm-2 control-label">机场/动车站点：</label>
                        <div class="col-sm-3" >
                            <input class="form-control"  style="width: 250px;" type="text" id="address" autocomplete="on" >
<!--                            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">-->
                        </div>
                        <div class="col-sm-4" >
                            <#input id="siteName" name="站点名称" value="" />
                        </div>
                        <div class="col-sm-3">
                        <div class="col-sm-2">
                            <select class="form-control" id="siteType">
                                <option value="">选择站点类型</option>
                                <option value="1">机场</option>
@@ -86,8 +87,8 @@
        <!-- 创建地图容器-->
        <div id="container" style="height: 500px;" ></div>
    </div>
    <div hidden id="longitude"></div>
    <div hidden id="latitude"></div>
    <div hidden id="lon"></div>
    <div hidden id="lat"></div>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">已添加站点列表：</label>
                        <div class="col-sm-9">
@@ -121,14 +122,15 @@

    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'58f0e656d02373943498c93ccb11b02f',
    };
</script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
@}

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

@@ -35,7 +35,7 @@
                                <option value="">选择经营业务</option>
                                <option value="1">专车</option>
                                <!--<option value="2">出租车</option>-->
                                <option value="3">直通车</option>
                                <option value="3">跨城</option>
                                <!--<option value="4">跨城小件物流</option>-->
                                <!--<option value="5">同城小件物流</option>-->
                                <option value="6">包车</option>
@@ -79,11 +79,12 @@
                        </div>
                    </div>
    <div class="form-group">
        <label class="col-sm-3 control-label">机场/动车站点：</label>
        <div class="col-sm-2" >
            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">
        </div>
        <label class="col-sm-2 control-label">机场/动车站点：</label>
        <div class="col-sm-3" >
<!--            <input class="form-control"  style="width: 250px;" type="text" id="address" onchange="TOpenCityInfoDlg.searchByStationName(this,1)">-->
            <input class="form-control"  style="width: 250px;" type="text" id="address" autocomplete="on" >
        </div>
        <div class="col-sm-4" >
            <#input id="siteName" name="站点名称" value="" />
        </div>
        <div class="col-sm-3">
@@ -101,8 +102,8 @@
        <!-- 创建地图容器-->
        <div id="container" style="height: 500px;" ></div>
    </div>
    <div hidden id="longitude"></div>
    <div hidden id="latitude"></div>
    <div hidden id="lon"></div>
    <div hidden id="lat"></div>
    <div class="form-group">
        <label class="col-sm-3 control-label">已添加站点列表：</label>
        <div class="col-sm-9">
@@ -152,11 +153,12 @@

    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'58f0e656d02373943498c93ccb11b02f',
    };
</script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
@}

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

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>旅游包车订单管理</h5>
                <h5>包车订单管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

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

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>旅游包车订单管理</h5>
                <h5>包车订单管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

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

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>直通车订单管理</h5>
                <h5>跨城订单管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

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

@@ -150,13 +150,21 @@
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
<script>
    var audioElements = document.querySelectorAll('audio');
    audioElements.forEach(function(audio) {
        audio.addEventListener('play', function() {
            console.log('Audio is playing:', this.id);
            // 在这里添加你想要在播放时执行的代码
            this.pause();
            this.currentTime = 0;

    var recordState = $("#recordState").val();


    if (recordState == 2) {
        audioElements.forEach(function (audio) {

            audio.addEventListener('play', function () {
                console.log('Audio is playing:', this.id);
                // 在这里添加你想要在播放时执行的代码
                this.pause();
                this.currentTime = 0;
            });
        });
    });

    }
</script>
@}

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

@@ -32,7 +32,7 @@
                                    <option value="">全部</option>
                                    <option value="1">专车</option>
                                    <!--<option value="2">出租车</option>-->
                                    <option value="3">直通车</option>
                                    <option value="3">跨城</option>
                                    <!--<option value="4">跨城小件物流</option>-->
                                    <!--<option value="5">同城小件物流</option>-->
                                    <option value="6">包车</option>

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

@@ -8,7 +8,7 @@
                            <#input id="id" name="" underline="true"/>
                            <#input id="orderId" name="订单id" underline="true"/>
                            <#input id="driverId" name="司机id" underline="true"/>
                            <#input id="orderType" name="3=直通车，4=跨城小件物流，5=同城小件物流"/>
                            <#input id="orderType" name="3=跨城，4=跨城小件物流，5=同城小件物流"/>
                </div>

                <div class="col-sm-6">

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

@@ -8,7 +8,7 @@
                            <#input id="id" name="" value="${item.id}" underline="true"/>
                            <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
                            <#input id="driverId" name="司机id" value="${item.driverId}" underline="true"/>
                            <#input id="orderType" name="3=直通车，4=跨城小件物流，5=同城小件物流" value="${item.orderType}" />
                            <#input id="orderType" name="3=跨城，4=跨城小件物流，5=同城小件物流" value="${item.orderType}" />
                </div>

                <div class="col-sm-6">

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

@@ -18,11 +18,11 @@
                            <div class="col-sm-3">
                                <#SelectCon id="orderSource" name="订单来源" >
                                    <option value="">全部</option>
                                    <option value="1">APP下单</option>
<!--                                    <option value="1">APP下单</option>-->
                                    <option value="2">扫码下单</option>
                                    <option value="3">小程序下单</option>
                                    <option value="4">司机下单</option>
                                    <option value="5">调度下单</option>
<!--                                    <option value="4">司机下单</option>-->
<!--                                    <option value="5">调度下单</option>-->
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

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

@@ -18,6 +18,7 @@
    <div class="ibox-content">
        <div class="form-horizontal">
            <input type="hidden" id="id" name="id" value="${item.id}">
            <input type="hidden" id="recordState" name="recordState" value="${recordState}">
            <div class="row" style="margin-top: 30px;">
                <div class="col-sm-4">
                    <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
@@ -133,13 +134,21 @@
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
<script>
    var audioElements = document.querySelectorAll('audio');
    audioElements.forEach(function(audio) {
        audio.addEventListener('play', function() {
            console.log('Audio is playing:', this.id);
            // 在这里添加你想要在播放时执行的代码
            this.pause();
            this.currentTime = 0;

   var recordState = $("#recordState").val();


    if (recordState == 2) {
        audioElements.forEach(function (audio) {

            audio.addEventListener('play', function () {
                console.log('Audio is playing:', this.id);
                // 在这里添加你想要在播放时执行的代码
                this.pause();
                this.currentTime = 0;
            });
        });
    });

    }
</script>
@}

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

@@ -18,11 +18,11 @@
                            <div class="col-sm-3">
                                <#SelectCon id="orderSource" name="订单来源" >
                                    <option value="">全部</option>
                                    <option value="1">APP下单</option>
<!--                                    <option value="1">APP下单</option>-->
                                    <option value="2">扫码下单</option>
                                    <option value="3">小程序下单</option>
                                    <option value="4">司机下单</option>
                                    <option value="5">调度下单</option>
<!--                                    <option value="4">司机下单</option>-->
<!--                                    <option value="5">调度下单</option>-->
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

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

@@ -133,13 +133,21 @@
<script src="${ctxPath}/static/modular/system/tOrderTransfer/tOrderTransfer_info.js"></script>
<script>
    var audioElements = document.querySelectorAll('audio');
    audioElements.forEach(function(audio) {
        audio.addEventListener('play', function() {
            console.log('Audio is playing:', this.id);
            // 在这里添加你想要在播放时执行的代码
            this.pause();
            this.currentTime = 0;

    var recordState = $("#recordState").val();


    if (recordState == 2) {
        audioElements.forEach(function (audio) {

            audio.addEventListener('play', function () {
                console.log('Audio is playing:', this.id);
                // 在这里添加你想要在播放时执行的代码
                this.pause();
                this.currentTime = 0;
            });
        });
    });

    }
</script>
@}

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

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>直通车改派管理</h5>
                <h5>跨城改派管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

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

@@ -17,10 +17,10 @@
                                <#NameCon id="phone" name="司机手机号" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="SelectTransferDriver.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="SelectTransferDriver.resetSearch()" space="true"/>
                                <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectTransferDriver.selectDriver()" space="true"/>
                                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectTransferDriver.close()" space="true"/>
                                <#button name="搜索" icon="fa-search" clickFun="SelectTansferDriver.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="SelectTansferDriver.resetSearch()" space="true"/>
                                <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectTansferDriver.selectDriver()" space="true"/>
                                <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectTansferDriver.close()" space="true"/>
                            </div>
                        </div>
                        <#table id="SelectTransferDriverTable"/>

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

@@ -91,7 +91,7 @@
                    <#label id="integral" name="积分" value="${item.integral}"/>
                </div>
                <div class="col-sm-6">
                    <#label id="kcNum" name="直通车" value="${item.kcNum}"/>
                    <#label id="kcNum" name="跨城" value="${item.kcNum}"/>
                    <!--
                    <#label id="wlNum" name="小件物流" value="${item.wlNum}"/>
                    -->

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

@@ -15,7 +15,7 @@
                <div class="col-sm-6">
                            <#input id="state" name="状态(0=临时，1=未使用，2=已使用，3=已过期)" underline="true"/>
                            <#input id="orderId" name="订单id" underline="true"/>
                            <#input id="orderType" name="订单类型(3=直通车，4=小件物流)" underline="true"/>
                            <#input id="orderType" name="订单类型(3=跨城，4=小件物流)" underline="true"/>
                            <#input id="userId" name="用户id" underline="true"/>
                            <#input id="redPacketActivityId" name="活动id" underline="true"/>
                </div>

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

@@ -15,7 +15,7 @@
                <div class="col-sm-6">
                            <#input id="state" name="状态(0=临时，1=未使用，2=已使用，3=已过期)" value="${item.state}" underline="true"/>
                            <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
                            <#input id="orderType" name="订单类型(3=直通车，4=小件物流)" value="${item.orderType}" underline="true"/>
                            <#input id="orderType" name="订单类型(3=跨城，4=小件物流)" value="${item.orderType}" underline="true"/>
                            <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
                            <#input id="redPacketActivityId" name="活动id" value="${item.redPacketActivityId}" />
                </div>

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

@@ -9,18 +9,18 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">端口类型：</label>
                        <div class="col-sm-9"  style="display: flex;align-items: center;">
                            <div class="radio radio-info radio-inline">
                                <input type="radio" id="type1" value="1" name="type" checked="" >
                                <label for="type1"> 用户端 </label>
                            </div>
<!--                            <div class="radio radio-info radio-inline">-->
<!--                                <input type="radio" id="type1" value="1" name="type" checked="" >-->
<!--                                <label for="type1"> 用户端 </label>-->
<!--                            </div>-->
                            <div class="radio radio-success radio-inline">
                                <input type="radio" id="type2" value="2" name="type" >
                                <label for="type2"> 司机端 </label>
                            </div>
                            <div class="radio radio-primary radio-inline">
                                <input type="radio" id="type3" value="3" name="type" >
                                <label for="type3"> 车载端 </label>
                            </div>
<!--                            <div class="radio radio-primary radio-inline">-->
<!--                                <input type="radio" id="type3" value="3" name="type" >-->
<!--                                <label for="type3"> 车载端 </label>-->
<!--                            </div>-->
                            <div class="radio radio-primary radio-inline">
                                <input type="radio" id="type4" value="4" name="type" >
                                <label for="type4"> 调度端 </label>

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

@@ -51,7 +51,7 @@
                                    <br/>
                                    送
                                    &nbsp;<input type="text"  name="zc1" id="num8" class="form-control newWidth" />&nbsp;张
                                    &nbsp;<input type="text"  name="zc1" id="num9" class="form-control newWidth"  placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(3)"/>&nbsp;元直通车优惠券
                                    &nbsp;<input type="text"  name="zc1" id="num9" class="form-control newWidth"  placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(3)"/>&nbsp;元跨城优惠券
                                    <br/>
                                    <br/>
                                    有效期

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

@@ -280,9 +280,9 @@
            // {title: '出租车券领取总数', field: 'taxiNumber', visible: true, align: 'center', valign: 'middle'},
            // {title: '出租车券使用总数', field: 'taxiUseNumber', visible: true, align: 'center', valign: 'middle'},
            // {title: '出租车券使用总金额', field: 'taxiUserMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '直通车券领取总数', field: 'intercityNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '直通车券使用总数', field: 'intercityUseNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '直通车券使用总金额', field: 'intercityUserMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '跨城券领取总数', field: 'intercityNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '跨城券使用总数', field: 'intercityUseNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '跨城券使用总金额', field: 'intercityUserMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '', field: 'insertTime', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    var btn = '';

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

@@ -159,8 +159,8 @@
                                                <th style="width: 300px;">专车券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <th style="width: 300px;">直通车金额</th>
                                                <th style="width: 300px;">直通车券数量</th>
                                                <th style="width: 300px;">跨城金额</th>
                                                <th style="width: 300px;">跨城券数量</th>
                                                <th style="width: 100px;">操作</th>
                                            </tr>
                                            </thead>

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

@@ -80,7 +80,7 @@
                                                                              @if(isNotEmpty(item1Coupon)){
                                                                              value="${item1Coupon.couponUseType==0?'通用券':
                                                                              item1Coupon.couponUseType==1?'专车券':
                                                                              item1Coupon.couponUseType==2?'出租券':'直通车券'}"
                                                                              item1Coupon.couponUseType==2?'出租券':'跨城券'}"
                                                                              @}else{
                                                                              value=""
                                                                              @}
@@ -178,7 +178,7 @@
                                                                              @if(isNotEmpty(item2Coupon)){
                                                                              value="${item2Coupon.couponUseType==0?'通用券':
                                                                              item2Coupon.couponUseType==1?'专车券':
                                                                              item2Coupon.couponUseType==2?'出租券':'直通车券'}"
                                                                              item2Coupon.couponUseType==2?'出租券':'跨城券'}"
                                                                              @}else{
                                                                              value=""
                                                                              @}
@@ -270,8 +270,8 @@
                                                <th style="width: 300px;">专车券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <th style="width: 300px;">直通车金额</th>
                                                <th style="width: 300px;">直通车券数量</th>
                                                <th style="width: 300px;">跨城金额</th>
                                                <th style="width: 300px;">跨城券数量</th>
                                            </tr>
                                            </thead>
                                            <tbody id="coun">

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

@@ -83,7 +83,7 @@
                                                                              @if(isNotEmpty(item1Coupon)){
                                                                              value="${item1Coupon.couponUseType==0?'通用券':
                                                                              item1Coupon.couponUseType==1?'专车券':
                                                                              item1Coupon.couponUseType==2?'出租券':'直通车券'}"
                                                                              item1Coupon.couponUseType==2?'出租券':'跨城券'}"
                                                                              @}else{
                                                                              value=""
                                                                              @}
@@ -184,7 +184,7 @@
                                                                              @if(isNotEmpty(item2Coupon)){
                                                                              value="${item2Coupon.couponUseType==0?'通用券':
                                                                              item2Coupon.couponUseType==1?'专车券':
                                                                              item2Coupon.couponUseType==2?'出租券':'直通车券'}"
                                                                              item2Coupon.couponUseType==2?'出租券':'跨城券'}"
                                                                              @}else{
                                                                              value=""
                                                                              @}
@@ -278,8 +278,8 @@
                                                <th style="width: 300px;">专车券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <th style="width: 300px;">直通车金额</th>
                                                <th style="width: 300px;">直通车券数量</th>
                                                <th style="width: 300px;">跨城金额</th>
                                                <th style="width: 300px;">跨城券数量</th>
                                                <th style="width: 100px;">操作</th>
                                            </tr>
                                            </thead>

 ManagementNTTravel/guns-admin/src/main/webapp/static/favicon1.ico

Binary files differ

 ManagementNTTravel/guns-admin/src/main/webapp/static/home.js

@@ -403,7 +403,7 @@
            zc += '</div>';
            o += zc;

            var kc = '<div class="list-group"><a href="#" class="list-group-item active">直通车未接订单</a>'
            var kc = '<div class="list-group"><a href="#" class="list-group-item active">跨城未接订单</a>'
            for(var i in kuacheng){
                kc += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + kuacheng[i].start + '</p><p class="list-group-item-text">终点：' + kuacheng[i].end + '</p>' +
                    '<p class="list-group-item-text">下单时间：' + kuacheng[i].travelTime + '</p><p class="list-group-item-text">车型：' + kuacheng[i].carModel + '</p>' +

 ManagementNTTravel/guns-admin/src/main/webapp/static/img/index4.png

 ManagementNTTravel/guns-admin/src/main/webapp/static/img/logo.png

 ManagementNTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js

@@ -60,7 +60,7 @@
        bindEvent : function(bindedObj) {
            var me =  this;
            bindedObj.on('fileQueued', function(file) {
                var $li = $('<div><img width="200px" height="200px"></div>');
                var $li = $('<div><img width="100px" height="100px"></div>');
                var $img = $li.find('img');

                $("#" + me.uploadPreId).html($li);

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

@@ -114,6 +114,7 @@
    });

    var startTime1 = $("#startTime").val();
    var effective = $("#effective11").val();
    var time = startTime1.split(" - ");
    var startTime = time[0] + " 00:00:00";
    var endTime = time[1] + " 23:59:59";
@@ -129,6 +130,7 @@
    this.set('couponId',couponId);
    this.set('startTime',startTime);
    this.set('endTime',endTime);
    this.set('effective',effective);
    ajax.set(this.generalizationInfoData);
    ajax.start();
}
@@ -143,6 +145,8 @@
    if(!this.validate()){
        return ;
    }
    var effective = $("#effective11").val();

    var couponId=null;
    $(".siteClass").each(function () {
        couponId = $(this).find("input[name*='id']").val()
@@ -165,6 +169,7 @@
    this.set('couponId',couponId);
    this.set('startTime',startTime);
    this.set('endTime',endTime);
    this.set('effective',effective);
    ajax.set(this.generalizationInfoData);
    ajax.start();
}
@@ -220,10 +225,10 @@
 */
GeneralizationInfoDlg.selectCouponOpt9=function(id,insertTime,couponUseType,money,effective,receive){
    if(receive == null || receive == "" || receive == undefined){
        receive = "-";
        receive = 0;
    }

    // 0="通用券" 1="专车券" 2="出租券" 3="直通车出行券" 7="接送机出行券"
    // 0="通用券" 1="专车券" 2="出租券" 3="跨城出行券" 7="接送机出行券"
    var type = "";
    if(couponUseType == 0){
        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">通用券</td>';
@@ -232,7 +237,7 @@
    }else if(couponUseType == 2){
        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">出租券</td>';
    }else if(couponUseType == 3){
        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">直通车出行券</td>';
        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">跨城出行券</td>';
    }else{
        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">接送机出行券</td>';
    }
@@ -242,7 +247,7 @@
        '<input type="hidden" id="insertTime" name="insertTime" value="'+insertTime+'">' + insertTime + '</td>' +
        type +
        '<td><input type="hidden" id="money" name="money" value="'+money+'">' + money + '</td>' +
        '<td><input type="hidden" id="effective" name="effective" value="'+effective+'">' + effective + "天"+'</td>' +
        // '<td><input type="hidden" id="effective" name="effective" value="'+effective+'">' + effective + "天"+'</td>' +
        '<td><input type="hidden" id="receive" name="receive" value="'+receive+'">' + receive + '</td>' +
        // '</tr>';
        '<td><button onclick="deleteSub(this)">移除</button></td></tr>';
@@ -275,7 +280,7 @@
 * @param money
 */
GeneralizationInfoDlg.selectCouponOpt1=function(id,couponUseType,couponType,money,name){
    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"直通车出行券");
    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
    $("#content3Num3").val(couponType==1?"抵扣":"满减");
    $("#content3Num4").val(money);
    $("#content3CouponId").val(id);

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

@@ -25,7 +25,7 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{
@@ -34,11 +34,11 @@
                }
            },
            {title: '优惠金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
            {title: '有效期', field: 'effective', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                   return value+"天";
                }
            },
            // {title: '有效期', field: 'effective', visible: true, align: 'center', valign: 'middle',
            //     formatter: function (value, row) {
            //        return value+"天";
            //     }
            // },
            {title: '领取人数', field: 'receive', visible: true, align: 'center', valign: 'middle'},
    ];
};
@@ -88,6 +88,9 @@
    if ("" == id || null == id || undefined == id){
        Feng.info("请先选中表格中的某一记录！");
        return ;
    }
    if ("" == receive || null == receive || undefined == receive){
        receive = 0;
    }
    var obj = $("#obj").val();
    window.parent.GeneralizationInfoDlg.selectCouponOpt9(id,insertTime,couponUseType,money,effective,receive);
@@ -153,7 +156,7 @@
};
$(function () {
    var defaultColunms = SysCouponRecord.initColumn();
    var table = new BSTable(SysCouponRecord.id, "/sysCouponRecord/list", defaultColunms);
    var table = new BSTable(SysCouponRecord.id, "/sysCouponRecord/list1", defaultColunms);
    table.setPaginationType("server");
    var queryData = {};
    queryData['couponUseType'] = $("#couponUseType").val();

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

@@ -25,7 +25,9 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{
                        return "";
                    }

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

@@ -249,7 +249,7 @@
 * @param money
 */
SysCouponActivityInfoDlg.selectCouponOpt=function(id,couponUseType,couponType,money){
    $("#couponUseType").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"直通车出行券");
    $("#couponUseType").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
    $("#couponType").val(couponType==1?"抵扣":"满减");
    $("#money").val(money);
    $("#activityId").val(id);

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

@@ -28,7 +28,9 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{
                        return "";
                    }

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

@@ -27,7 +27,7 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{

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

@@ -28,7 +28,7 @@
        kcModel: {
            validators: {
                notEmpty: {
                    message: '请选择直通车出行车型'
                    message: '请选择跨城出行车型'
                }
            }
        },

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

@@ -3,6 +3,8 @@
 */
var TCharteredServiceInfoDlg = {
    tCharteredServiceInfoData : {},
    editor: null,
    editor1: null,
    validateFields: {
        serviceName: {
            validators: {
@@ -87,6 +89,7 @@
 * 收集数据
 */
TCharteredServiceInfoDlg.collectData = function() {

    this
    .set('id')
    .set('serviceName')
@@ -94,7 +97,6 @@
    .set('serverCarModelId')
    .set('serviceMoney')
    .set('carType')
    .set('priceRule')
    .set('priceRulePicture')
    .set('cancelRule')
    .set('cancelRulePicture');
@@ -126,6 +128,8 @@
    });
    this.set('status',status);
    this.set('carType',carType);
    this.set('priceRule',TCharteredServiceInfoDlg.editor.getContent());
    this.set('cancelRule',TCharteredServiceInfoDlg.editor1.getContent());
    ajax.set(this.tCharteredServiceInfoData);
    ajax.start();
}
@@ -156,6 +160,8 @@
    });
    this.set('status',status);
    this.set('carType',carType);
    this.set('priceRule',TCharteredServiceInfoDlg.editor.getContent());
    this.set('cancelRule',TCharteredServiceInfoDlg.editor1.getContent());
    ajax.set(this.tCharteredServiceInfoData);
    ajax.start();
}
@@ -164,6 +170,7 @@
    Feng.initValidator("charteredServiceInfoForm", TCharteredServiceInfoDlg.validateFields);
    //初始化编辑器
    TCharteredServiceInfoDlg.editor = UE.getEditor('editor');
    TCharteredServiceInfoDlg.editor1 = UE.getEditor('editor1');
    // 初始化图片上传
    var themePicture = new $WebUpload("themePicture");
    themePicture.setUploadBarId("progressBar");

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

@@ -180,11 +180,11 @@
        }
        swal({
            title: "您是否确认解封"+ nickname + "?",
            text: "操作解封后，司机该轮人脸认证即可通过，可继续接单是否确认解封！",
            text: "操作解封后，司机该轮人脸认证即可通过，可继续接单 \n是否确认解封?",
            type: "warning",
            showCancelButton: true,
            confirmButtonColor: "#DD6B55",
            confirmButtonText: "解封",
            confirmButtonText: "确认",
            closeOnConfirm: true
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tDriverFacialFail/unsealing", function (data) {

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

@@ -25,6 +25,28 @@
                return btn;
            }
        },
        {title: '是否推荐', field: 'isOpen', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";

                    if (row.isOpen == 1){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="是" onfocus="TUser.tooltip()">是</p>']
                    } else {
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="否" onfocus="TUser.tooltip()">否</p>']
                    }

                return btn;
            }
        },
        {title: '排序值', field: 'sortBy', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";

                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.sortBy + '" onfocus="TUser.tooltip()">' + row.sortBy+ '</p>']

                return btn;
            }
        },
        {title: '线路名称', field: 'name', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                var btn = "";
@@ -106,7 +128,7 @@
TLine.openAddTLine = function () {
    var index = layer.open({
        type: 2,
        title: '添加直通车线路',
        title: '添加跨城线路',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -122,7 +144,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '编辑直通车线路',
            title: '编辑跨城线路',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,

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

@@ -42,7 +42,7 @@
                    message: '抽成比例不能为空'
                },
                regexp: {
                    regexp: /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/,
                    regexp: /^(100|[1-9]?[0-9])$/,
                    message: '抽成比例格式不正确'
                }
            }
@@ -320,7 +320,7 @@
        var num2 = $("#num2").val();
        var num3 = $("#num3").val();
        var num4 = $("#num4").val();
        if(!regDouble.test(num1) || !regDouble.test(num2) || !regXiShu.test(num3) || !regXiShu.test(num4)){
        if(!regDouble.test(num1) || !regDouble.test(num2) || !regDouble.test(num3) || !regDouble.test(num4)){
            Feng.info("固定计价格式不正确!");
            return;
        }

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

@@ -342,22 +342,29 @@
            return;
        }
    }
    var lon = $("#longitude").val();
    var lat = $("#latitude").val();
    var lon = $("#lon").val();
    var lat = $("#lat").val();
    var lonAndLat = "("+lon+","+lat+")";
    var str = '<tr class="siteClass">' +
        '<td><input type="hidden" id="busId" name="busId" value="0">' +
        '<input type="hidden" id="time" name="time" value="'+getNowFormatDate()+'">' + getNowFormatDate() + '</td>' +
        '<td><input type="hidden" id="name" name="name" value="'+siteName+'">' + siteName + '</td>' +
        '<td><input type="hidden" id="lonAndLat" name="lonAndLat" value="'+lonAndLat+'">' + lonAndLat + '</td>' +
        '<td><input type="hidden" name="name" value="'+siteName+'">' + // 保留隐藏输入以存储原始值
        '<input type="text" class="editable-name" value="'+siteName+'" onchange="updateHiddenInput(this)"> ' + // 添加可编辑输入
        '</td>' +        '<td><input type="hidden" id="lonAndLat" name="lonAndLat" value="'+lonAndLat+'">' + lonAndLat + '</td>' +
        '<td><input type="hidden" id="siteType" name="siteType" value="'+type+'">' + siteType + '</td>' +
        '<td><button onclick="deleteSub(this)">移除</button></td></tr>';
    $("#site").append(str);
}

function updateHiddenInput(inputElement) {
    var hiddenInput = inputElement.previousElementSibling; // 假设可编辑输入后面紧跟着隐藏输入
    hiddenInput.value = inputElement.value; // 当可编辑输入的值改变时，更新隐藏输入的值
}
function deleteSub(e) {
    $(e).parent().parent().remove();
}

/*
//获取当前时间，格式YYYY-MM-DD
function getNowFormatDate() {
    var date = new Date();
@@ -470,4 +477,206 @@
            }
        });
    })
}
}*/
//起点地图加载
var marker, map = new AMap.Map("container", {
    resizeEnable: true,
    zoom: 15,
    zooms: [3, 20]
}); //定位标注当前位置
/*map.plugin('AMap.Geolocation', function () {
    geolocation = new AMap.Geolocation({
        enableHighAccuracy: true, //是否使用高精度定位，默认:true
        timeout: 10000, //超过10秒后停止定位，默认：无穷大
        maximumAge: 0, //定位结果缓存0毫秒，默认：0
        convert: true, //自动偏移坐标，偏移后的坐标为高德坐标，默认：true
        showButton: true, //显示定位按钮，默认：true
        showMarker: true, //定位成功后在定位到的位置显示点标记，默认：true
        showCircle: true, //定位成功后用圆圈表示定位精度范围，默认：true
        panToLocation: true, //定位成功后将定位到的位置作为地图中心点，默认：true
        buttonPosition: 'LB', //定位按钮的停靠位置  LB左下角、  RB右下角
        buttonOffset: new AMap.Pixel(10, 20), //定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
        zoomToAccuracy: true, //定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
    });

    function onComplete(data) {
        var str = [];
        city = data.addressComponent.citycode;
        str.push('定位结果：' + data.position);
        str.push('定位类别：' + data.location_type);
        if (data.accuracy) {
            str.push('精度：' + data.accuracy + ' 米');
        }
        //如为IP精确定位结果则没有精度信息
        str.push('是否经过偏移：' + (data.isConverted ? '是' : '否'));
        var lnglatXY = [data.position.getLng(), data.position.getLat()];
        //地图上所标点的坐标
        AMap.service('AMap.Geocoder', function () {
            //回调函数
            geocoder = new AMap.Geocoder({});
            geocoder.getAddress(lnglatXY, function (status, result) {
                if (status === 'complete' && result.info === 'OK') {
//获得了有效的地址信息:                    //即，result.regeocode.formattedAddress
//                     console.log(result.regeocode.formattedAddress);
                    var address = result.regeocode.formattedAddress;
                    str.push('详细地址：' + address);
// todo 不弹出信息框
// alert(str.join(' | '));
                } else {
// alert(str.join(' | ')); //获取地址失败
                }
            });
        })
} //解析定位错误信息
function onError(data) {
    alert('定位失败，原因：' + data.message);
}

    map.addControl(geolocation);
    geolocation.getCurrentPosition()
    AMap.event.addListener(geolocation, 'complete', onComplete);
//返回定位信息
    AMap.event.addListener(geolocation, 'error', onError);
    //返回定位出错信息
}); //解析定位结果
*/
var city;
map.on('click', function (e) {
    if (marker != null) {
        marker.setMap(null);
    }
//添加标记点
    console.log(e.lnglat.getLng())
    console.log(e.lnglat.getLat())
    $("#lon").val(e.lnglat.getLng());
    $("#lat").val(e.lnglat.getLat());
    marker = new AMap.Marker({
        map: map,
        position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
    });
    regeoCode(e.lnglat.getLng(), e.lnglat.getLat());
});


var infoWindow = new AMap.InfoWindow({
    autoMove: true,
    offset: {
        x: 0,
        y: -30
    }
}); //回调函数


//根据经纬度获取详细地址
function regeoCode(lon, lat) {

    var lnglat = [];
    lnglat.push(lon);
    lnglat.push(lat);
    map.clearMap()
    map.add(marker);
    marker.setPosition(lnglat);

    AMap.service('AMap.Geocoder', function () {
        geocoder = new AMap.Geocoder({});
        geocoder.getAddress(lnglat, function (status, result) {
            if (status === 'complete' && result.regeocode) {
                var address = result.regeocode.formattedAddress;
                $("#address").val(address);
            } else {
                Feng.error('根据经纬度查询地址失败')
            }
            var data = {
                "name": result.regeocode.addressComponent.neighborhood,
                "location": {
                    "lat": lat,
                    "lng": lon
                },
                "address": address,
                "tel": "",
                "type": result.regeocode.addressComponent.neighborhoodType
            };
            // infoWindow.setContent(createContent(data));
            infoWindow.open(map, marker.getPosition());
        });
    })
}


//输入搜索点信息
var autoOptions = {
    city: city, //在规定城市搜索、默认全国
    input: "address"
};

var auto = new AMap.Autocomplete(autoOptions);
var placeSearch = new AMap.PlaceSearch({
    pageSize: 5, // 单页显示结果条数
    pageIndex: 1, // 页码
    children: 0, //不展示子节点数据
    city: city, // 兴趣点城市
    citylimit: true, //是否强制限制在设置的城市内搜索
    panel: "panel", // 结果列表将在此容器中进行展示。
    autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
    extensions: 'base', //返回基本地址信息  */
    map: map // 展现结果的地图实例
}); //构造地点查询类

AMap.event.addListener(auto, "select", select); //注册监听，当选中某条记录时会触发
function select(e) {
    console.log("============>e")
    console.log(e)
    placeSearch.setCity(e.poi.adcode);
    placeSearch.search(e.poi.name); //关键字查询查询        //设置搜索位置定点标注
    $("#lon").val(e.poi.location.lng);
    $("#lat").val(e.poi.location.lat);
    marker = new AMap.Marker({
        map: map,
        position: new AMap.LngLat(e.poi.location.lng, e.poi.location.lat),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
    });
    regeoCode(e.poi.location.lng, e.poi.location.lat);
    /* if (e.poi && e.poi.location) {
         map.setZoom(15);
         map.setCenter(e.poi.location);
         var id = e.poi.id; //详情查询
         placeSearch.getDetails(id, function (status, result) {
             if (status === 'complete' && result.info === 'OK') {
                 console.log("result-------------->")
                 console.log(result)
                 placeSearch_CallBack(result);
             }
         });
     }*/
}

function placeSearch_CallBack(data) {
    if (marker != null) {
        marker.setMap(null);
    }
    var poiArr = data.poiList.pois; //添加marker
    marker = new AMap.Marker({
        map: map,
        position: poiArr[0].location
    });
    map.add(marker);
    marker.setPosition(marker.getPosition());

    // infoWindow.setContent(createContent(poiArr[0]));
    infoWindow.open(map, marker.getPosition());
}

function createContent(poi) {
    console.log(poi);
//信息窗体内容
    $("#address").val(poi.address);
    $("#lon").val(poi.location.lng);
    $("#lat").val(poi.location.lat);

    var s = [];
    s.push("<b>名称：" + poi.name + "</b>");
    s.push("地址：" + poi.address);
    s.push("电话：" + poi.tel);
    s.push("类型：" + poi.type);
    return s.join("<br>");
}


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

@@ -1,5 +1,5 @@
/**
 * 旅游包车订单管理初始化
 * 包车订单管理初始化
 */
var TOrderCharter = {
    id: "TOrderCharterTable",    //表格id
@@ -154,7 +154,7 @@
};

/**
 * 删除旅游包车订单
 * 删除包车订单
 */
TOrderCharter.delete = function () {
    if (this.check()) {
@@ -191,7 +191,7 @@
};

/**
 * 查询旅游包车订单列表
 * 查询包车订单列表
 */
TOrderCharter.search = function () {
    var queryData = {};

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

@@ -1,5 +1,5 @@
/**
 * 初始化旅游包车订单详情对话框
 * 初始化包车订单详情对话框
 */
var TOrderCharterInfoDlg = {
    tOrderCharterInfoData : {},

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

@@ -1,5 +1,5 @@
/**
 * 旅游包车订单管理初始化
 * 包车订单管理初始化
 */
var TOrderCharteredCar = {
    id: "TOrderCharteredCarTable",    //表格id
@@ -96,9 +96,9 @@
                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>';
                    }
                    // 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;
@@ -150,7 +150,7 @@
};

/**
 * 删除旅游包车订单
 * 删除包车订单
 */
TOrderCharteredCar.delete = function () {
    if (this.check()) {
@@ -208,7 +208,7 @@
};

/**
 * 查询旅游包车订单列表
 * 查询包车订单列表
 */
TOrderCharteredCar.search = function () {
    var queryData = {};

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

@@ -1,5 +1,5 @@
/**
 * 初始化旅游包车订单详情对话框
 * 初始化包车订单详情对话框
 */
var TOrderCharteredCarInfoDlg = {
    tOrderCharteredCarInfoData : {},

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

@@ -242,7 +242,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '直通车出行订单详情',
            title: '跨城出行订单详情',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
@@ -259,7 +259,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '直通车出行订单轨迹',
            title: '跨城出行订单轨迹',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,

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

@@ -72,7 +72,7 @@
                    } else if (row.orderType == 2){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="出租车" onfocus="TUser.tooltip()">出租车</p>']
                    } else if (row.orderType == 3){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="直通车" onfocus="TUser.tooltip()">直通车</p>']
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="跨城" onfocus="TUser.tooltip()">跨城</p>']
                    } else if (row.orderType == 4){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="同城小件物流" onfocus="TUser.tooltip()">同城小件物流</p>']
                    } else if (row.orderType == 5){

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

@@ -138,10 +138,10 @@
        });
        this.layerIndex = index;
    }else if(orderType == 3){
        console.log("直通车出行订单详情");
        console.log("跨城出行订单详情");
        var index = layer.open({
            type: 2,
            title: '直通车出行订单详情',
            title: '跨城出行订单详情',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,

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

@@ -2,7 +2,7 @@
 * 选择司机
 */
var SelectTansferDriver = {
    id: "SelectTansferDriverTable",    //表格id
    id: "SelectTransferDriverTable",    //表格id
    seItem: null,        //选中的条目
    table: null,
    layerIndex: -1
@@ -136,15 +136,16 @@
     }*/
    if (this.check()) {
        //提交信息
        layer.msg("加载中...",{
            icon:16,
            time:-1
        });
        // layer.msg("加载中...",{
        //     icon:16,
        //     time:-1
        // });
        var ajax = new $ax(Feng.ctxPath + "/tReassign/selectTransferDriver", function(data){
            Feng.success("改派成功!");
            window.parent.TReassign.table.refresh();
            SelectTansferDriver.close();
            layer.closeAll()
            parent.layer.close(window.parent.TReassign.layerIndex);
        },function(data){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
            layer.closeAll()

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

@@ -80,7 +80,7 @@
TAcrossCity.addAcrossCity = function () {
    var index = layer.open({
        type: 2,
        title: '添加直通车车型设置',
        title: '添加跨城车型设置',
        area: ['800px', '420px'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -97,7 +97,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '修改直通车车型设置',
            title: '修改跨城车型设置',
            area: ['800px', '420px'], //宽高
            fix: false, //不固定
            maxmin: true,

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

@@ -109,7 +109,7 @@
TSite.openAddTSite = function () {
    var index = layer.open({
        type: 2,
        title: '添加直通车站点',
        title: '添加跨城站点',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -125,7 +125,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '编辑直通车站点',
            title: '编辑跨城站点',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,

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

@@ -111,6 +111,17 @@
                return btn;
            }
        },
        {title: '余额', field: 'balance', visible: true, align: 'center', valign: 'middle',width:'5%',
            formatter: function (value, row) {
                var btn = "";
                if(row.balance != '' && row.balance != null) {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥' + row.balance + '" onfocus="TUser.tooltip()">¥' + row.balance + '</p>']
                }else {
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥0.00" onfocus="TUser.tooltip()">¥0.00</p>']
                }
                return btn;
            }
        },
        {title: '历史消费', field: 'consumptionNum', visible: true, align: 'center', valign: 'middle',width:'5%',
            formatter: function (value, row) {
                var btn = "";

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

@@ -28,7 +28,9 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{
                        return "";
                    }

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

@@ -362,7 +362,7 @@
 * @param money
 */
UserActivityInfoDlg.selectCouponOpt=function(id,couponUseType,couponType,money,name){
    $("#content2Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"直通车出行券");
    $("#content2Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
    $("#content2Num3").val(couponType==1?"抵扣":"满减");
    $("#content2Num4").val(money);
    $("#content2CouponId").val(id);
@@ -393,7 +393,7 @@
 * @param money
 */
UserActivityInfoDlg.selectCouponOpt1=function(id,couponUseType,couponType,money,name){
    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"直通车出行券");
    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
    $("#content3Num3").val(couponType==1?"抵扣":"满减");
    $("#content3Num4").val(money);
    $("#content3CouponId").val(id);

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

@@ -28,7 +28,9 @@
                    }else if(value==2){
                        return "出租券";
                    }else if(value==3){
                        return "直通车出行券";
                        return "跨城出行券";
                    }else if(value==7){
                        return "接送机出行券";
                    }else{
                        return "";
                    }
@@ -47,7 +49,7 @@
                    }
                }
            },
        {title: '使用时间', field: 'useTime', visible: true, align: 'center', valign: 'middle'}
        {title: '使用时间', field: 'endTime', visible: true, align: 'center', valign: 'middle'}
    ];
};


 UserNTTravel/.idea/workspace.xml

@@ -5,56 +5,231 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="202e88b5-454e-4bc8-8ff5-2d4680354082" name="Default Changelist" comment="Default Changelist">
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/git_toolbox_prj.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/TLineSiteMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/TLineSite.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/ICarMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/ICar.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java" 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/DriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.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$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java" 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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/pom.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/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/crossCity/controller/LineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.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/crossCity/warpper/LineWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.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/CarMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml" 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/OrderCancelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.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/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/model/Car.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.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/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/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.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/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/.idea/modules.xml" 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/DriverActivityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java" 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$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderTransferController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderTransferController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java" 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/dao/mapping/TCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.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/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.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/404.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/addHtml.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/addHtml.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/editHtml.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/editHtml.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/generalization_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/sysCouponRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/sysCouponRecord.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_edit.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/tCompany/tCompany_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverFacialFail/tDriverFacialFail_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverFacialFail/tDriverFacialFail_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_orderDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_orderDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTransfer.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTransfer.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.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_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.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/favicon1.ico" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/home.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/index4.png" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/index4.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/img/logo.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/js/common/web-upload-image.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCharteredService/tCharteredService_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tCharteredService/tCharteredService_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverFacialFail/tDriverFacialFail.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverFacialFail/tDriverFacialFail.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter_info.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$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTape/tOrderTape.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTape/tOrderTape.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectTransferDriver.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectTransferDriver.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tSite/tSite.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tSite/tSite.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementNTTravel/guns-parent.iml" beforeDir="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/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/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/GunsApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.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/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/FrequentPassengersController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FrequentPassengersController.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/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/api/UserInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.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/dao/mapping/OrderCrossCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Line.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Line.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/system/dao/DriverWorkMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverWorkMapper.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/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/dao/mapping/DriverWorkMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.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/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/OrderEvaluateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.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/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/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/util/WeChatUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.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/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/crossCity/dao/mapping/OrderCrossCityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml" 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-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" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/target/classes/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-core/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-generator/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-generator/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulNTTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulNTTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulNTTravel/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulNTTravel/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulNTTravel/target/classes/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulNTTravel/target/classes/redis.properties" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -399,12 +574,15 @@
    &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;last_opened_file_path&quot;: &quot;D:/study/NTTravel/UserNTTravel&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;project.structure.last.edited&quot;: &quot;模块&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&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;,
@@ -506,21 +684,26 @@
      </method>
    </configuration>
    <list>
      <item itemvalue="Application.ALiSendSms" />
      <item itemvalue="Application.Jisuan" />
      <item itemvalue="Application.KaiPiaoUtil" />
      <item itemvalue="JUnit.GunsApplicationTest.queryVipLevelList" />
      <item itemvalue="Spring Boot.GunsRestApplication" />
      <item itemvalue="Spring Boot.GunsApplication" />
      <item itemvalue="应用程序.Jisuan" />
      <item itemvalue="应用程序.KaiPiaoUtil" />
      <item itemvalue="应用程序.ALiSendSms" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="应用程序.KaiPiaoUtil" />
        <item itemvalue="应用程序.Jisuan" />
        <item itemvalue="应用程序.ALiSendSms" />
        <item itemvalue="JUnit.GunsApplicationTest.queryVipLevelList" />
      </list>
    </recent_temporary>
  </component>
  <component name="SharedIndexes">
    <attachedChunks>
      <set>
        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
      </set>
    </attachedChunks>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
  <component name="SvnConfiguration">
@@ -614,7 +797,55 @@
      <workItem from="1717745385424" duration="5212000" />
      <workItem from="1718066732888" duration="8875000" />
      <workItem from="1718088930158" duration="359000" />
      <workItem from="1718089412780" duration="596000" />
      <workItem from="1718089412780" duration="7203000" />
      <workItem from="1718154353967" duration="40729000" />
      <workItem from="1718269607704" duration="15658000" />
      <workItem from="1718362829881" duration="611000" />
      <workItem from="1718586064939" duration="833000" />
      <workItem from="1718609694971" duration="383000" />
      <workItem from="1718610364523" duration="595000" />
      <workItem from="1718679232525" duration="598000" />
      <workItem from="1718682192887" duration="228000" />
      <workItem from="1718767432611" duration="2208000" />
      <workItem from="1718781034001" duration="151000" />
      <workItem from="1718781502492" duration="2348000" />
      <workItem from="1718789463491" duration="2666000" />
      <workItem from="1718852081148" duration="594000" />
      <workItem from="1718936612097" duration="94000" />
      <workItem from="1718953175297" duration="334000" />
      <workItem from="1718957942121" duration="1310000" />
      <workItem from="1719209860950" duration="23000" />
      <workItem from="1719210159923" duration="204000" />
      <workItem from="1719210388169" duration="55000" />
      <workItem from="1719211094570" duration="116000" />
      <workItem from="1719383432824" duration="2262000" />
      <workItem from="1719386671224" duration="300000" />
      <workItem from="1719387160351" duration="164000" />
      <workItem from="1720159799380" duration="59000" />
      <workItem from="1720163668681" duration="5989000" />
      <workItem from="1720419288188" duration="686000" />
      <workItem from="1720420150447" duration="5778000" />
      <workItem from="1720487180047" duration="4880000" />
      <workItem from="1720574140064" duration="35000" />
      <workItem from="1720682162850" duration="2743000" />
      <workItem from="1720749087848" duration="3205000" />
      <workItem from="1720754275155" duration="3324000" />
      <workItem from="1720766179115" duration="1745000" />
      <workItem from="1721097110677" duration="5998000" />
      <workItem from="1722493813774" duration="114000" />
      <workItem from="1722494184166" duration="1257000" />
      <workItem from="1722499759848" duration="1201000" />
      <workItem from="1722560724040" duration="1844000" />
      <workItem from="1722583887549" duration="599000" />
      <workItem from="1729214257988" duration="97000" />
      <workItem from="1729214660883" duration="3085000" />
      <workItem from="1729218925676" duration="3198000" />
      <workItem from="1729503164083" duration="16000" />
      <workItem from="1729503490460" duration="340000" />
      <workItem from="1729504816385" duration="39000" />
      <workItem from="1729581424587" duration="666000" />
      <workItem from="1730457522570" duration="1747000" />
      <workItem from="1730964380988" duration="2672000" />
    </task>
    <servers />
  </component>
@@ -717,7 +948,7 @@
        </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/OrderCrossCityServiceImpl.java</url>
          <line>1425</line>
          <line>1433</line>
          <option name="timeStamp" value="56" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
@@ -727,18 +958,13 @@
        </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/OrderCrossCityServiceImpl.java</url>
          <line>1696</line>
          <line>1704</line>
          <option name="timeStamp" value="66" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java</url>
          <line>489</line>
          <line>491</line>
          <option name="timeStamp" value="76" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java</url>
          <line>226</line>
          <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/crossCity/controller/OrderCrossCityController.java</url>
@@ -746,29 +972,113 @@
          <option name="timeStamp" value="88" />
        </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/LineSiteServiceImpl.java</url>
          <line>124</line>
          <option name="timeStamp" value="92" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/server/impl/OrderTransferServiceImpl.java</url>
          <line>1034</line>
          <option name="timeStamp" value="104" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <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" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java</url>
          <line>57</line>
          <option name="timeStamp" value="105" />
        </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/SiteServiceImpl.java</url>
          <line>83</line>
          <option name="timeStamp" value="100" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java</url>
          <line>128</line>
          <option name="timeStamp" value="108" />
        </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>85</line>
          <option name="timeStamp" value="103" />
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/controller/OrderTransferController.java</url>
          <line>178</line>
          <option name="timeStamp" value="110" />
        </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>287</line>
          <option name="timeStamp" value="111" />
        </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>215</line>
          <option name="timeStamp" value="113" />
        </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/UserInfoServiceImpl.java</url>
          <line>235</line>
          <option name="timeStamp" value="114" />
        </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>149</line>
          <option name="timeStamp" value="116" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java</url>
          <line>329</line>
          <option name="timeStamp" value="118" />
        </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>604</line>
          <option name="timeStamp" value="129" />
        </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>831</line>
          <option name="timeStamp" value="130" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java</url>
          <line>53</line>
          <option name="timeStamp" value="131" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java</url>
          <line>1059</line>
          <option name="timeStamp" value="136" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java</url>
          <line>1122</line>
          <option name="timeStamp" value="137" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java</url>
          <line>1154</line>
          <option name="timeStamp" value="138" />
        </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/UserInfoServiceImpl.java</url>
          <line>809</line>
          <option name="timeStamp" value="147" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java</url>
          <line>23</line>
          <option name="timeStamp" value="154" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java</url>
          <line>114</line>
          <option name="timeStamp" value="155" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java</url>
          <line>200</line>
          <option name="timeStamp" value="157" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java</url>
          <line>157</line>
          <option name="timeStamp" value="159" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-method">
          <url>file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/OrderTransferMapper.java</url>
          <line>69</line>
          <properties class="com.stylefeng.guns.modular.transfer.dao.OrderTransferMapper">
            <option name="EMULATED" value="true" />
            <option name="WATCH_EXIT" value="false" />
          </properties>
          <option name="timeStamp" value="117" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>

 UserNTTravel/guns-admin/pom.xml

@@ -201,6 +201,10 @@
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
        </dependency>
    </dependencies>



 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java

@@ -36,8 +36,13 @@
    private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);

    public static void main(String[] args) {
//            try {


            SpringApplication.run(GunsApplication.class, args);
//            }catch (Exception e){
//                e.printStackTrace();
//            }
            logger.info("GunsApplication is success!");



 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java

@@ -168,6 +168,8 @@
        hashMap.put("/swagger-resources/configuration/security/**", "anon");

        hashMap.put("/base/**", "anon");
        hashMap.put("/api/driver/queryDriverInfo", "anon");
        hashMap.put("/api/frequentPassengers/queryFrequentPassengersList", "anon");
        hashMap.put("/api/**", "anon");//api不走shiro验证
        hashMap.put("/static/**", "anon");
        hashMap.put("/gunsApi/**", "anon");

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

@@ -50,6 +50,7 @@
     */
    @TableField("serverCarModelId")
    private Integer serverCarModelId;

    @TableField("serviceId")
    private Integer serviceId;
    /**

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

@@ -72,7 +72,7 @@
     * @return
     */
    @ResponseBody
    @PostMapping("/api/driver/queryDriverInfo")
    @PostMapping("/base/driver/queryDriverInfo")
    @ApiOperation(value = "获取司机详情", tags = {"用户端-订单相关"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "司机id", name = "id", required = true, dataType = "int"),

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

@@ -23,7 +23,7 @@
 * 常用乘车人
 */
@RestController
@RequestMapping("/api/frequentPassengers")
@RequestMapping("/base/frequentPassengers")
public class FrequentPassengersController {

    @Autowired

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

@@ -10,6 +10,8 @@
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.TActivityGeneralization;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
@@ -267,7 +269,7 @@
                Map<String, Object> map = new HashMap<>();
                map.put("money", transactionDetails1.getMoney());
                map.put("time", sdf.format(transactionDetails1.getInsertTime()));
                map.put("name", transactionDetails1.getOrderType() == 3 ? "直通车订单取消退款" : transactionDetails1.getOrderType() == 4 ? "小件物流订单取消退款" : "");
                map.put("name", transactionDetails1.getOrderType() == 3 ? "跨城订单取消退款" : transactionDetails1.getOrderType() == 4 ? "小件物流订单取消退款" : "");
                map.put("insertTime", Double.valueOf(transactionDetails1.getInsertTime().getTime() / 1000).intValue());
                list4.add(map);
            }
@@ -1008,6 +1010,8 @@
        }
    }

    @Autowired
    private IUserCouponRecordService userCouponRecordService;


    /**
@@ -1049,6 +1053,50 @@
                    list = orderTransferService.queryCoupon(orderId, uid, pageNum, size);
                    break;
            }
            //将activityType=5的数据进行处理

//            List<Integer> ids = new ArrayList<>();

//            if (list != null && list.size() > 0) {
//                Map<Object, Integer> couponIdMonthlyCount = new HashMap<>(); // 用来统计每个月各couponId的出现次数
//                Date currentDate = new Date(); // 获取当前日期
//                Calendar cal = Calendar.getInstance();
//                cal.setTime(currentDate);
//                int currentMonth = cal.get(Calendar.MONTH) + 1; // 获取当前月份（注意Calendar.MONTH是从0开始的）
//
//                // 首先，统计每个月各couponId的出现次数
//                for (Map<String, Object> map : list) {
//                    if (map.get("activityType").equals(5)) {
//                        for (UserCouponRecord userCouponRecord : userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("couponId", map.get("couponId")))) {
//                            Date endTime = userCouponRecord.getEndTime();
//                            Calendar recordCal = Calendar.getInstance();
//                            if (endTime==null){
//                                continue;
//                            }
//                            recordCal.setTime(endTime);
//                            int recordMonth = recordCal.get(Calendar.MONTH) + 1;
//
//                            if (recordMonth == currentMonth) {
//                                Object couponId = map.get("couponId");
//                                couponIdMonthlyCount.put(couponId, couponIdMonthlyCount.getOrDefault(couponId, 0) + 1);
//                            }
//                        }
//                    }
//                }
//
//                // 然后，根据统计结果移除当月数量超过1的couponId对应的记录
//                List<Map<String, Object>> newList = new ArrayList<>();
//                for (Map<String, Object> map : list) {
//                    Object couponId = map.get("couponId");
//                    if (!couponIdMonthlyCount.containsKey(couponId) || couponIdMonthlyCount.get(couponId) <= 1) {
//                        newList.add(map);
//                    }
//                }
//                list.clear();
//                list.addAll(newList);
//            }


            return ResultUtil.success(CouponWarpper.getCouponWarppers(list));
        }catch (Exception e){
            e.printStackTrace();
@@ -1056,6 +1104,69 @@
        }
    }

    @Autowired
    private ITActivityGeneralizationService activityGeneralizationService;
    @ResponseBody
    @PostMapping("/api/taxi/check")
    @ApiOperation(value = "判断是否到到当月限额", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城","用户端-接送机"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "id", name = "id", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil check(Integer id,HttpServletRequest request){
        try {
            Integer uid = userInfoService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            // 查询当前活动的限制数量
            UserCouponRecord userCouponRecords1 = userCouponRecordService.selectById(id);

            List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("couponId", userCouponRecords1.getCouponId()));

            // 获取活动限制数量
            TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(userCouponRecords.get(0).getCouponActivityId());
            if (tActivityGeneralization == null) {
                throw new RuntimeException("未能找到对应的活动信息");
            }
            int limitQuantity = tActivityGeneralization.getMonthUseCount(); // 假设limitQuantity字段代表限制数量

            // 判断当月的优惠券是否超过限制
            Calendar currentCal = Calendar.getInstance();
            int currentMonth = currentCal.get(Calendar.MONTH) + 1; // 当前月份

            // 统计当月的优惠券使用数量
            int usedThisMonth = 0;
            for (UserCouponRecord record : userCouponRecords) {
                if (record.getEndTime()==null){
                    continue;
                }
                Calendar recordCal = Calendar.getInstance();
                recordCal.setTime(record.getEndTime());
                int recordMonth = recordCal.get(Calendar.MONTH) + 1;

                // 判断endTime是否在当月
                if (recordMonth == currentMonth) {
                    usedThisMonth++;
                }
            }

            // 判断是否超过限制
            if (usedThisMonth >= limitQuantity) {
                return ResultUtil.error("本月使用数量已经超出限制");
                // 这里可以添加更多的逻辑处理，比如抛出异常、记录日志等
            } else {
                return ResultUtil.success();
            }


        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }






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

@@ -147,7 +147,7 @@
    })
    public ResultUtil coupon(String phone,String code,Integer acId){
        // 校验验证码是否正确
        String redisCode = redisUtil.getValue("code:"+phone);
            String redisCode = redisUtil.getValue("code:"+phone);
        if (redisCode==null&&!code.equals("111111")){
            return ResultUtil.error("验证码错误");
        }
@@ -157,9 +157,12 @@


        //判断该手机号是否注册
        UserInfo byAccount = userInfoService.selectList(new EntityWrapper<UserInfo>().eq("phone",phone).ne("flag",3)).get(0);
        List<UserInfo> userInfos = userInfoService.selectList(new EntityWrapper<UserInfo>().eq("phone", phone).ne("flag", 3));
        //已注册直接添加优惠卷
        TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
        if (tActivityGeneralization.getState()==4){
            return ResultUtil.error("当前活动已暂停");
        }
        // 获取当前时间
        Date now = new Date();
        // 将Date转换为比较友好的形式，这里直接使用
@@ -171,11 +174,17 @@


        SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(tActivityGeneralization.getCouponId());
        if (byAccount != null){

        int i1 = userCouponRecordService.selectCount(new EntityWrapper<UserCouponRecord>().eq("activityType", 5).eq("couponActivityId", acId).groupBy("userId"));
        if (tActivityGeneralization.getParticipateCount()<=i1){
            return ResultUtil.error("当前参与人数已满");
        }

        if (!userInfos.isEmpty()){
            //判断该账号是否领取
            List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("userId", byAccount.getId()).eq("activityType", 5).eq("couponActivityId", acId));
            List<UserCouponRecord> userCouponRecords = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("userId", userInfos.get(0).getId()).eq("activityType", 5).eq("couponActivityId", acId));
            if (!userCouponRecords.isEmpty()){
                return ResultUtil.error("当前用户已领取");
                return ResultUtil.error("您已领取过该优惠活动，不可重复领取");
            }
            Date date = new Date();
            UserCouponRecord userCouponRecord = new UserCouponRecord();
@@ -185,20 +194,20 @@
            userCouponRecord.setState(1);
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(date);
            calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + sysCouponRecord.getEffective());
            calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + tActivityGeneralization.getEffective());
            userCouponRecord.setExpirationTime(calendar.getTime());
            userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(sysCouponRecord.getCouponType())));
            userCouponRecord.setCouponUseType(sysCouponRecord.getCouponUseType());
            userCouponRecord.setInsertTime(date);
            userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(sysCouponRecord.getFullMoney()==null?0:sysCouponRecord.getFullMoney())));
            userCouponRecord.setMoney(Double.valueOf(String.valueOf(sysCouponRecord.getMoney())));
            userCouponRecord.setCompanyId(byAccount.getCompanyId());
            userCouponRecord.setUserId(byAccount.getId());
            userCouponRecord.setCompanyId(sysCouponRecord.getCompanyId());
            userCouponRecord.setUserId(userInfos.get(0).getId());

            Integer userGrantCount = tActivityGeneralization.getUserGrantCount();
//            userCouponRecordService.insert(userCouponRecord);
            if (userGrantCount != null && userGrantCount > 0) {
                for (int i = 0; i < userGrantCount; i++) {// ...
                for (int i = 0; i < userGrantCount; i++) {
                    userCouponRecordService.insert(userCouponRecord);
                }
            }
@@ -206,7 +215,13 @@
            //判断当前用户是否领取
            String value = redisUtil.getValue("counpon:" + phone);
            if (value!=null){
                return ResultUtil.error("当前用户已领取");
                String[] split = value.split(",");
                for (String s : split) {
                    if (s.equals(String.valueOf(acId))){
                        return ResultUtil.error("您已领取过该优惠活动，不可重复领取");
                    }
                }
                redisUtil.setStrValue("counpon:"+phone, value+","+String.valueOf(acId));
            }
            //未注册将优惠卷信息存入缓存，待用户注册时调用来添加优惠卷
            redisUtil.setStrValue("counpon:"+phone, String.valueOf(acId));
@@ -280,5 +295,38 @@



    @ResponseBody
    @PostMapping("/get/driverQr")
    @ApiOperation(value = "获取司机二维码新", tags = {"线下推广页面"}, notes = "")
    @ApiImplicitParams({

    })
    public ResultUtil driverQr(){
        try {
            String urlLink = weChatUtil.getUrlLink("pages/areaDetails/areaDetails", null);
            return ResultUtil.success(urlLink);
        }catch (Exception e){
            e.printStackTrace();
        }
        return ResultUtil.error("请稍后再试");
    }

    @ResponseBody
    @PostMapping("/get/rid")
    @ApiOperation(value = "获取司机二维码新", tags = {"线下推广页面"}, notes = "")
    @ApiImplicitParams({

    })
    public ResultUtil rid(){
        try {
            String urlLink = weChatUtil.rid("/pages/home/scanPage/scanPage", null);
            return ResultUtil.success(urlLink);
        }catch (Exception e){
            e.printStackTrace();
        }
        return ResultUtil.error("请稍后再试");
    }



}

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

@@ -104,6 +104,24 @@
    }

    @ResponseBody
    @PostMapping("/base/user/wechat")
    @ApiOperation(value = "微信一键登录", tags = {"用户端-登录"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "code", name = "code", required = true, dataType = "String")
    })
    public ResultUtil<LoginWarpper> wechat(String code){
        try {

            String phone1 = weChatUtil.getPhone(code);
            return userInfoService.captchaLogin1(phone1);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    @ResponseBody
    @PostMapping("/base/user/oneClickLogin")
    @ApiOperation(value = "手机一键登录", tags = {"用户端-登录"}, notes = "")
    @ApiImplicitParams({
@@ -708,11 +726,11 @@
    public ResultUtil uploadImg(MultipartFile file, HttpServletRequest request, HttpServletResponse response){
        try {
            String name = file.getOriginalFilename();
            String type = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
            List<String> types = Arrays.asList("jpg", "jpeg", "png");
            if(!types.contains(type)){
                return ResultUtil.error("请上传图片文件（jpg/jpeg/png）");
            }
//            String type = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
//            List<String> types = Arrays.asList("jpg", "jpeg", "png");
//            if(!types.contains(type)){
//                return ResultUtil.error("请上传图片文件（jpg/jpeg/png）");
//            }
            String s = OssUploadUtil.ossUpload(request, file);
            return ResultUtil.success(s);
        }catch (Exception e){

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java

@@ -3,6 +3,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.support.WafKit;
import com.stylefeng.guns.modular.crossCity.dao.ICarMapper;
import com.stylefeng.guns.modular.crossCity.model.Line;
import com.stylefeng.guns.modular.crossCity.model.LineSite;
import com.stylefeng.guns.modular.crossCity.model.Site;
@@ -11,6 +12,10 @@
import com.stylefeng.guns.modular.crossCity.server.ISiteService;
import com.stylefeng.guns.modular.crossCity.server.impl.LineSiteServiceImpl;
import com.stylefeng.guns.modular.crossCity.warpper.LineWarpper;
import com.stylefeng.guns.modular.system.model.Car;
import com.stylefeng.guns.modular.system.model.CarService;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.service.ICompanyService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import io.swagger.annotations.Api;
@@ -68,7 +73,7 @@
    @RequestMapping(value = "/base/line/recomand", method = RequestMethod.POST)
    @ApiOperation(value = "获取热门路线", tags = {"用户端-跨城"}, notes = "")
    public ResultUtil<List<Line>> recomand(){
        List<Line> isOpen = lineService.selectList(new EntityWrapper<Line>().eq("isOpen", 1).eq("state",1));
        List<Line> isOpen = lineService.selectList(new EntityWrapper<Line>().eq("isOpen", 1).eq("state",1).orderBy("sortBy",false));

        for (Line line : isOpen) {
            List<LineSite> lineId = lineSiteService.selectList(new EntityWrapper<LineSite>().eq("lineId", line.getId()));
@@ -84,6 +89,21 @@
    }


    @Autowired
    private ICarMapper carMapper;

    @Autowired
    private ICompanyService companyService;

    @ResponseBody
    @RequestMapping(value = "/base/line/confirm", method = RequestMethod.POST)
    @ApiOperation(value = "判断当前是否需要摆渡车", tags = {"用户端-跨城"}, notes = "")
    public ResultUtil confirm(Integer carId){
        Car car = carMapper.selectById(carId);
        Company company = companyService.selectById(car.getCompanyId());
        return ResultUtil.success(company.getIsNeedFerry());
    }


//    @ResponseBody
//    @RequestMapping(value = "/base/line/scanCodeQueryLines", method = RequestMethod.POST)

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/ICarMapper.java

New file
@@ -0,0 +1,14 @@
package com.stylefeng.guns.modular.crossCity.dao;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Car;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

public interface ICarMapper extends BaseMapper<Car> {



}

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

@@ -378,7 +378,7 @@
        select
        (payMoney * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        ('直通车订单') as name,
        ('跨城订单') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cross_city where payMoney != 0 and userId = #{uid} and state in (2, 3, 4, 5, 6, 8, 9, 10, 11, 12)
    </select>
@@ -392,7 +392,7 @@
        startAddress as startAddress,
        endAddress as endAddress,
        payMoney as payMoney,
        ('直通车订单') as orderName,
        ('跨城订单') as orderName,
        if(invoiceId is null, 1, 2) as invoice,
        unix_timestamp(insertTime) as insertTime,
        (3) as orderType
@@ -421,7 +421,7 @@
        select
        redPacketMoney as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        ('直通车订单') as name,
        ('跨城订单') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cross_city where userId = #{uid} and state in (8, 9) and redPacketId is not null
    </select>

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/ICar.java

New file
@@ -0,0 +1,272 @@
package com.stylefeng.guns.modular.crossCity.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;

import java.util.Date;

/**
 * 车辆
 */
@TableName("t_car")
public class ICar {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 是否是平台车辆（1=是，2=否）
     */
    @TableField("isPlatCar")
    private Integer isPlatCar;
    /**
     * 公司id
     */
    @TableField("companyId")
    private Integer companyId;
    /**
     * 加盟商id
     */
    @TableField("franchiseeId")
    private Integer franchiseeId;
    /**
     * 车辆颜色
     */
    @TableField("carColor")
    private String carColor;
    /**
     * 车型id
     */
    @TableField("carModelId")
    private Integer carModelId;
    /**
     * 车辆品牌id
     */
    @TableField("carBrandId")
    private Integer carBrandId;
    /**
     * 车牌号
     */
    @TableField("carLicensePlate")
    private String carLicensePlate;
    /**
     * 车辆照片
     */
    @TableField("carPhoto")
    private String carPhoto;
    /**
     * 行驶证号
     */
    @TableField("drivingLicenseNumber")
    private String drivingLicenseNumber;
    /**
     * 行驶证照片
     */
    @TableField("drivingLicensePhoto")
    private String drivingLicensePhoto;
    /**
     * 年检到期时间
     */
    @TableField("annualInspectionTime")
    private Date annualInspectionTime;
    /**
     * 保险照片
     */
    @TableField("insurancePhoto")
    private String insurancePhoto;
    /**
     * 商业保险到期时间
     */
    @TableField("commercialInsuranceTime")
    private Date commercialInsuranceTime;
    /**
     * 添加时间
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 状态（1=正常，2=删除）
     */
    @TableField("state")
    private Integer state;
    /**
     * 添加来源（1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加）
     */
    @TableField("addType")
    private Integer addType;
    /**
     * 公司id
     */
    @TableField("addObjectId")
    private Integer addObjectId;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getIsPlatCar() {
        return isPlatCar;
    }

    public void setIsPlatCar(Integer isPlatCar) {
        this.isPlatCar = isPlatCar;
    }

    public Integer getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Integer companyId) {
        this.companyId = companyId;
    }

    public Integer getFranchiseeId() {
        return franchiseeId;
    }

    public void setFranchiseeId(Integer franchiseeId) {
        this.franchiseeId = franchiseeId;
    }

    public String getCarColor() {
        return carColor;
    }

    public void setCarColor(String carColor) {
        this.carColor = carColor;
    }

    public Integer getCarModelId() {
        return carModelId;
    }

    public void setCarModelId(Integer carModelId) {
        this.carModelId = carModelId;
    }

    public Integer getCarBrandId() {
        return carBrandId;
    }

    public void setCarBrandId(Integer carBrandId) {
        this.carBrandId = carBrandId;
    }

    public String getCarLicensePlate() {
        return carLicensePlate;
    }

    public void setCarLicensePlate(String carLicensePlate) {
        this.carLicensePlate = carLicensePlate;
    }

    public String getCarPhoto() {
        return carPhoto;
    }

    public void setCarPhoto(String carPhoto) {
        this.carPhoto = carPhoto;
    }

    public String getDrivingLicenseNumber() {
        return drivingLicenseNumber;
    }

    public void setDrivingLicenseNumber(String drivingLicenseNumber) {
        this.drivingLicenseNumber = drivingLicenseNumber;
    }

    public String getDrivingLicensePhoto() {
        return drivingLicensePhoto;
    }

    public void setDrivingLicensePhoto(String drivingLicensePhoto) {
        this.drivingLicensePhoto = drivingLicensePhoto;
    }

    public Date getAnnualInspectionTime() {
        return annualInspectionTime;
    }

    public void setAnnualInspectionTime(Date annualInspectionTime) {
        this.annualInspectionTime = annualInspectionTime;
    }

    public String getInsurancePhoto() {
        return insurancePhoto;
    }

    public void setInsurancePhoto(String insurancePhoto) {
        this.insurancePhoto = insurancePhoto;
    }

    public Date getCommercialInsuranceTime() {
        return commercialInsuranceTime;
    }

    public void setCommercialInsuranceTime(Date commercialInsuranceTime) {
        this.commercialInsuranceTime = commercialInsuranceTime;
    }

    public Date getInsertTime() {
        return insertTime;
    }

    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }

    public Integer getState() {
        return state;
    }

    public void setState(Integer state) {
        this.state = state;
    }

    public Integer getAddType() {
        return addType;
    }

    public void setAddType(Integer addType) {
        this.addType = addType;
    }

    public Integer getAddObjectId() {
        return addObjectId;
    }

    public void setAddObjectId(Integer addObjectId) {
        this.addObjectId = addObjectId;
    }

    @Override
    public String toString() {
        return "Car{" +
                "id=" + id +
                ", isPlatCar=" + isPlatCar +
                ", companyId=" + companyId +
                ", carColor='" + carColor + '\'' +
                ", carModelId=" + carModelId +
                ", carBrandId=" + carBrandId +
                ", carLicensePlate='" + carLicensePlate + '\'' +
                ", carPhoto='" + carPhoto + '\'' +
                ", drivingLicenseNumber='" + drivingLicenseNumber + '\'' +
                ", drivingLicensePhoto='" + drivingLicensePhoto + '\'' +
                ", annualInspectionTime=" + annualInspectionTime +
                ", commercialInsuranceTime=" + commercialInsuranceTime +
                ", insertTime=" + insertTime +
                ", state=" + state +
                ", addType=" + addType +
                ", addObjectId=" + addObjectId +
                '}';
    }
}

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Line.java

@@ -21,6 +21,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    private Integer sortBy;
    /**
     * 线路名称
     */

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -486,7 +486,8 @@
            System.err.println("预支付数据异常（orderId = "  + id + ")");
        }
    }

    @Resource
    private DriverWorkMapper driverWorkMapper;

    /**
     * 跨城下单操作
@@ -539,6 +540,13 @@
        if(driver.getState() == 1){
            return ResultUtil.error("司机处于离线状态");
        }
        DriverWork driverWork = driverWorkMapper.queryNewWork(driver.getId(), null, 1);
        if (!driverWork.getType().contains("3")){
            return ResultUtil.error("司机暂未开通跨城服务");
        }



        OrderCrossCity orderCrossCity = new OrderCrossCity();
        orderCrossCity.setUserId(uid);
        orderCrossCity.setServerCarModelId(orderCrossCityWarpper.getServerCarModelId());
@@ -933,7 +941,7 @@
                String[] split = seatNumber.split(",");
                boolean b = false;
                for(String s : split){
                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))){
                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("7"))){
                        b = true;
                        break;
                    }
@@ -1265,7 +1273,7 @@
                userInfo.setBalance(userInfo.getBalance() + orderCrossCity.getPayMoney());
                userInfoService.updateById(userInfo);
                //添加交易明细
                transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车订单取消退款", orderCrossCity.getPayMoney(), 1, 1, 1, 3, id);
                transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney(), 1, 1, 1, 3, id);
            }else{
                PaymentRecord query = paymentRecordService.query(1, orderCrossCity.getUserId(), 1, id, 3, orderCrossCity.getPayType(), 2);
                if(null == query){
@@ -1281,14 +1289,14 @@
                        return ResultUtil.error(map.get("return_msg"));
                    }
                    //添加交易明细
                    transactionDetailsService.saveData(query.getUserId(), "直通车订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
                    transactionDetailsService.saveData(query.getUserId(), "跨城订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
                }else{//支付宝
                    Map<String, String> map = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
                    if(!"10000".equals(map.get("code"))){
                        return ResultUtil.error(map.get("msg"));
                    }
                    //添加交易明细
                    transactionDetailsService.saveData(query.getUserId(), "直通车订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
                    transactionDetailsService.saveData(query.getUserId(), "跨城订单取消退款", query.getAmount(), 1, 1, query.getType(), 3, id);
                }



 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverWorkMapper.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.DriverWork;
import org.apache.ibatis.annotations.Param;

public interface DriverWorkMapper extends BaseMapper<DriverWork> {
    DriverWork queryNewWork(@Param("driverId") Integer driverId, @Param("type") Integer type,
                            @Param("state") Integer state);
}

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

@@ -243,7 +243,8 @@
        </if>
        and id in
        (
        select driverId from t_driver_work where startTime &lt; now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
        select driverId from t_driver_work
        where startTime &lt; now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
        )
        and id in (select driverId from t_driver_orders where `type` = #{type})
        and carId in (select carId from t_car_service where `type` = #{type}
@@ -315,13 +316,15 @@
        (
        (select count(id) from t_order_private_car where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
        (select count(id) from t_order_taxi where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
        (select count(id) from t_order_cross_city where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id)
        ) = 0, 2, 3)) as state,
        (select count(id) from t_order_cross_city where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
        (select count(id) from t_order_transfer where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id)
            ) = 0, 2, 3)) as state,
        (
        (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
        (select count(id) from t_order_taxi where state in (7, 8, 9) and driverId = a.id) +
        (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id)
        ) as orderNum,
        (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id) +
         (select count(id) from t_order_transfer where state in (7, 8, 9) and driverId = a.id)
                ) as orderNum,
        ((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(id) from t_order_evaluate where driverId = a.id)) as fraction
        from t_driver a
        left join t_car b on (a.carId = b.id)

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

@@ -11,4 +11,24 @@
        <result column="type" property="type" />
        <result column="state" property="state" />
    </resultMap>
    <select id="queryNewWork" resultType="com.stylefeng.guns.modular.system.model.DriverWork">
        select
        id as id,
        driverId as driverId,
        startTime as startTime,
        endTime as endTime,
        `type` as `type`,
        state as state
        from t_driver_work where 1 = 1
        <if test="null != driverId">
            and driverId = #{driverId}
        </if>
        <if test="null != type">
            and type like CONCAT('%', #{type}, '%')
        </if>
        <if test="null != state">
            and state = #{state}
        </if>
        order by startTime desc limit 0,1
    </select>
</mapper>

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

@@ -55,7 +55,7 @@
        select
        (money * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '直通车', if(orderType = 4, '同城小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '跨城', if(orderType = 4, '同城小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cancel where state = 2 and userType = 1 and money is not null and userId = #{uid}
        <choose>

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

@@ -55,7 +55,9 @@
        a.couponType as `type`,
        a.fullMoney as fullMoney,
        a.state as state,
        b.`name` as `name`
        b.`name` as `name`,
        a.activityType as activityType,
        a.couponId as couponId
        from t_user_coupon_record a
        left join t_company b on (a.companyId = b.id)
        where a.expirationTime >= now()

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

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

import java.io.Serializable;
import java.util.Date;
@@ -19,12 +20,14 @@
 * @since 2020-06-09
 */
@TableName("t_activity_generalization")
@Data
public class TActivityGeneralization extends Model<TActivityGeneralization> {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Integer effective;

    @ApiModelProperty(value = "活动名称")
    @TableField(value = "activityName")
@@ -61,6 +64,7 @@
    @ApiModelProperty(value = "是否删除  1=否 2=是")
    @TableField(value = "isDelete")
    private Integer isDelete;
    private Integer state;

    public Integer getId() {
        return id;

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

@@ -37,6 +37,7 @@
     * @return
     */
    ResultUtil<LoginWarpper> captchaLogin(String phone, String code, String registIp, String registAreaCode,String loginType) throws Exception;
    ResultUtil<LoginWarpper> captchaLogin1(String phone) throws Exception;

    /**
     * 手机一键登录

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

@@ -1,6 +1,9 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.system.dao.DriverMapper;
import com.stylefeng.guns.modular.system.dao.DriverServiceMapper;
import com.stylefeng.guns.modular.system.model.Company;
@@ -69,6 +72,8 @@
        return list;
    }

    @Autowired
    private IOrderCrossCityService crossCityService;

    /**
     * 获取给定车型且空闲的司机
@@ -89,6 +94,11 @@

        List<Driver> list = new ArrayList<>();
        for(Driver driver : drivers){
            List<OrderCrossCity> orderCrossCities = crossCityService.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 2).eq("driverId", driver.getId()));
            if (orderCrossCities!=null&& !orderCrossCities.isEmpty()){
                continue;
            }

            String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
            if(null != value){
//                Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, value, 0);//计算距离
@@ -153,7 +163,10 @@
                    baseWarpper.setName("出租车");
                    break;
                case 3:
                    baseWarpper.setName("直通车");
                    baseWarpper.setName("跨城");
                    break;
                case 7:
                    baseWarpper.setName("接送机");
                    break;
            }
            maps.add(baseWarpper);

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

@@ -49,7 +49,7 @@
                    baseWarpper.setId(2);
                    break;
                case 3:
                    baseWarpper.setName("城际拼车");
                    baseWarpper.setName("定制班线");
                    baseWarpper.setId(3);
                    break;
                case 4:
@@ -97,7 +97,7 @@
                    baseWarpper.setId(2);
                    break;
                case 3:
                    baseWarpper.setName("直通车");
                    baseWarpper.setName("跨城");
                    baseWarpper.setId(3);
                    break;
                case 4:

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

@@ -15,6 +15,9 @@
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.transfer.dao.OrderTransferMapper;
import com.stylefeng.guns.modular.transfer.model.OrderTransferCar;
import com.stylefeng.guns.modular.transfer.server.IOrderTransferService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -45,6 +48,8 @@
    @Autowired
    private IOrderCrossCityService orderCrossCityService;

    @Autowired
    private IOrderTransferService orderTransferService;



@@ -87,6 +92,11 @@
                driverId = orderCrossCity.getDriverId();
                uid = orderCrossCity.getUserId();
                break;
            case 7:
                OrderTransferCar orderTransferCar = orderTransferService.selectById(orderId);
                driverId = orderTransferCar.getDriverId();
                uid = orderTransferCar.getUserId();
                break;
        }

        orderEvaluate.setOrderId(orderId);

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

@@ -223,7 +223,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/a9fb2816e36644b292515ffdd6ebb411.jpg");
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");

            //用户所属企业
            if(null != registAreaCode){
@@ -269,6 +269,69 @@
        return ResultUtil.success(loginWarpper);
    }


    @Override
    public ResultUtil<LoginWarpper> captchaLogin1(String phone) throws Exception {
        Integer frequency = loginFailures.get(phone);
        Long time = loginTime.get(phone);
        if(null != time && System.currentTimeMillis() < (time + 300000) && null != frequency && frequency >= 5){
            return ResultUtil.error("暂时无法登录，请5分钟后重试！");
        }
        if(null != time && System.currentTimeMillis() >= (time + 300000)){
            frequency = 0;
            loginFailures.put(phone, frequency);
        }

        UserInfo userInfo = userInfoMapper.queryByPhone(phone);
        if(null == userInfo){
            userInfo = new UserInfo();
            userInfo.setPhone(phone);
            userInfo.setPassWord(ShiroKit.md5("", salt));
            userInfo.setNickName(this.getDefaultName());
            userInfo.setIsAuth(1);
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");


            this.insert(userInfo);

            addnewCoupoun(phone,userInfo);


            this.addCoupon(userInfo);//添加优惠券

            UserInfo finalUserInfo = userInfo;
            new Thread(new Runnable() {
                @Override
                public void run() {
                    if(pushMinistryOfTransport){
                        //上传数据
                        pushMinistryOfTransportUtil.baseInfoPassenger(finalUserInfo.getId());
                    }
                }
            }).start();

        }
        if(userInfo.getState() == 2){
            return ResultUtil.error("账号被冻结");
        }

        //调用单点登录的逻辑
        this.singlePointLogin(userInfo.getId(),"Applets");

        String token = this.getToken(userInfo, "","Applets");
        LoginWarpper loginWarpper = new LoginWarpper();
        loginWarpper.setId(userInfo.getId());
        loginWarpper.setToken(token);
        loginWarpper.setAppid(UUIDUtil.getRandomCode());
        loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
        loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());

        return ResultUtil.success(loginWarpper);
    }

    @Autowired
    private ITActivityGeneralizationService activityGeneralizationService;

@@ -280,34 +343,40 @@
        if (redisUtil.getValue("counpon:" + phone)==null){
            return;
        }
        Integer acId = Integer.valueOf(redisUtil.getValue("counpon:" + phone));
        String acIds = redisUtil.getValue("counpon:" + phone);

        String[] split = acIds.split(",");
        for (String acId : split) {

        TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
        if (tActivityGeneralization==null){
            continue;
        }
        SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(tActivityGeneralization.getCouponId());
        Date date = new Date();
        UserCouponRecord userCouponRecord = new UserCouponRecord();
        userCouponRecord.setActivityType(5);
        userCouponRecord.setCouponActivityId(acId);
        userCouponRecord.setCouponActivityId(Integer.valueOf(acId));
        userCouponRecord.setCouponId(tActivityGeneralization.getCouponId());
        userCouponRecord.setState(1);
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + sysCouponRecord.getEffective());
        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + tActivityGeneralization.getEffective());
        userCouponRecord.setExpirationTime(calendar.getTime());
        userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(sysCouponRecord.getCouponType())));
        userCouponRecord.setCouponUseType(sysCouponRecord.getCouponUseType());
        userCouponRecord.setInsertTime(date);
        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.setCompanyId(sysCouponRecord.getCompanyId());
        userCouponRecord.setUserId(userInfo.getId());

        Integer userGrantCount = tActivityGeneralization.getUserGrantCount();
//            userCouponRecordService.insert(userCouponRecord);
        if (userGrantCount != null && userGrantCount > 0) {
            for (int i = 0; i < userGrantCount; i++) {// ...
                userCouponRecordService.insert(userCouponRecord);
            }
        }
        }

    }
@@ -341,7 +410,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/a9fb2816e36644b292515ffdd6ebb411.jpg");
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");

            //用户所属企业
            if(null != registAreaCode){
@@ -1211,7 +1280,7 @@
     */
    public String getDefaultName(){
        int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
        return "WL" + String.valueOf(num).substring(1);
        return "HQ" + String.valueOf(num).substring(1);
    }


@@ -1266,7 +1335,7 @@
                    userCouponRecord.setUserId(userInfo.getId());
                    userCouponRecord.setCompanyId(Integer.valueOf(String.valueOf(map.get("companyId"))));
                    userCouponRecord.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
                    userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney"))));
                    userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(map.get("fullMoney")==null?"0":map.get("fullMoney"))));
                    userCouponRecord.setInsertTime(new Date());
                    userCouponRecord.setState(1);
                    userCouponRecord.setCouponUseType(Integer.valueOf(String.valueOf(map.get("couponUseType"))));

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

@@ -3,6 +3,7 @@
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.ObjectMetadata;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
@@ -20,7 +21,6 @@
    public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);

    public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException{
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        String fileName = "";
        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
            InputStream content = file.getInputStream();//获得指定文件的输入流

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

@@ -2,20 +2,26 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.api.UserInfoController;
import com.stylefeng.guns.modular.system.util.HttpClientUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.entity.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -124,7 +130,7 @@
     * @return
     */
    public String getAccessToken(){
        String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxc89ecab90d24edd8&secret=bca863174d22736a4a9758a67484947e";
        String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxe91f1af7638aa5dd&secret=a787e1a462715604e0c9528b6d8960d1";
        String backData = restTemplate.getForObject(url, String.class);
        String accessToken = JSONObject.parseObject(backData).getString("access_token");
        return accessToken;
@@ -138,7 +144,7 @@
        param.put("expire_interval", 1);
        param.put("path", path);
        param.put("query", query);
        param.put("env_version", "release");
        param.put("env_version", "trial");
        HttpHeaders httpHeaders = new HttpHeaders();
        MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
        httpHeaders.setContentType(type);
@@ -148,4 +154,56 @@
        return body1;
    }

    public String getPhone(String code) throws Exception{
        String wxAppletsAccessToken = getAccessToken();
        String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + wxAppletsAccessToken;
        Map<String, Object> param = new HashMap<>();
        param.put("code",code);
        HttpHeaders httpHeaders = new HttpHeaders();
        MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
        httpHeaders.setContentType(type);
        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
        ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
        String body1 = exchange.getBody();
//        String body1 ="{\"errcode\":0,\"errmsg\":\"ok\",\"phone_info\":{\"phoneNumber\":\"15708179461\",\"purePhoneNumber\":\"15708179461\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1720420413,\"appid\":\"wxc89ecab90d24edd8\"}}}";

        JSONObject jsonObject = JSON.parseObject(body1);
        // 从JSON对象中获取phone_info子对象
        JSONObject phoneInfo = jsonObject.getJSONObject("phone_info");
        // 从phone_info中获取phoneNumber
        String phoneNumber = phoneInfo.getString("phoneNumber");
        System.out.println("Phone Number: " + phoneNumber);


        return phoneNumber;
    }

    
    @Autowired
    private UserInfoController userInfoController;
    public String rid(String path, String query) throws Exception{
        // 获取access_token
        String accessToken = getAccessToken();
        // 替换CREATE_CODE_URL
        String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token="+accessToken;
        // 发送请求
        String stringApiResult = null;
        try {
            HashMap<String, String> map = new HashMap<>();
            map.put("path", path+"?driverId=979");
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity requestEntity = new HttpEntity(map, headers);
            ResponseEntity<byte[]> rep = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class);
            byte[] bytes = rep.getBody();
            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
            MultipartFile file = new MockMultipartFile(ContentType.APPLICATION_OCTET_STREAM.toString(), byteArrayInputStream);
            ResultUtil resultUtil = userInfoController.uploadImg(file, null, null);
            StringBuilder sb = new StringBuilder(stringApiResult);
            stringApiResult = sb.toString();
        } catch (Exception e) {
        }
        return stringApiResult;
    }

}

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java

@@ -169,7 +169,7 @@
            userInfoWarpper.setNickName(null != map.get("nickName") ? String.valueOf(map.get("nickName")) : "");
            userInfoWarpper.setPhone(null != map.get("phone") ? String.valueOf(map.get("phone")) : "");
            userInfoWarpper.setIsAuth(null != map.get("isAuth") ? Integer.valueOf(String.valueOf(map.get("isAuth"))) : null);
            userInfoWarpper.setAvatar(null != map.get("avatar") ? String.valueOf(map.get("avatar")) : "");
            userInfoWarpper.setAvatar(null != map.get("avatar") ? String.valueOf(map.get("avatar")) : "http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfoWarpper.setSex(null != map.get("sex") ? Integer.valueOf(String.valueOf(map.get("sex"))) : null);
            userInfoWarpper.setBirthday(null != map.get("birthday") ? String.valueOf(map.get("birthday")) : "");
            userInfoWarpper.setIntegral(null != map.get("integral") ? Integer.valueOf(String.valueOf(map.get("integral"))) : 0);

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

@@ -74,7 +74,7 @@
            @ApiImplicitParam(value = "出行时间（2020-08-20 10:10）", name = "travelTime", required = true, dataType = "string"),
            @ApiImplicitParam(value = "是否预约（1=否，2=是）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "是否代下单（0=否，1=是）", name = "substitute", required = true, dataType = "int"),
            @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
                @ApiImplicitParam(value = "下单地点经度", name = "placementLon", required = true, dataType = "string"),
            @ApiImplicitParam(value = "下单地点纬度", name = "placementLat", required = true, dataType = "string"),
            @ApiImplicitParam(value = "起点经度", name = "startLon", required = true, dataType = "string"),
            @ApiImplicitParam(value = "起点纬度", name = "startLat", required = true, dataType = "string"),
@@ -176,9 +176,9 @@
    })
    public ResultUtil site(double latitude, double longitude,String code) throws Exception {
        //获取当前城市名称
        String cityName = AmapGeocoding.getCityName(latitude, longitude);
//        String cityName = AmapGeocoding.getCityName(latitude, longitude);

        Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().eq("cityName", cityName).ne("flag", 3);
        Wrapper<OpenCity> ne = new EntityWrapper<OpenCity>().ne("flag", 3);
        if (!StringUtils.isEmpty(code)){
            ne.eq("code",code);
        }
@@ -198,7 +198,7 @@

        for (TOpenCitySite tOpenCitySite : tOpenCitySites) {

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

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml

@@ -340,7 +340,7 @@
        startAddress as startAddress,
        endAddress as endAddress,
        driverId as driverId,
        (1) as orderType,
        (7) as orderType,
        state as state,
        oldState as oldState
        from t_order_transfer where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
@@ -425,7 +425,7 @@
        (select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9))
        ) as orderNum,
        b.phone as driverPhone,
        if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
        if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 7 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 7 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
        if(a.state = 12, (select id from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), 0) as cancelId,
        g.fraction as orderScore,
        g.content as evaluate,
@@ -439,8 +439,8 @@
        left join t_car c on (a.carId = c.id)
        left join t_car_model d on (c.carModelId = d.id)
        left join t_car_brand f on (d.brandId = f.id)
        left join t_order_evaluate g on (a.id = g.orderId and g.orderType = 1)
        left join t_order_cancel h on (a.id = h.orderId and h.orderType = 1 and h.state = 2)
        left join t_order_evaluate g on (a.id = g.orderId and g.orderType = 7)
        left join t_order_cancel h on (a.id = h.orderId and h.orderType = 7 and h.state = 2)
        where a.id = #{orderId}
    </select>


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

@@ -261,7 +261,7 @@
        }

        OrderTransferCar orderPrivateCar = new OrderTransferCar();
        orderPrivateCar.setType(type);
        orderPrivateCar.setType(1);
        orderPrivateCar.setUserId(uid);
        orderPrivateCar.setServerCarModelId(serverCarModelId);
        orderPrivateCar.setOrderNum(this.getOrderNum());
@@ -321,7 +321,7 @@
                    driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
            orderPrivateCar.setState(2);
            orderPrivateCar.setCarId(driver.getCarId());
            CarService query1 = carServiceMapper.query(1, driver.getCarId());
            CarService query1 = carServiceMapper.query(7, driver.getCarId());
            orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
            orderPrivateCar.setSnatchOrderTime(new Date());

@@ -367,7 +367,7 @@
        System.err.println("===="+orderPrivateCar.getState());

        //添加消息
        systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
        systemNoticeService.addSystemNotice(1, "您的接送机订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);

        BaseWarpper baseWarpper = new BaseWarpper();
        baseWarpper.setId(orderPrivateCar.getId());
@@ -559,9 +559,9 @@
            return ResultUtil.error("获取数据失败，订单信息有误");
        }
        double amount = 0;
        CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 7, orderPrivateCar.getCompanyId());
        CancleOrder query = cancleOrderService.query(orderPrivateCar.getType(), 7, orderPrivateCar.getCompanyId());
        if(null != orderPrivateCar.getDriverId() &&
                (orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
                (orderPrivateCar.getSnatchOrderTime().getTime()-8L * 60 * 60 * 1000 + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
            if(null != query){
                amount += query.getMoney();
            }
@@ -595,9 +595,23 @@
                orderPrivateCar.setState(10);
                this.updateById(orderPrivateCar);
        }else {
            CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 7, orderPrivateCar.getCompanyId());
            CancleOrder query = cancleOrderService.query(1, 7, orderPrivateCar.getCompanyId());
            if (null != query) {
                if ((orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < System.currentTimeMillis() && query.getMoney().compareTo(0D) > 0) {//收费的情况

                long snatchTimeMs = orderPrivateCar.getSnatchOrderTime().getTime() - 8 * 60 * 60 * 1000;
                long futureTimeMs = snatchTimeMs + query.getMinuteNum() * 60 * 1000;
                long currentTimeMs = System.currentTimeMillis();

                if (futureTimeMs < currentTimeMs){
                    System.out.printf("1111111111");
                }
                if (query.getMoney().compareTo(0D) > 0){
                    System.out.printf("22222222222");
                }



                if ((orderPrivateCar.getSnatchOrderTime().getTime() - 8 * 60 * 60 * 1000 + query.getMinuteNum() * 60 * 1000) < System.currentTimeMillis() && query.getMoney().compareTo(0D) > 0) {//收费的情况
                    orderPrivateCar.setState(12);
                    this.updateById(orderPrivateCar);
                    integer = orderCancelService.saveData(id, 7, reason, remark, null, query.getMoney(), 1, 1, uid);
@@ -671,7 +685,7 @@
            orderCancel = orderCancelService.selectById(cancleId);
        }

        CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 7, orderPrivateCar.getCompanyId());
        CancleOrder query = cancleOrderService.query(orderPrivateCar.getType(), 7, orderPrivateCar.getCompanyId());
        if(null != query){
            if(payType == 1){//微信支付

@@ -815,7 +829,7 @@
                        if(state > 1){
                            break;
                        }
                        if(i == querys.size() && state == 1){
                        if(i == 3 && state == 1){
                            pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 7);
                            orderIds.remove(orderPrivateCar.getId());
                        }
@@ -861,7 +875,7 @@
        UserInfo userInfo = userInfoService.selectById(uid);
        map.put("balance", userInfo.getBalance());
        OrderTransferCar orderPrivateCar = this.selectById(orderId);
        int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney());
        int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 7, orderPrivateCar.getOrderMoney());
        i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney());
        map.put("coupon", i);
        return map;
@@ -905,7 +919,7 @@
            if(userCouponRecord.getState() == 3){
                return ResultUtil.error("优惠券已过期");
            }
            if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
            if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 7){
                return ResultUtil.error("优惠券不能用于此类型订单");
            }
            if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){

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

@@ -54,13 +54,13 @@
  base-package: com.stylefeng.guns.modular


#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://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: Xiwang2024!
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat


#spring:
@@ -73,13 +73,14 @@



spring:
  datasource:
    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 #用来搜集数据库的所有表
    filters: wall,mergeStat
#spring:
#  datasource:
##    url: jdbc:mysql://192.168.110.34:3306/nttravel?useSSL=false&serverTimezone=GMT&useUnicode=true&amp&characterEncoding=utf-8&amp&serverTimezone=UTC&amp
#    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:
@@ -108,8 +109,8 @@
  grantType: authorization_code #填authorization_code
  appid: wxc89ecab90d24edd8 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: bca863174d22736a4a9758a67484947e #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxc89ecab90d24edd8 #小程序APPid
  appletsAppSecret: bca863174d22736a4a9758a67484947e #
  appletsAppid: wxe91f1af7638aa5dd #小程序APPid
  appletsAppSecret: a787e1a462715604e0c9528b6d8960d1 #
  mchId: 1677823911 #微信支付分配的商户号
  key: CnqmrOgKqOiEyytQtoyxuaRgRGjcWFnD #key为商户平台设置的密钥key：


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

@@ -2,12 +2,12 @@
# RedisÊý¾Ý¿âË÷Òý£¨Ä¬ÈÏΪ0£©
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=127.0.0.1
spring.redis.host=1.95.6.206
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=6379
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
#spring.redis.password=WeiLaiChuXing@2024!
spring.redis.password=123456
spring.redis.password=Xiwang2024!
#spring.redis.password=123456
#spring.redis.password=
# Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©
spring.redis.jedis.pool.max-active=1024

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

@@ -54,13 +54,13 @@
  base-package: com.stylefeng.guns.modular


#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://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: Xiwang2024!
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat


#spring:
@@ -73,13 +73,14 @@



spring:
  datasource:
    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 #用来搜集数据库的所有表
    filters: wall,mergeStat
#spring:
#  datasource:
##    url: jdbc:mysql://192.168.110.34:3306/nttravel?useSSL=false&serverTimezone=GMT&useUnicode=true&amp&characterEncoding=utf-8&amp&serverTimezone=UTC&amp
#    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:
@@ -108,8 +109,8 @@
  grantType: authorization_code #填authorization_code
  appid: wxc89ecab90d24edd8 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: bca863174d22736a4a9758a67484947e #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxc89ecab90d24edd8 #小程序APPid
  appletsAppSecret: bca863174d22736a4a9758a67484947e #
  appletsAppid: wxe91f1af7638aa5dd #小程序APPid
  appletsAppSecret: a787e1a462715604e0c9528b6d8960d1 #
  mchId: 1677823911 #微信支付分配的商户号
  key: CnqmrOgKqOiEyytQtoyxuaRgRGjcWFnD #key为商户平台设置的密钥key：


 UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml

@@ -378,7 +378,7 @@
        select
        (payMoney * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        ('直通车订单') as name,
        ('跨城订单') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cross_city where payMoney != 0 and userId = #{uid} and state in (2, 3, 4, 5, 6, 8, 9, 10, 11, 12)
    </select>
@@ -392,7 +392,7 @@
        startAddress as startAddress,
        endAddress as endAddress,
        payMoney as payMoney,
        ('直通车订单') as orderName,
        ('跨城订单') as orderName,
        if(invoiceId is null, 1, 2) as invoice,
        unix_timestamp(insertTime) as insertTime,
        (3) as orderType
@@ -421,7 +421,7 @@
        select
        redPacketMoney as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        ('直通车订单') as name,
        ('跨城订单') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cross_city where userId = #{uid} and state in (8, 9) and redPacketId is not null
    </select>

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

@@ -243,7 +243,8 @@
        </if>
        and id in
        (
        select driverId from t_driver_work where startTime &lt; now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
        select driverId from t_driver_work
        where startTime &lt; now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
        )
        and id in (select driverId from t_driver_orders where `type` = #{type})
        and carId in (select carId from t_car_service where `type` = #{type}
@@ -315,13 +316,15 @@
        (
        (select count(id) from t_order_private_car where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
        (select count(id) from t_order_taxi where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
        (select count(id) from t_order_cross_city where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id)
        ) = 0, 2, 3)) as state,
        (select count(id) from t_order_cross_city where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
        (select count(id) from t_order_transfer where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id)
            ) = 0, 2, 3)) as state,
        (
        (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
        (select count(id) from t_order_taxi where state in (7, 8, 9) and driverId = a.id) +
        (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id)
        ) as orderNum,
        (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id) +
         (select count(id) from t_order_transfer where state in (7, 8, 9) and driverId = a.id)
                ) as orderNum,
        ((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(id) from t_order_evaluate where driverId = a.id)) as fraction
        from t_driver a
        left join t_car b on (a.carId = b.id)

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

@@ -11,4 +11,24 @@
        <result column="type" property="type" />
        <result column="state" property="state" />
    </resultMap>
    <select id="queryNewWork" resultType="com.stylefeng.guns.modular.system.model.DriverWork">
        select
        id as id,
        driverId as driverId,
        startTime as startTime,
        endTime as endTime,
        `type` as `type`,
        state as state
        from t_driver_work where 1 = 1
        <if test="null != driverId">
            and driverId = #{driverId}
        </if>
        <if test="null != type">
            and type like CONCAT('%', #{type}, '%')
        </if>
        <if test="null != state">
            and state = #{state}
        </if>
        order by startTime desc limit 0,1
    </select>
</mapper>

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

@@ -55,7 +55,7 @@
        select
        (money * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '直通车', if(orderType = 4, '同城小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        CONCAT(if(orderType = 1, '专车', if(orderType = 2, '出租车', if(orderType = 3, '跨城', if(orderType = 4, '同城小件物流', if(orderType = 5, '跨城小件物流', '包车'))))), '订单取消') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_cancel where state = 2 and userType = 1 and money is not null and userId = #{uid}
        <choose>

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

@@ -55,7 +55,9 @@
        a.couponType as `type`,
        a.fullMoney as fullMoney,
        a.state as state,
        b.`name` as `name`
        b.`name` as `name`,
        a.activityType as activityType,
        a.couponId as couponId
        from t_user_coupon_record a
        left join t_company b on (a.companyId = b.id)
        where a.expirationTime >= now()

 UserNTTravel/guns-admin/target/classes/com/stylefeng/guns/modular/transfer/dao/mapping/OrderTransferMapper.xml

@@ -340,7 +340,7 @@
        startAddress as startAddress,
        endAddress as endAddress,
        driverId as driverId,
        (1) as orderType,
        (7) as orderType,
        state as state,
        oldState as oldState
        from t_order_transfer where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
@@ -425,7 +425,7 @@
        (select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9))
        ) as orderNum,
        b.phone as driverPhone,
        if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 1 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
        if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 7 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 7 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
        if(a.state = 12, (select id from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), 0) as cancelId,
        g.fraction as orderScore,
        g.content as evaluate,
@@ -439,8 +439,8 @@
        left join t_car c on (a.carId = c.id)
        left join t_car_model d on (c.carModelId = d.id)
        left join t_car_brand f on (d.brandId = f.id)
        left join t_order_evaluate g on (a.id = g.orderId and g.orderType = 1)
        left join t_order_cancel h on (a.id = h.orderId and h.orderType = 1 and h.state = 2)
        left join t_order_evaluate g on (a.id = g.orderId and g.orderType = 7)
        left join t_order_cancel h on (a.id = h.orderId and h.orderType = 7 and h.state = 2)
        where a.id = #{orderId}
    </select>


 UserNTTravel/guns-admin/target/classes/redis.properties

@@ -2,12 +2,12 @@
# Redis���ݿ�������Ĭ��Ϊ0��
spring.redis.database=0
# Redis��������ַ
spring.redis.host=127.0.0.1
spring.redis.host=1.95.6.206
# Redis���������Ӷ˿�
spring.redis.port=6379
# Redis�������������루Ĭ��Ϊ�գ�
#spring.redis.password=WeiLaiChuXing@2024!
spring.redis.password=123456
spring.redis.password=Xiwang2024!
#spring.redis.password=123456
#spring.redis.password=
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024

 UserNTTravel/guns-core/pom.xml

@@ -98,6 +98,10 @@
            <artifactId>spring-boot-configuration-processor</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
        </dependency>
    </dependencies>

    <build>

 UserNTTravel/guns-generator/pom.xml

@@ -29,6 +29,10 @@
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generate</artifactId>
        </dependency>
        <dependency>
            <groupId>com.stylefeng</groupId>
            <artifactId>guns-core</artifactId>
        </dependency>
    </dependencies>



 ZuulNTTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java

@@ -191,39 +191,72 @@


                        //确保账号在单个设备上登录
//                        String value = redisUtil.getValue("DEVICE_" + userId1);
//                        if(StringUtil.isNotEmpty(token) && StringUtil.isEmpty(device) && StringUtil.isEmpty(value)){//APP端登录的操作
//                            String token_ = redisUtil.getValue("DRIVER_" + userId1);//缓存中拿最新数据
//                            if(StringUtil.isNotEmpty(token_) && !token.equals(token_)){//不在同一设备上登录，向当前设备发送数据
//                                ChannelHandlerContext data_ = NettyChannelMap.getData_(token_.substring(0, 23));
//
//                                JSONObject msg_ = new JSONObject();
//                                msg_.put("code", 200);
//                                msg_.put("msg", "SUCCESS");
//                                msg_.put("method", "OFFLINE");
//                                msg_.put("data", new Object());
//                                this.sendMsgToClient(data_, msg_.toJSONString());//给当前通道发送消息
//                                TimerTask timerTask = new TimerTask() {
//                                    @Override
//                                    public void run() {
//                                        NettyChannelMap.remove_(data_);
//                                        NettyChannelMap.remove(data_);
//                                    }
//                                };
//                                Timer timer = new Timer();
//                                timer.schedule(timerTask, 3000);
//                                timer.cancel();
//                            }
//
//                            NettyChannelMap.update("DRIVER" + userId1, ctx);
//                            NettyChannelMap.update_(token.substring(0, 23), ctx);
//                            String s = NettyMsg.setMsg(Method.ok, new HashMap<String, Object>());
//                            ctx.writeAndFlush(Unpooled.copiedBuffer((s).getBytes()));
//
//                            if(StringUtil.isEmpty(token_)){//确保登录的时候存储token失败的情况
//                                redisUtil.setStrValue("DRIVER_" + userId1, token);
//                            }
//                        }

                        //确保账号在单个设备上登录
                        String value = redisUtil.getValue("DEVICE_" + userId1);
                        if(StringUtil.isNotEmpty(token) && StringUtil.isEmpty(device) && StringUtil.isEmpty(value)){//APP端登录的操作
                            String token_ = redisUtil.getValue("DRIVER_" + userId1);//缓存中拿最新数据
                            if(StringUtil.isNotEmpty(token_) && !token.equals(token_)){//不在同一设备上登录，向当前设备发送数据
                                ChannelHandlerContext data_ = NettyChannelMap.getData_(token_.substring(0, 23));

                                JSONObject msg_ = new JSONObject();
                                msg_.put("code", 200);
                                msg_.put("msg", "SUCCESS");
                                msg_.put("method", "OFFLINE");
                                msg_.put("data", new Object());
                                this.sendMsgToClient(data_, msg_.toJSONString());//给当前通道发送消息
                                TimerTask timerTask = new TimerTask() {
                                    @Override
                                    public void run() {
                                        NettyChannelMap.remove_(data_);
                                        NettyChannelMap.remove(data_);
                                    }
                                };
                                Timer timer = new Timer();
                                timer.schedule(timerTask, 3000);
                                timer.cancel();
                            }

                            NettyChannelMap.update("DRIVER" + userId1, ctx);
                            NettyChannelMap.update_(token.substring(0, 23), ctx);
                            String s = NettyMsg.setMsg(Method.ok, new HashMap<String, Object>());
                            ctx.writeAndFlush(Unpooled.copiedBuffer((s).getBytes()));

                            if(StringUtil.isEmpty(token_)){//确保登录的时候存储token失败的情况
                                redisUtil.setStrValue("DRIVER_" + userId1, token);
                            }
                        }
                        if(StringUtil.isNotEmpty(token) && StringUtil.isEmpty(value)){//APP端登录的操作
                            String token_ = redisUtil.getValue("DRIVER_" + userId1);//缓存中拿最新数据
                            if(StringUtil.isNotEmpty(token_) && !token.equals(token_)){//不在同一设备上登录，向当前设备发送数据
                                JSONObject msg_ = new JSONObject();
                                msg_.put("code", 200);
                                msg_.put("msg", "SUCCESS");
                                msg_.put("method", "OFFLINE");
                                msg_.put("data", new Object());
                                this.sendMsgToClient(ctx, msg_.toJSONString());//给当前通道发送消息
                                TimerTask timerTask = new TimerTask() {
                                    @Override
                                    public void run() {
                                        NettyChannelMap.remove_(ctx);
                                        NettyChannelMap.remove(ctx);
                                    }
                                };
                                Timer timer = new Timer();
                                timer.schedule(timerTask, 3000);
                                timer.cancel();
                            }else{
//                                                                System.err.println("开始存储司机通道" + userId1);
                                NettyChannelMap.update("DRIVER" + userId1, ctx);
                                NettyChannelMap.update_(token.substring(0, 23), ctx);
                                String s = NettyMsg.setMsg(Method.ok, new HashMap<String, Object>());
                                ctx.writeAndFlush(Unpooled.copiedBuffer((s).getBytes()));
                            }
                            if(StringUtil.isEmpty(token_)){//确保登录的时候存储token失败的情况
                                redisUtil.setStrValue("DRIVER_" + userId1, token);
                            }
                        }


                        //存储通讯通道

 ZuulNTTravel/src/main/resources/redis.properties

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

 ZuulNTTravel/target/classes/redis.properties

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