代码调整

yanghb

2023-04-21 59f70d9b19408d36f40ee0f418bf98232c40fb33

代码调整

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

@@ -4,12 +4,17 @@
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.OrderTaxi;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.service.IDispatchService;
import com.stylefeng.guns.modular.system.service.IOrderCrossCityService;
import com.stylefeng.guns.modular.system.service.IOrderPositionService;
import com.stylefeng.guns.modular.system.service.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SystemException;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.OrderCrossCityWarpper;
import com.stylefeng.guns.modular.system.warpper.OrderInfoWarpper;
import com.stylefeng.guns.modular.system.warpper.OrderListWarpper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -19,7 +24,9 @@

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
 * 订单相关
@@ -43,18 +50,6 @@

    @Autowired
    private ICBCPayUtil icbcPayUtil;

    @Autowired
    private IOrderTaxiService orderTaxiService;

    @Autowired
    private IOpenCityService openCityService;

    @Autowired
    private IServerCarModelService serverCarModelService;

    @Autowired
    private IDriverService driverService;



@@ -104,45 +99,6 @@
    }


    @ResponseBody
    @PostMapping("/api/order/queryOrderList1")
    @ApiOperation(value = "1.0-获取订单列表", tags = {"调度端-订单管理"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "数据类型（1=专车，2=出租车，3=跨城）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "搜索条件", name = "search", required = false, dataType = "String"),
            @ApiImplicitParam(value = "订单来源（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）多个以逗号分隔", name = "orderSource", required = false, dataType = "string"),
            @ApiImplicitParam(value = "订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）多个以逗号分隔", name = "state", required = false, dataType = "string"),
            @ApiImplicitParam(value = "线路id（多个以逗号分隔）", name = "lineId", required = false, dataType = "string"),
            @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<OrderListWarpper>> queryOrderList1(Integer type, String search, String orderSource, String state, String lineId, Integer pageNum, Integer size, HttpServletRequest request){
        try {
            Integer uid = dispatchService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            List<Map<String, Object>> list = null;
            if(type == 1){//专车
                list = orderPrivateCarService.queryOrderList(search, orderSource, state, pageNum, size, uid);
            }
            if(type == 2){//出租车
                list = orderTaxiService.queryOrderList(search, orderSource, state, pageNum, size, uid);
            }
            if(type == 3){//跨城
                list = orderCrossCityService.queryOrderList(search, orderSource, state, lineId, pageNum, size, uid);
            }
            return ResultUtil.success(OrderListWarpper.getOrderListWarppers(list));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }




    /**
     * 获取订单详情
     * @param orderId
@@ -164,35 +120,6 @@
                map = orderPrivateCarService.queryOrderInfo(orderId);
            }
            if(orderType == 2){//跨城
                map = orderCrossCityService.queryOrderInfo(orderId);
            }
            return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
    @PostMapping("/api/order/queryOrderInfo1")
    @ApiOperation(value = "1.0-获取订单详情", tags = {"调度端-订单管理"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<OrderInfoWarpper> queryOrderInfo1(Integer orderId, Integer orderType){
        try {
            Map<String, Object> map = null;
            if(orderType == 1){//专车
                map = orderPrivateCarService.queryOrderInfo(orderId);
            }
            if(orderType == 2){//出租车
                map = orderTaxiService.queryOrderInfo(orderId);
            }
            if(orderType == 3){//跨城
                map = orderCrossCityService.queryOrderInfo(orderId);
            }
            return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
@@ -233,34 +160,6 @@
    }


    @ResponseBody
    @PostMapping("/api/order/cancelOrder1")
    @ApiOperation(value = "1.0-取消订单", tags = {"调度端-订单管理"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil cancelOrder1(Integer orderId, Integer orderType){
        try {
            if(orderType == 1){//专车
                return orderPrivateCarService.cancelOrder(orderId);
            }
            if(orderType == 2){//出租车
                return orderTaxiService.cancelOrder(orderId);
            }
            if(orderType == 3){//跨城
                return orderCrossCityService.cancelOrder(orderId);
            }
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }



    /**
     * 获取订单坐标轨迹数据
     * @param orderId
@@ -276,33 +175,6 @@
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<BaseWarpper>> queryOrderPosition(Integer orderId, Integer orderType){
        try {
            List<OrderPosition> orderPositions = orderPositionService.queryPosition(orderId, orderType);
            List<BaseWarpper> list = new ArrayList<>();
            for(OrderPosition orderPosition : orderPositions){
                BaseWarpper baseWarpper = new BaseWarpper();
                baseWarpper.setLon(Double.valueOf(orderPosition.getLon()));
                baseWarpper.setLat(Double.valueOf(orderPosition.getLat()));
                list.add(baseWarpper);
            }
            return ResultUtil.success(list);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
    @PostMapping("/api/order/queryOrderPosition1")
    @ApiOperation(value = "1.0-获取订单坐标", tags = {"调度端-订单管理"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<BaseWarpper>> queryOrderPosition1(Integer orderId, Integer orderType){
        try {
            List<OrderPosition> orderPositions = orderPositionService.queryPosition(orderId, orderType);
            List<BaseWarpper> list = new ArrayList<>();
@@ -382,154 +254,6 @@
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }


    @ResponseBody
    @RequestMapping(value = "/api/order/getOpenCityList", method = RequestMethod.POST)
    @ApiOperation(value = "1.0-获取开通城市列表", tags = {"调度端-添加订单"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<BaseWarpper>> getOpenCityList(){
        try {
            List<BaseWarpper> list = openCityService.queryOpenCity();
            return ResultUtil.success(list);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
    @PostMapping("/api/order/openCity")
    @ApiOperation(value = "判断当前是否是开通城市", tags = {"调度端-添加订单"}, notes = "open=1（是），open=2（否）")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "当前定位城市code", name = "code", required = true, dataType = "String"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil openCity(String code){
        try {
            boolean b = openCityService.openCity(code);
            Map<String, Object> map = new HashMap<>();
            map.put("open", b ? 1 : 2);
            return ResultUtil.success(map);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    /**
     * 获取车型和预估价格
     * @param startLonLat
     * @param endLonLat
     * @param type
     * @return
     */
    @ResponseBody
    @PostMapping("/api/order/queryServerCarModel")
    @ApiOperation(value = "1.0-选择起点终点后获取车型和预估价格(专车)", tags = {"调度端-添加订单"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "起点经纬度（103.22121,,30.26123）", name = "startLonLat", required = true, dataType = "string"),
            @ApiImplicitParam(value = "终点经纬度（103.22121,,30.26123）", name = "endLonLat", required = true, dataType = "string"),
            @ApiImplicitParam(value = "业务类型（1=专车）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type){
        try {
            return serverCarModelService.queryServerCarModel(startLonLat, endLonLat, type);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    @ResponseBody
    @PostMapping("/api/order/getServerDriverList")
    @ApiOperation(value = "1.0-获取可服务的司机列表", tags = {"调度端-添加订单"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "起点经纬度（103.22121,,30.26123）", name = "startLonLat", required = true, dataType = "string"),
            @ApiImplicitParam(value = "终点经纬度（103.22121,,30.26123）", name = "endLonLat", required = true, dataType = "string"),
            @ApiImplicitParam(value = "业务类型（1=专车，2=出租车）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "车型id", name = "carModelId", required = false, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<BaseWarpper>> getServerDriverList(String startLonLat, String endLonLat, Integer type, Integer carModelId, HttpServletRequest request){
        try {
            Integer uid = dispatchService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            List<BaseWarpper> serverDriverList = driverService.getServerDriverList(uid, startLonLat, endLonLat, type, carModelId);
            return ResultUtil.success(serverDriverList);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
    @PostMapping("/api/order/saveOrderPrivateCar")
    @ApiOperation(value = "1.0-专车下单", tags = {"调度端-添加订单"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "服务车型id", name = "serverCarModelId", required = true, dataType = "int"),
            @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 = "下单地点经度", 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"),
            @ApiImplicitParam(value = "起点地址", name = "startAddress", required = true, dataType = "string"),
            @ApiImplicitParam(value = "终点经度", name = "endLon", required = true, dataType = "string"),
            @ApiImplicitParam(value = "终点纬度", name = "endLat", required = true, dataType = "string"),
            @ApiImplicitParam(value = "终点地址", name = "endAddress", required = true, dataType = "string"),
            @ApiImplicitParam(value = "司机id", name = "driverId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "乘客姓名", name = "passengers", required = true, dataType = "string"),
            @ApiImplicitParam(value = "乘客电话", name = "passengersPhone", required = true, dataType = "string"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer orderType, String placementLon, String placementLat, String startLon, String startLat,
                                    String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer driverId, HttpServletRequest request){
        try {
            Integer uid = dispatchService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return orderPrivateCarService.saveOrderPrivateCar(uid, serverCarModelId, travelTime, orderType, placementLon, placementLat, startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, driverId);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }




    @ResponseBody
    @PostMapping("/api/order/taxiOrder")
    @ApiOperation(value = "1.0-出租车下单操作", tags = {"调度端-添加订单"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<BaseWarpper> taxiOrder(OrderTaxiWarpper orderTaxiWarpper, HttpServletRequest request){
        try {
            OrderTaxi orderTaxi = OrderTaxiWarpper.getOrderTaxi(orderTaxiWarpper);
            Integer uid = dispatchService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return orderTaxiService.taxiOrder(orderTaxi, uid);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java

@@ -1,7 +1,7 @@
package com.stylefeng.guns.modular.code.factory;


import com.stylefeng.guns.DispatchApplication;
import com.stylefeng.guns.GunsApplication;
import com.stylefeng.guns.core.CoreFlag;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.generator.action.model.GenQo;
@@ -44,7 +44,7 @@
        GenQo genQo = new GenQo();
        genQo.setProjectPath(ToolUtil.getWebRootPath(null));
        genQo.setAuthor("stylefeng");
        genQo.setProjectPackage(DispatchApplication.class.getPackage().getName());
        genQo.setProjectPackage(GunsApplication.class.getPackage().getName());
        genQo.setCorePackage(CoreFlag.class.getPackage().getName());
        genQo.setIgnoreTabelPrefix("sys_");
        genQo.setModuleName("system");

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarServiceMapper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyCityMapper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyMapper.java

File was deleted

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

@@ -62,7 +62,4 @@
     * @return
     */
    List<Driver> queryByCarId(@Param("carId") Integer carId);


    List<Driver> getServerDriverList(@Param("companyId") Integer companyId, @Param("orderType") Integer orderType);
}

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

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityBusinessMapper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityMapper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java

@@ -74,13 +74,4 @@

    List<OrderCrossCity> queryListOrder(@Param("driverId") Integer driverId, @Param("lineShiftId") Integer lineShiftId,
                                        @Param("state") List<Integer> state, @Param("day") String day);


    /**
     * 根据用户id获取数据
     * @param uid
     * @param state
     * @return
     */
    List<OrderCrossCity> queryByState(@Param("uid") Integer uid, @Param("state") Integer...state);
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java

@@ -31,17 +31,4 @@
     * @return
     */
    Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId);



    /**
     * 根据状态数据订单数据
     * @param uid
     * @param orderType
     * @param state
     * @return
     * @throws Exception
     */
    List<OrderPrivateCar> queryByState(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
                                       @Param("type") Integer type, @Param("state") Integer...state) throws Exception;
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java

@@ -11,20 +11,56 @@
public interface OrderTaxiMapper extends BaseMapper<OrderTaxi> {


    /**
     * 获取数据
     * @param start
     * @param end
     * @return
     * @throws Exception
     */
    List<OrderTaxi> query(@Param("start") Date start, @Param("end") Date end) throws Exception;


    /**
     * 获取订单列表
     * @param search
     * @param orderSource
     * @param state
     * @param companyId
     * 获取用户的订单列表
     * @param uid
     * @param pageNum
     * @param size
     * @return
     */
    List<Map<String, Object>> queryOrderList(@Param("search") String search, @Param("orderSource") List<String> orderSource,
                                             @Param("state") List<String> state, @Param("companyId") Integer companyId,
                                             @Param("pageNum") Integer pageNum, @Param("size") Integer size);
    List<Map<String, Object>> queryMyOrderList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum,
                                               @Param("size") Integer size);


    /**
     * 获取历史消费记录
     * @param uid
     * @return
     */
    List<Map<String, Object>> queryMyTravelRecord(@Param("uid") Integer uid);


    /**
     * 获取红包使用记录
     * @param uid
     * @return
     */
    List<Map<String, Object>> queryRedEnvelope(@Param("uid") Integer uid);


    /**
     * 获取用户单发票页面的订单列表
     * @param type          开票状态（1=未开票，2=已开票）
     * @param startTime     订单开始时间
     * @param endTime       订单结束时间
     * @param startMoney    订单金额范围
     * @param endMoney
     * @param uid
     * @return
     */
    List<Map<String, Object>> queryInvoiceOrder(@Param("type") Integer type, @Param("startTime") Date startTime,
                                                @Param("endTime") Date endTime, @Param("startMoney") Double startMoney,
                                                @Param("endMoney") Double endMoney, @Param("uid") Integer uid);


    /**
@@ -38,10 +74,19 @@
    /**
     * 获取订单数据
     * @param uid
     * @param state
     * @return
     */
    List<OrderTaxi> queryByState(@Param("uid") Integer uid, @Param("state") Integer... state);


    /**
     * 获取订单数据
     * @param uid
     * @param orderType     1=即时单，2=预约单
     * @param state
     * @return
     */
    List<OrderTaxi> queryByState(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
    List<OrderTaxi> queryByState_(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
                                  @Param("type") Integer type, @Param("state") Integer...state);
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ServerCarModelMapper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceMapper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarServiceMapper.xml

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyCityMapper.xml

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml

File was deleted

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

@@ -191,11 +191,4 @@
        updateUser as updateUser
        from t_driver where flag != 3 and authState = 2 and carId = #{carId}
    </select>

    <select id="getServerDriverList" resultType="Driver">
        select a.* from t_driver a
        left join t_driver_service b on (a.id = b.driverId)
        left join t_driver_work c on (a.id = c.driverId)
        where a.companyId = #{companyId} and a.authState = 2 and a.state = 2 and a.flag != 3 and b.type = #{orderType} and c.state = 1 and c.type like CONCAT('%', #{orderType}, '%') and c.endTime is null
    </select>
</mapper>

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

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityBusinessMapper.xml

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityMapper.xml

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml

@@ -604,81 +604,4 @@
            and DATE_FORMAT(a.travelTime, '%Y-%m-%d') = #{day}
        </if>
    </select>


    <select id="queryByState" resultType="OrderCrossCity">
        select
        id as id,
        userId as userId,
        serverCarModelId as serverCarModelId,
        driverId as driverId,
        lineId as lineId,
        lineShiftDriverId as lineShiftDriverId,
        carId as carId,
        orderNum as orderNum,
        placementLon as placementLon,
        placementLat as placementLat,
        placementAddress as placementAddress,
        startLon as startLon,
        startLat as startLat,
        startAddress as startAddress,
        endLon as endLon,
        endLat as endLat,
        endAddress as endAddress,
        boardingLon as boardingLon,
        boardingLat as boardingLat,
        boardingAddress as boardingAddress,
        boardingTime as boardingTime,
        getoffLon as getoffLon,
        getoffLat as getoffLat,
        getoffAddress as getoffAddress,
        getoffTime as getoffTime,
        mileage as mileage,
        payManner as payManner,
        payType as payType,
        orderMoney as orderMoney,
        redPacketMoney as redPacketMoney,
        couponMoney as couponMoney,
        redPacketId as redPacketId,
        couponId as couponId,
        discount as discount,
        discountMoney as discountMoney,
        activityId as activityId,
        companyId as companyId,
        payMoney as payMoney,
        passengers as passengers,
        passengersPhone as passengersPhone,
        peopleNumber as peopleNumber,
        seatNumber as seatNumber,
        sort as sort,
        state as state,
        insertTime as insertTime,
        travelTime as travelTime,
        snatchOrderTime as snatchOrderTime,
        setOutTime as setOutTime,
        arriveTime as arriveTime,
        startServiceTime as startServiceTime,
        endServiceTime as endServiceTime,
        travelMode as travelMode,
        orderSource as orderSource,
        isReassign as isReassign,
        reassignNotice as reassignNotice,
        invoiceId as invoiceId,
        trackId as trackId,
        isDelete as isDelete,
        oldState as oldState,
        telX as telX,
        bindId as bindId,
        remark as remark
        from t_order_cross_city where isDelete = 1
        <if test="null != uid">
            and userId = #{uid}
        </if>
        <if test="null != state">
            and state in
            <foreach collection="state" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
    </select>
</mapper>

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml

@@ -138,92 +138,4 @@
        left join t_driver g on (f.originalDriverId = g.id)
        where a.id = #{orderId}
    </select>


    <select id="queryByState" resultType="OrderPrivateCar">
        select
        id as id,
        `type` as `type`,
        userId as userId,
        serverCarModelId as serverCarModelId,
        driverId as driverId,
        carId as carId,
        orderNum as orderNum,
        placementLon as placementLon,
        placementLat as placementLat,
        placementAddress as placementAddress,
        startLon as startLon,
        startLat as startLat,
        startAddress as startAddress,
        endLon as endLon,
        endLat as endLat,
        endAddress as endAddress,
        boardingLon as boardingLon,
        boardingLat as boardingLat,
        boardingAddress as boardingAddress,
        boardingTime as boardingTime,
        getoffLon as getoffLon,
        getoffLat as getoffLat,
        getoffAddress as getoffAddress,
        getoffTime as getoffTime,
        mileage as mileage,
        payManner as payManner,
        payType as payType,
        orderMoney as orderMoney,
        startMileage as startMileage,
        startMoney as startMoney,
        mileageKilometers as mileageKilometers,
        mileageMoney as mileageMoney,
        duration as duration,
        durationMoney as durationMoney,
        wait as wait,
        waitMoney as waitMoney,
        longDistance as longDistance,
        longDistanceMoney as longDistanceMoney,
        parkMoney as parkMoney,
        roadTollMoney as roadTollMoney,
        redPacketMoney as redPacketMoney,
        couponMoney as couponMoney,
        redPacketId as redPacketId,
        couponId as couponId,
        discount as discount,
        discountMoney as discountMoney,
        activityId as activityId,
        companyId as companyId,
        payMoney as payMoney,
        substitute as substitute,
        passengers as passengers,
        passengersPhone as passengersPhone,
        state as state,
        insertTime as insertTime,
        travelTime as travelTime,
        snatchOrderTime as snatchOrderTime,
        setOutTime as setOutTime,
        arriveTime as arriveTime,
        startServiceTime as startServiceTime,
        endServiceTime as endServiceTime,
        orderType as orderType,
        orderSource as orderSource,
        invoiceId as invoiceId,
        isReassign as isReassign,
        reassignNotice as reassignNotice,
        trackId as trackId,
        isDelete as isDelete,
        oldState as oldState,
        telX as telX,
        bindId as bindId
        from t_order_private_car where isDelete = 1 and userId = #{uid}
        <if test="null != orderType">
            and orderType = #{orderType}
        </if>
        <if test="null != state">
            and state in
            <foreach collection="state" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        <if test="null != type">
            and `type` = #{type}
        </if>
    </select>
</mapper>

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml

@@ -71,38 +71,128 @@




    <select id="queryOrderList" resultType="map">
    <select id="query" resultType="OrderTaxi">
        select
        a.id as id,
        DATE_FORMAT(a.insertTime, '%Y年%m月%d日%H:%i') as orderTime,
        CONCAT(b.nickName, '-', b.phone) as `user`,
        a.startAddress as startAddress,
        a.endAddress as endAddress,
        a.state as state
        from t_order_taxi a
        left join t_user b on (a.userId = b.id)
        left join t_driver c on (a.driverId = c.id)
        left join t_car d on (a.carId = d.id)
        where a.isDelete = 1 and a.companyId = #{companyId}
        <if test="null != search and '' != search">
            and (a.passengersPhone = #{search} or c.name like CONCAT('%', #{search}, '%') or c.phone like CONCAT('%', #{search}, '%') or d.carLicensePlate like CONCAT('%', #{search}, '%'))
        id as id,
        userId as userId,
        driverId as driverId,
        carId as carId,
        orderNum as orderNum,
        placementLon as placementLon,
        placementLat as placementLat,
        placementAddress as placementAddress,
        startLon as startLon,
        startLat as startLat,
        startAddress as startAddress,
        endLon as endLon,
        endLat as endLat,
        endAddress as endAddress,
        boardingLon as boardingLon,
        boardingLat as boardingLat,
        boardingAddress as boardingAddress,
        boardingTime as boardingTime,
        getoffLon as getoffLon,
        getoffLat as getoffLat,
        getoffAddress as getoffAddress,
        getoffTime as getoffTime,
        mileage as mileage,
        payManner as payManner,
        payType as payType,
        orderMoney as orderMoney,
        travelMoney as travelMoney,
        parkMoney as parkMoney,
        roadTollMoney as roadTollMoney,
        tipMoney as tipMoney,
        redPacketMoney as redPacketMoney,
        couponMoney as couponMoney,
        redPacketId as redPacketId,
        couponId as couponId,
        discount as discount,
        discountMoney as discountMoney,
        activityId as activityId,
        companyId as companyId,
        payMoney as payMoney,
        substitute as substitute,
        passengers as passengers,
        passengersPhone as passengersPhone,
        state as state,
        insertTime as insertTime,
        travelTime as travelTime,
        snatchOrderTime as snatchOrderTime,
        setOutTime as setOutTime,
        arriveTime as arriveTime,
        startServiceTime as startServiceTime,
        endServiceTime as endServiceTime,
        orderType as orderType,
        orderSource as orderSource,
        invoiceId as invoiceId
        from t_order_taxi where insertTime between #{start} and #{end}
    </select>



    <select id="queryMyOrderList" resultType="map">
        select
        id as orderId,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
        DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        driverId as driverId,
        (2) as orderType,
        state as state,
        oldState as oldState
        from t_order_taxi where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
    </select>


    <select id="queryMyTravelRecord" resultType="map">
        select
        (payMoney * -1) as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        ('出租车订单') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_taxi where payMoney != 0 and userId = #{uid} and state in (8, 9, 10, 11, 12)
    </select>


    <select id="queryRedEnvelope" resultType="map">
        select
        redPacketMoney as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
        ('出租车订单') as name,
        UNIX_TIMESTAMP(insertTime) as insertTime
        from t_order_taxi where userId = #{uid} and state in (8, 9) and redPacketId is not null
    </select>



    <select id="queryInvoiceOrder" resultType="map">
        select
        id as id,
        DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        payMoney as payMoney,
        ('出租车订单') as orderName,
        if(invoiceId is null, 1, 2) as invoice,
        unix_timestamp(insertTime) as insertTime,
        (2) as orderType
        from t_order_taxi where state in (8, 9)
        <if test="type == 1">
            and invoiceId is null and invoiceId in (select id from t_invoice where state != 2)
        </if>
        <if test="null != orderSource">
            and a.orderSource in
            <foreach collection="orderSource" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        <if test="type == 2">
            and invoiceId in (select id from t_invoice where state = 2)
        </if>
        <if test="null != state">
            and a.state in
            <foreach collection="state" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        <if test="null != startTime and null != endTime">
            and travelTime between #{startTime} and #{endTime}
        </if>
        order by a.insertTime desc
        <if test="null != pageNum and null != size">
            limit #{pageNum}, #{size}
        <if test="null != startMoney and null != endMoney">
            and payMoney between #{startMoney} and #{endMoney}
        </if>
        <if test="null !=uid">
            and userId = #{uid}
        </if>
    </select>

@@ -110,24 +200,58 @@

    <select id="queryOrderInfo" resultType="map">
        select
        a.id as id,
        DATE_FORMAT(a.insertTime, '%Y/%m/%d/%H:%i') as orderTime,
        a.orderNum as orderNumber,
        DATE_FORMAT(a.travelTime, '%Y/%m/%d/%H:%i') as travelTime,
        CONCAT(b.nickName, '-', b.phone) as `user`,
        a.id as orderId,
        a.type as type,
        a.state as state,
        DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
        DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
        DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
        a.startLon as startLon,
        a.startLat as startLat,
        a.startAddress as startAddress,
        a.endLon as endLon,
        a.endLat as endLat,
        a.endAddress as endAddress,
        a.driverId as driverId,
        a.orderMoney as orderMoney,
        CONCAT(d.`name`, '-',d.phone) as driver,
        e.carLicensePlate as car,
        CONCAT(g.`name`, '-',g.phone) as originalDriver,
        a.state as state
        a.travelMoney as travelMoney,
        a.parkMoney as parkMoney,
        a.roadTollMoney as roadTollMoney,
        a.redPacketMoney as redPacketMoney,
        a.couponMoney as couponMoney,
        a.discountMoney as discountMoney,
        a.tipMoney as tipMoney,
        a.payMoney as payMoney,
        a.reassignNotice as reassignNotice,
        a.oldState as oldState,
        b.headImgUrl as driverAvatar,
        b.`name` as driverName,
        c.carLicensePlate as licensePlate,
        c.carColor as carColor,
        CONCAT(f.`name`, d.`name`) as brand,
        ((select sum(fraction) from t_order_evaluate where driverId = a.driverId) / (select count(id) from t_order_evaluate where driverId = a.driverId)) as score,
        (
        (select count(id) from t_order_private_car where driverId = a.driverId and state in (7, 8, 9)) +
        (select count(id) from t_order_taxi where driverId = a.driverId and state in (7, 8, 9)) +
        (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 = 2 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 = 2 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 = 2 and state = 1 order by insertTime desc limit 0, 1), 0) as cancelId,
        g.fraction as orderScore,
        g.content as evaluate,
        a.telX as telX,
        h.userType as cancelUserType,
        h.money as cancelMoney,
        h.reason as cancelReason,
        h.remark as cancelRemark
        from t_order_taxi a
        left join t_user b on (a.userId = b.id)
        left join t_driver d on (a.driverId = d.id)
        left join t_car e on (a.carId = e.id)
        left join (select * from t_reassign where orderType = 2 and orderId = #{orderId} order by insertTime desc limit 0, 1) as f on (a.id = f.orderId and f.orderType = 2)
        left join t_driver g on (f.originalDriverId = g.id)
        left join t_driver b on (a.driverId = b.id)
        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 = 2)
        left join t_order_cancel h on (a.id = h.orderId and h.orderType = 2 and h.state = 2)
        where a.id = #{orderId}
    </select>

@@ -136,6 +260,73 @@
    <select id="queryByState" resultType="OrderTaxi">
        select
        id as id,
        userId as userId,
        driverId as driverId,
        carId as carId,
        orderNum as orderNum,
        placementLon as placementLon,
        placementLat as placementLat,
        placementAddress as placementAddress,
        startLon as startLon,
        startLat as startLat,
        startAddress as startAddress,
        endLon as endLon,
        endLat as endLat,
        endAddress as endAddress,
        boardingLon as boardingLon,
        boardingLat as boardingLat,
        boardingAddress as boardingAddress,
        boardingTime as boardingTime,
        getoffLon as getoffLon,
        getoffLat as getoffLat,
        getoffAddress as getoffAddress,
        getoffTime as getoffTime,
        mileage as mileage,
        payManner as payManner,
        payType as payType,
        orderMoney as orderMoney,
        travelMoney as travelMoney,
        parkMoney as parkMoney,
        roadTollMoney as roadTollMoney,
        tipMoney as tipMoney,
        redPacketMoney as redPacketMoney,
        couponMoney as couponMoney,
        redPacketId as redPacketId,
        couponId as couponId,
        discount as discount,
        discountMoney as discountMoney,
        activityId as activityId,
        companyId as companyId,
        payMoney as payMoney,
        substitute as substitute,
        passengers as passengers,
        passengersPhone as passengersPhone,
        state as state,
        insertTime as insertTime,
        travelTime as travelTime,
        snatchOrderTime as snatchOrderTime,
        setOutTime as setOutTime,
        arriveTime as arriveTime,
        startServiceTime as startServiceTime,
        endServiceTime as endServiceTime,
        orderType as orderType,
        orderSource as orderSource,
        invoiceId as invoiceId
        from t_order_taxi where userId = #{uid}
        <if test="null != state">
            and state in
            <foreach collection="state" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
    </select>




    <select id="queryByState_" resultType="OrderTaxi">
        select
        id as id,
        `type` as `type`,
        userId as userId,
        driverId as driverId,

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java

File was deleted

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

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CompanyCity.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java

@@ -22,7 +22,7 @@
    @TableField("driverId")
    private Integer driverId;
    /**
     * 业务类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）
     * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    @TableField("type")
    private Integer type;

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCity.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java

File was deleted

 DispatchTravel/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=机场专线，7=景区直通车，8=公务出行）
     * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    @TableField("orderType")
    private Integer orderType;

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java

@@ -19,7 +19,7 @@
    @TableField("id")
    private Integer id;
    /**
     * 订单类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）
     * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    @TableField("orderType")
    private Integer orderType;

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java

@@ -20,7 +20,7 @@
    @TableField("id")
    private Integer id;
    /**
     * 订单类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出现）
     * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
     */
    @TableField("orderType")
    private Integer orderType;

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ServerCarModel.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarServiceService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyCityService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;

import java.util.List;
import java.util.Map;
@@ -67,17 +66,4 @@
     * @throws Exception
     */
    List<Driver> queryByCarId(Integer carId) throws Exception;


    /**
     * 获取调度所在公司可服务的司机列表
     * @param uid
     * @param startLonLat
     * @param endLonLat
     * @param type
     * @param carModelId
     * @return
     * @throws Exception
     */
    List<BaseWarpper> getServerDriverList(Integer uid, String startLonLat, String endLonLat, Integer type, Integer carModelId) throws Exception;
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverServiceService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverWorkService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityBusinessService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java

@@ -4,7 +4,6 @@
import com.stylefeng.guns.modular.system.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.util.ResultUtil;

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

@@ -41,27 +40,4 @@
     */
    ResultUtil cancelOrder(Integer orderId) throws Exception;


    /**
     * 添加专车订单
     * @param uid
     * @param serverCarModelId
     * @param travelTime
     * @param orderType
     * @param placementLon
     * @param placementLat
     * @param startLon
     * @param startLat
     * @param startAddress
     * @param endLon
     * @param endLat
     * @param endAddress
     * @param passengers
     * @param passengersPhone
     * @param driverId
     * @return
     * @throws Exception
     */
    ResultUtil saveOrderPrivateCar(Integer uid, Integer serverCarModelId, Date travelTime, Integer orderType, String placementLon, String placementLat, String startLon, String startLat,
                                   String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer driverId) throws Exception;
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java

@@ -2,50 +2,7 @@

import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.OrderTaxi;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;

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

public interface IOrderTaxiService extends IService<OrderTaxi> {
    /**
     * 获取订单列表
     * @param search
     * @param orderSource
     * @param state
     * @param uid
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> queryOrderList(String search, String orderSource, String state, Integer pageNum, Integer size, Integer uid) throws Exception;


    /**
     * 获取订单详情
     * @param orderId
     * @return
     * @throws Exception
     */
    Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;


    /**
     * 取消订单
     * @param orderId
     * @return
     * @throws Exception
     */
    ResultUtil cancelOrder(Integer orderId) throws Exception;



    /**
     * 出租车下单操作
     * @param orderTaxi
     * @param uid
     * @return
     * @throws Exception
     */
    ResultUtil<BaseWarpper> taxiOrder(OrderTaxi orderTaxi, Integer uid) throws Exception;
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceServiceImpl.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyServiceImpl.java

File was deleted

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

@@ -1,6 +1,5 @@
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.system.dao.CarModelMapper;
import com.stylefeng.guns.modular.system.dao.DriverMapper;
@@ -10,7 +9,6 @@
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -50,18 +48,6 @@

    @Autowired
    private IDispatchService dispatchService;

    @Autowired
    private IDriverServiceService driverServiceService;

    @Autowired
    private IDriverWorkService driverWorkService;

    @Autowired
    private ICarService carService;

    @Autowired
    private ICarServiceService carServiceService;



@@ -211,26 +197,5 @@
    @Override
    public List<Driver> queryByCarId(Integer carId) throws Exception {
        return driverMapper.queryByCarId(carId);
    }

    @Override
    public List<BaseWarpper> getServerDriverList(Integer uid, String startLonLat, String endLonLat, Integer type, Integer carModelId) throws Exception {
        Integer companyId = dispatchService.selectById(uid).getCompanyId();
        List<Driver> drivers = driverMapper.getServerDriverList(companyId, type);
        List<BaseWarpper> list = new ArrayList<>();
        drivers.forEach(driver -> {
            Car car = carService.selectById(driver.getCarId());
            if(type == 1){
                CarService carService = carServiceService.selectOne(new EntityWrapper<CarService>().eq("carId", car.getId()).eq("type", type).eq("serverCarModelId", carModelId));
                if(null == carService){
                    return;
                }
            }
            BaseWarpper baseWarpper = new BaseWarpper();
            baseWarpper.setId(driver.getId());
            baseWarpper.setName(driver.getName() + "-" + car.getCarLicensePlate());
            list.add(baseWarpper);
        });
        return list;
    }
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceServiceImpl.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverWorkServiceImpl.java

File was deleted

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

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java

@@ -6,7 +6,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.dao.LinePriceMapper;
import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
import com.stylefeng.guns.modular.system.dao.OrderCrossCityMapper;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
@@ -90,12 +93,6 @@

    @Autowired
    private GDMapElectricFenceUtil gdMapElectricFenceUtil;

    @Resource
    private OrderPrivateCarMapper orderPrivateCarMapper;

    @Resource
    private OrderTaxiMapper orderTaxiMapper;

    @Value("${callbackPath}")
    private String callbackPath;
@@ -321,27 +318,6 @@
            userInfo.setInsertUser(uid);
            userInfoService.insert(userInfo);
        }

        /**
         * 1.出租车、专车、跨城有待支付的订单不能叫车
         * 2.小件物流有未完成的订单可以下跨城、专车、出租车
         * 3.出租车、专车、跨城有预约单可以下即时单
         */
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
        if(orderPrivateCars.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        List<OrderTaxi> list = orderTaxiMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
        if(list.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }

        List<OrderCrossCity> orderCrossCities2 = orderCrossCityMapper.queryOrders(orderCrossCityWarpper.getDriverId(), orderCrossCityWarpper.getLineShiftDriverId(), Arrays.asList(5));
        if(orderCrossCities2.size() > 0){
            return ResultUtil.error("司机正在服务中");
        }


        orderCrossCity.setUserId(userInfo.getId());
        orderCrossCity.setPassengers(orderCrossCityWarpper.getPassengers());
        orderCrossCity.setPassengersPhone(orderCrossCityWarpper.getPassengersPhone());
@@ -387,7 +363,7 @@
        //调用移动的小号接口
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
        Region region = regionMapper.query(geocode.get("districtCode"));
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
        if(String.valueOf(map.get("code")).equals("200")){
            orderCrossCity.setTelX(map.get("telX"));
            orderCrossCity.setBindId(map.get("bindId"));

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java

@@ -2,17 +2,16 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.CarServiceMapper;
import com.stylefeng.guns.modular.system.dao.OrderCrossCityMapper;
import com.stylefeng.guns.modular.system.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.system.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.model.Dispatch;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.OrderCancel;
import com.stylefeng.guns.modular.system.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
@@ -51,27 +50,6 @@

    @Autowired
    private ISystemNoticeService systemNoticeService;

    @Autowired
    private IUserInfoService userInfoService;

    @Autowired
    private GDMapGeocodingUtil gdMapGeocodingUtil;

    @Autowired
    private IDriverServiceService driverServiceService;

    @Resource
    private CarServiceMapper carServiceMapper;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;

    @Resource
    private OrderTaxiMapper orderTaxiMapper;

    @Resource
    private OrderCrossCityMapper orderCrossCityMapper;

    @Value("${callbackPath}")
    private String callbackPath;
@@ -173,159 +151,5 @@
        }).start();

        return ResultUtil.success();
    }

    @Override
    public ResultUtil saveOrderPrivateCar(Integer uid, Integer serverCarModelId, Date travelTime, Integer orderType, String placementLon, String placementLat, String startLon, String startLat, String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer driverId) throws Exception {
        //如果出行时间大于当前10分钟则默认为预约单
        Integer reservation = 1;
        if(travelTime.getTime() > (System.currentTimeMillis() + 600000)){
            reservation = 2;
        }
        Dispatch dispatch = dispatchService.selectById(uid);

        UserInfo userInfo = userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("phone", passengersPhone).ne("flag", 3));
        if(userInfo == null){
            userInfo = new UserInfo();
            userInfo.setName(passengers);
            userInfo.setPhone(passengersPhone);
            userInfo.setCompanyId(dispatch.getCompanyId());
            userInfo.setState(1);
            userInfo.setFlag(1);
            userInfo.setInsertTime(new Date());
            userInfoService.insert(userInfo);
        }

        /**
         * 1.出租车、专车、跨城有待支付的订单不能叫车
         * 2.小件物流有未完成的订单可以下跨城、专车、出租车
         * 3.出租车、专车、跨城有预约单可以下即时单
         */
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
        if(orderPrivateCars.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        List<OrderTaxi> list = orderTaxiMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
        if(list.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        List<OrderCrossCity> orderCrossCities1 = orderCrossCityMapper.queryByState(userInfo.getId(), 7, 12);
        if(orderCrossCities1.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        if(reservation == 1){
            orderPrivateCars = orderPrivateCarMapper.queryByState(userInfo.getId(), 1, 1, 1, 2, 3, 4, 5, 6, 7, 11, 12);
            if(orderPrivateCars.size() > 0){
                return ResultUtil.error("乘客有未完成的订单");
            }
            list = orderTaxiMapper.queryByState(userInfo.getId(), 1, 1, 1, 2, 3, 4, 5, 6, 7, 11, 12);
            if(list.size() > 0){
                return ResultUtil.error("乘客有未完成的订单");
            }
        }

        startAddress = startAddress.replaceAll("& #40;", "(");
        startAddress = startAddress.replaceAll("& #41;", ")");
        endAddress = endAddress.replaceAll("& #40;", "(");
        endAddress = endAddress.replaceAll("& #41;", ")");
        OrderPrivateCar orderPrivateCar = new OrderPrivateCar();
        orderPrivateCar.setType(1);
        orderPrivateCar.setUserId(userInfo.getId());
        orderPrivateCar.setServerCarModelId(serverCarModelId);
        orderPrivateCar.setOrderNum(this.getOrderNum());
        orderPrivateCar.setPlacementLon(Double.valueOf(placementLon));
        orderPrivateCar.setPlacementLat(Double.valueOf(placementLat));
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(placementLon, placementLat);
        orderPrivateCar.setPlacementAddress(geocode.get("address"));
        orderPrivateCar.setStartLon(Double.valueOf(startLon));
        orderPrivateCar.setStartLat(Double.valueOf(startLat));
        orderPrivateCar.setStartAddress(startAddress);
        orderPrivateCar.setEndLon(Double.valueOf(endLon));
        orderPrivateCar.setEndLat(Double.valueOf(endLat));
        orderPrivateCar.setEndAddress(endAddress);
        orderPrivateCar.setSubstitute(0);
        orderPrivateCar.setPassengers(passengers);
        orderPrivateCar.setPassengersPhone(passengersPhone);
        orderPrivateCar.setState(1);
        orderPrivateCar.setInsertTime(new Date());
        orderPrivateCar.setTravelTime(travelTime);
        orderPrivateCar.setOrderType(reservation);
        orderPrivateCar.setOrderSource(5);
        if(null != driverId){
            Driver driver = driverService.selectById(driverId);
            if(null == driver){
                return ResultUtil.error("司机信息有误，无法完成下单");
            }
            if(driver.getAuthState() == 1){
                return ResultUtil.error("司机信息还未完成审核，无法完成下单");
            }
            if(driver.getAuthState() == 3){
                return ResultUtil.error("司机账户已被冻结，无法提供服务");
            }
            if(driver.getAuthState() == 4){
                return ResultUtil.error("司机信息未通过审核，无法提供服务");
            }
            if(driver.getState() == 1){
                return ResultUtil.error("司机还未上线，无法提供服务");
            }
            if(driver.getState() == 3){
                return ResultUtil.error("司机正在服务中，无法提供服务");
            }
            List<DriverService> query = driverServiceService.query(driverId, 1);
            if(query.size() == 0){
                return ResultUtil.error("该司机不能服务此业务");
            }

            orderPrivateCar.setDriverId(driverId);
            orderPrivateCar.setCompanyId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                    driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
            orderPrivateCar.setState(2);
            orderPrivateCar.setCarId(driver.getCarId());
            CarService query1 = carServiceMapper.query(1, driver.getCarId());
            orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
            orderPrivateCar.setSnatchOrderTime(new Date());

//            //调用高德创建轨迹
//            String s = gdFalconUtil.selectTerminal(driver.getPhone());
//            String track = gdFalconUtil.createTrack(s);
//            orderPrivateCar.setTrackId(track);
//
            //调用移动的小号接口
            Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
            if(String.valueOf(map.get("code")).equals("200")){
                orderPrivateCar.setTelX(map.get("telX"));
                orderPrivateCar.setBindId(map.get("bindId"));
            }

            driver.setState(3);
            driverService.updateById(driver);
        }

        orderPrivateCar.setIsReassign(1);
        orderPrivateCar.setIsDelete(1);
        this.insert(orderPrivateCar);

        UserInfo finalUserInfo = userInfo;
        new Thread(new Runnable() {
            @Override
            public void run() {
                pushUtil.pushOrderState(1, finalUserInfo.getId(), orderPrivateCar.getId(), 1, 2, 0);
                pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
                pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
            }
        }).start();

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

        BaseWarpper baseWarpper = new BaseWarpper();
        baseWarpper.setId(orderPrivateCar.getId());
        return ResultUtil.success(baseWarpper);
    }


    public synchronized String getOrderNum() throws Exception{
        int size = this.selectCount(null);
        return "PRIVATE" + String.valueOf(1000000 + size + 1).substring(1);
    }
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java

@@ -1,292 +1,22 @@
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.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.OrderCrossCityMapper;
import com.stylefeng.guns.modular.system.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.system.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;

@Service
@Transactional(isolation = Isolation.READ_UNCOMMITTED, propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public class OrderTaxiServiceImpl extends ServiceImpl<OrderTaxiMapper, OrderTaxi> implements IOrderTaxiService {

    @Autowired
    private IDispatchService dispatchService;

    @Autowired
    private IOrderCancelService orderCancelService;

    @Autowired
    private ISystemNoticeService systemNoticeService;

    @Autowired
    private PushUtil pushUtil;

    @Autowired
    private IDriverService driverService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Autowired
    private ICompanyCityService companyCityService;

    @Autowired
    private GDMapGeocodingUtil gdMapGeocodingUtil;

    @Autowired
    private IDriverServiceService driverServiceService;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;

    @Autowired
    private IUserInfoService userInfoService;

    @Resource
    private OrderPrivateCarMapper orderPrivateCarMapper;

    @Resource
    private OrderTaxiMapper orderTaxiMapper;

    @Resource
    private OrderCrossCityMapper orderCrossCityMapper;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;



    @Override
    public List<Map<String, Object>> queryOrderList(String search, String orderSource, String state, Integer pageNum, Integer size, Integer uid) throws Exception {
        Dispatch dispatch = dispatchService.selectById(uid);
        Integer companyId = null != dispatch.getFranchiseeId() ? dispatch.getFranchiseeId() : dispatch.getCompanyId();
        pageNum = (pageNum - 1) * size;
        List<String> orderSources = null;
        if(ToolUtil.isNotEmpty(orderSource)){
            orderSources = Arrays.asList(orderSource.split(","));
        }
        List<String> states = null;
        if(ToolUtil.isNotEmpty(state)){
            states = Arrays.asList(state.split(","));
        }
        return this.baseMapper.queryOrderList(search, orderSources, states, companyId, pageNum, size);
    }

    @Override
    public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
        return this.baseMapper.queryOrderInfo(orderId);
    }

    @Override
    public ResultUtil cancelOrder(Integer orderId) throws Exception {
        OrderTaxi orderTaxi = this.selectById(orderId);
        if(orderTaxi.getState() == 10 || orderTaxi.getState() == 12){
            return ResultUtil.error("不允许重复取消");
        }
        if(orderTaxi.getState() == 8 || orderTaxi.getState() == 9){
            return ResultUtil.error("订单已完成，不允许取消");
        }
        orderTaxi.setState(10);
        this.updateById(orderTaxi);

        //添加取消记录
        OrderCancel orderCancel = new OrderCancel();
        orderCancel.setOrderId(orderId);
        orderCancel.setOrderType(2);
        orderCancel.setReason("调度端取消");
        orderCancel.setRemark("调度端取消");
        orderCancel.setState(2);
        orderCancel.setInsertTime(new Date());
        orderCancel.setUserType(2);
        orderCancelService.insert(orderCancel);

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

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

        return ResultUtil.success();
    }

    @Override
    public ResultUtil<BaseWarpper> taxiOrder(OrderTaxi orderTaxi, Integer uid) throws Exception {
        //定义用户所属公司
        Company query = companyCityService.query(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));
        if(null == query){
            return ResultUtil.error("出发点暂未开通");
        }
        Dispatch dispatch = dispatchService.selectById(uid);
        UserInfo userInfo = userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("phone", orderTaxi.getPassengersPhone()).ne("flag", 3));
        if(userInfo == null){
            userInfo = new UserInfo();
            userInfo.setName(orderTaxi.getPassengers());
            userInfo.setPhone(orderTaxi.getPassengersPhone());
            userInfo.setCompanyId(dispatch.getCompanyId());
            userInfo.setState(1);
            userInfo.setFlag(1);
            userInfo.setInsertTime(new Date());
            userInfoService.insert(userInfo);
        }

        if(orderTaxi.getTravelTime().getTime() > (System.currentTimeMillis() + 600000)){
            orderTaxi.setOrderType(2);
        }

        /**
         * 1.出租车、专车、跨城有待支付的订单不能叫车
         * 2.小件物流有未完成的订单可以下跨城、专车、出租车
         * 3.出租车、专车、跨城有预约单可以下即时单
         */
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
        if(orderPrivateCars.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        List<OrderTaxi> list = orderTaxiMapper.queryByState(userInfo.getId(), null, 1, 7, 12);
        if(list.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        List<OrderCrossCity> orderCrossCities1 = orderCrossCityMapper.queryByState(userInfo.getId(), 7, 12);
        if(orderCrossCities1.size() > 0){
            return ResultUtil.error("乘客有未完成的订单");
        }
        if(orderTaxi.getOrderType() == 1){
            orderPrivateCars = orderPrivateCarMapper.queryByState(userInfo.getId(), 1, 1, 1, 2, 3, 4, 5, 6, 7, 11, 12);
            if(orderPrivateCars.size() > 0){
                return ResultUtil.error("乘客有未完成的订单");
            }
            list = orderTaxiMapper.queryByState(userInfo.getId(), 1, 1, 1, 2, 3, 4, 5, 6, 7, 11, 12);
            if(list.size() > 0){
                return ResultUtil.error("乘客有未完成的订单");
            }
        }




        orderTaxi.setOrderNum(this.getOrderNum());
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(String.valueOf(orderTaxi.getPlacementLon()), String.valueOf(orderTaxi.getPlacementLat()));
        orderTaxi.setPlacementAddress(geocode.get("address"));
        orderTaxi.setStartAddress(orderTaxi.getStartAddress().replaceAll("& #40;", "\\("));//特殊字符转义
        orderTaxi.setStartAddress(orderTaxi.getStartAddress().replaceAll("& #41;", "\\)"));
        orderTaxi.setEndAddress(orderTaxi.getEndAddress().replaceAll("& #40;", "\\("));
        orderTaxi.setEndAddress(orderTaxi.getEndAddress().replaceAll("& #41;", "\\)"));
        orderTaxi.setUserId(userInfo.getId());
        orderTaxi.setMileage(0D);
        orderTaxi.setOrderMoney(0D);
        orderTaxi.setTravelMoney(0D);
        orderTaxi.setParkMoney(0D);
        orderTaxi.setRoadTollMoney(0D);
        orderTaxi.setRedPacketMoney(0D);
        orderTaxi.setCouponMoney(0D);
        orderTaxi.setInsertTime(new Date());
        orderTaxi.setIsReassign(1);
        orderTaxi.setState(1);//待接单
        if(null != orderTaxi.getDriverId()){
            Driver driver = driverService.selectById(orderTaxi.getDriverId());
            if(null == driver){
                return ResultUtil.error("司机信息有误");
            }
            if(driver.getAuthState() == 1){
                return ResultUtil.error("司机信息还未完成审核，无法完成下单");
            }
            if(driver.getAuthState() == 3){
                return ResultUtil.error("司机账户已被冻结，无法提供服务");
            }
            if(driver.getAuthState() == 4){
                return ResultUtil.error("司机信息未通过审核，无法提供服务");
            }
            if(driver.getState() == 1){
                return ResultUtil.error("司机还未上线，无法提供服务");
            }
            if(driver.getState() == 3){
                return ResultUtil.error("司机正在服务中，无法提供服务");
            }
            List<DriverService> driverServices = driverServiceService.query(orderTaxi.getDriverId(), 2);
            if(driverServices.size() == 0){
                return ResultUtil.error("该司机不能服务此业务");
            }

            orderTaxi.setCompanyId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                    driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
            orderTaxi.setCarId(driver.getCarId());
            orderTaxi.setState(2);//待出发
            orderTaxi.setSnatchOrderTime(new Date());

//            //调用高德创建轨迹
//            String s = gdFalconUtil.selectTerminal(driver.getPhone());
//            String track = gdFalconUtil.createTrack(s);
//            orderTaxi.setTrackId(track);
//
            //调用移动的小号接口
            Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
            if(String.valueOf(map.get("code")).equals("200")){
                orderTaxi.setTelX(map.get("telX"));
                orderTaxi.setBindId(map.get("bindId"));
            }

            driver.setState(3);
            driverService.updateById(driver);
        }

        this.insert(orderTaxi);

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(orderTaxi.getState() == 2){
                    //推送司机订单状态
                    pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);

                    pushUtil.pushDriverPosition(orderTaxi.getId(), 2);
                }
            }
        }).start();

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

        BaseWarpper baseWarpper = new BaseWarpper();
        baseWarpper.setId(orderTaxi.getId());
        return ResultUtil.success(baseWarpper);
    }


    public synchronized String getOrderNum() throws Exception{
        int size = this.selectCount(null);
        return "TAXI" + String.valueOf(1000000 + size + 1).substring(1);
    }
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java

File was deleted

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

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java

@@ -21,8 +21,8 @@
    // 设置鉴权参数，初始化客户端
    private DefaultProfile profile = DefaultProfile.getProfile(
            "cn-hangzhou",// 地域ID
            "LTAI5tCeHnZXREQBcVf3NHLB",// 您的AccessKey ID
            "OEX6AtRb3qOCyp53xOFdDEYgBjzZzS");// 您的AccessKey Secret
            "LTAI4G9Zez9H4B36vakPXGy4",// 您的AccessKey ID
            "BOVPUeZndKVbrPOq6Ef5j6oiydB3XZ");// 您的AccessKey Secret
    private IAcsClient client = new DefaultAcsClient(profile);

    private static void log_print(String functionName, Object result) {
@@ -70,7 +70,7 @@
        // 接收短信的手机号码
        request.putQueryParameter("PhoneNumbers", phone);
        // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
        request.putQueryParameter("SignName", "嘉易行");
        request.putQueryParameter("SignName", "OK出行");
        // 短信模板ID
        request.putQueryParameter("TemplateCode", templateCode);
        // 短信模板变量对应的实际值，JSON格式。

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java

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

import com.aliyun.dyplsapi20170525.models.BindAxbRequest;
import com.aliyun.dyplsapi20170525.models.BindAxbResponse;
import com.aliyun.dyplsapi20170525.models.UpdateSubscriptionRequest;
import com.aliyun.dyplsapi20170525.models.UpdateSubscriptionResponse;
import com.aliyun.teaopenapi.models.Config;
import com.alibaba.fastjson.JSONObject;
import com.stylefeng.guns.core.util.MD5Util;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

@@ -18,85 +15,114 @@
@Component
public class ChinaMobileUtil {

    private String accessKeyId = "LTAI5tCeHnZXREQBcVf3NHLB";
    private String APIKey = "zj42494b1bdd416b9762229af6b5cbbd";

    private String accessKeySecret = "OEX6AtRb3qOCyp53xOFdDEYgBjzZzS";
    private String SecretKey = "30323561316534653735613230316339";

    private String poolKey = "FC100000145494178";//号码池KEY



    /**
     * 使用AK&SK初始化账号Client
     * @return Client
     * @throws Exception
     */
    public com.aliyun.dyplsapi20170525.Client createClient() throws Exception {
        Config config = new Config()
                // 您的AccessKey ID
                .setAccessKeyId(accessKeyId)
                // 您的AccessKey Secret
                .setAccessKeySecret(accessKeySecret);
        // 访问的域名
        config.endpoint = "dyplsapi.aliyuncs.com";
        return new com.aliyun.dyplsapi20170525.Client(config);
    }
    @Autowired
    private HttpClientUtil httpClientUtil;


    /**
     * 绑定隐私号
     * 绑定小号
     * @param phoneA
     * @param phoneB
     * @param expiration    "2021-12-14 12:00:00"
     * @param areaCode
     * @return
     * @throws Exception
     */
    public Map<String, String> midAxbBindSend(String phoneA, String phoneB, Long expiration) throws Exception{
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        com.aliyun.dyplsapi20170525.Client client = createClient();
        BindAxbRequest bindAxbRequest = new BindAxbRequest()
                .setPhoneNoA(phoneA)
                .setExpiration(sdf.format(new Date(expiration)))
                .setPoolKey(poolKey)
                .setPhoneNoB(phoneB);
        // 复制代码运行请自行打印 API 的返回值
        BindAxbResponse bindAxbResponse = client.bindAxb(bindAxbRequest);
        Map<String, String> map = new HashMap<>();
        if(!bindAxbResponse.getBody().getCode().equals("OK")){
            map.put("code", "-1");
    public Map<String, String> midAxbBindSend(String phoneA, String phoneB, Integer areaCode) throws Exception{
        //组装请求对象-具体描述见开发文档-订单小号-AXB接口规范部分内容
        Map<String, Object> request = new HashMap<>();
        request.put("APPID", APIKey);
        request.put("bindtype", "AXB");
        request.put("requestId", UUIDUtil.getRandomCode(16));
        request.put("record", "0");
        //用户号码，必填，格式遵循国际电信联盟定义的E.164标准
        request.put("telA", "86" + phoneA);
        //用户号码B，必填，格式遵循国际电信联盟定义的E.164标准
        request.put("telB", "86" + phoneB);
        //需要选择的小号所属区号，当telX不写时必填，例如：杭州（571）
        request.put("areaCode", 571);
        //订单小号，非必填，当指定小号绑定时填写，格式遵循国际电信联盟定义的E.164标准
//        request.setTelX("8618867110000");
        //绑定关系过期失效时间，秒，取值必须大于0且最大值不超过4294967296
        request.put("expiration", Integer.valueOf(7 * 24 * 60 * 60));

        Map<String, String> header = new HashMap<String, String>(3);
        header.put("Authorization", "Basic " + new String(Base64.encodeBase64((APIKey + ":" + SecretKey).getBytes())));
        header.put("Content-Type", "application/json;charset=utf-8");
        String post = httpClientUtil.pushHttpRequset("POST", "https://ct.open.10086.cn/ordernumber/v1/binding", request, header, "json");
        Map<String, String> map1 = new HashMap<>();
        if(post.indexOf("0000") != -1){
            JSONObject jsonObject = JSONObject.parseObject(post);
            if(jsonObject.getString("code").equals("0000")){
                map1.put("code", "200");
                map1.put("msg", jsonObject.getString("message"));
                map1.put("telX", jsonObject.getString("x_no").substring(2));
                map1.put("bindId", jsonObject.getString("bindId"));
        }else{
            map.put("code", "200");
            map.put("telX", bindAxbResponse.getBody().getSecretBindDTO().getSecretNo());
            map.put("bindId", bindAxbResponse.getBody().getSecretBindDTO().getSubsId());
                map1.put("code", jsonObject.getString("code"));
                map1.put("msg", jsonObject.getString("message"));
        }
        return map;
        }else{
            map1.put("code", "-1");
            map1.put("msg", post);
        }

        return map1;
    }


    /**
     * 修改绑定关系
     * 解绑小号关系
     * @param bindId    绑定关系id
     * @param phone     隐私号
     * @return
     * @throws Exception
     */
    public Map<String, String> midAxbUnBindSend(String bindId, String phone, Long expiration) throws Exception{
        com.aliyun.dyplsapi20170525.Client client = createClient();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        UpdateSubscriptionRequest updateSubscriptionRequest = new UpdateSubscriptionRequest()
                .setPoolKey(poolKey)
                .setSubsId(bindId)
                .setPhoneNoX(phone)
                .setOperateType("updateExpire")
                .setExpiration(sdf.format(new Date(expiration)));
        // 复制代码运行请自行打印 API 的返回值
        UpdateSubscriptionResponse updateSubscriptionResponse = client.updateSubscription(updateSubscriptionRequest);
        Map<String, String> map = new HashMap<>();
        if(!updateSubscriptionResponse.getBody().getCode().equals("OK")){
            map.put("code", "-1");
    public Map<String, String> midAxbUnBindSend(String bindId) throws Exception{
        //组装请求对象-具体描述见开发文档-订单小号-AXB接口规范部分内容
        Map<String, Object> request = new HashMap<>();
        //绑定关系ID
        request.put("APPID", APIKey);
        request.put("bindId", bindId);

        Map<String, String> header = new HashMap<String, String>(3);
        header.put("Authorization", "Basic " + new String(Base64.encodeBase64((APIKey + ":" + SecretKey).getBytes())));
        header.put("Content-Type", "application/json;charset=utf-8");
        String post = httpClientUtil.pushHttpRequset("POST", "https://ct.open.10086.cn/ordernumber/v1/unbinding", request, header, "json");
        JSONObject jsonObject = JSONObject.parseObject(post);
        Map<String, String> map1 = new HashMap<>();
        if(jsonObject.getString("code").equals("0000")){
            map1.put("code", "200");
            map1.put("msg", jsonObject.getString("message"));
        }else{
            map.put("code", "200");
            map1.put("code", jsonObject.getString("code"));
            map1.put("msg", jsonObject.getString("message"));
        }
        return map;
        return map1;
    }




    public Map<String, String> HeaderUtils(String APIKey, String SecretKey) throws Exception{
        Map<String, String> header = new HashMap<>();
        long time = System.currentTimeMillis();
        String signStr = MD5Util.encrypt(APIKey + SecretKey + time);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("apiKey", APIKey);
        jsonObject.put("time", time);
        jsonObject.put("sign", signStr);
        Base64 base64 = new Base64();
        String s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
        header.put("header", s);

        jsonObject = new JSONObject();
        jsonObject.put("platformId", "");
        jsonObject.put("secret", "");
        s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
        header.put("accessCode", s);
        return header;
    }
}

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java

@@ -21,7 +21,7 @@
@Component
public class GDFalconUtil implements ApplicationRunner {

    private String key = "ba2915f8d8c1428df72e964a5f94f167";
    private String key = "e17d799b2506d05faf7f88320a266803";

    @Autowired
    private RestTemplate restTemplate;

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

@@ -34,7 +34,7 @@
    @Autowired
    private IGDInterfaceService gdInterfaceService;

    private String key = "ba2915f8d8c1428df72e964a5f94f167";
    private String key = "e17d799b2506d05faf7f88320a266803";

    private JSONArray jsonArray = new JSONArray();


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

@@ -20,7 +20,7 @@
@Component
public class GDMapGeocodingUtil {

    private String key = "c573ee644cd0c1bd9da2657dd648dc11";
    private String key = "e17d799b2506d05faf7f88320a266803";

    @Autowired
    private RestTemplate restTemplate;

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java

@@ -102,7 +102,7 @@
        bizContent.setMer_prtcl_no(mer_prtcl_no);
        bizContent.setOrig_date_time(format);
        bizContent.setDecive_info(deciveInfo);
        bizContent.setBody("嘉易行-" + body);
        bizContent.setBody("OK出行-" + body);
        bizContent.setFee_type("001");
        InetAddress ip4 = Inet4Address.getLocalHost();
        bizContent.setSpbill_create_ip(ip4.getHostAddress());

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java

@@ -43,7 +43,6 @@

    private Map<String, Timer> taskMap = new HashMap<>();//存储定时推送的定时器

    private final String host = "http://ZUUL-GATEWAY/";



@@ -52,7 +51,7 @@
     * @param type          1=用户，2=司机
     * @param uid           对象id
     * @param orderId       订单id
     * @param orderType     订单类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）
     * @param orderType     订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
     * @param state         订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）
     */
    public void pushOrderState(Integer type, Integer uid, Integer orderId, Integer orderType, Integer state, Integer time){
@@ -77,7 +76,7 @@
        params.add("id", String.valueOf(uid));
        params.add("type", String.valueOf(type));
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject(host + "/netty/sendMsgToClient",requestEntity , String.class);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
@@ -112,7 +111,7 @@
        params.add("id", String.valueOf(uid));
        params.add("type", String.valueOf(type));
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject(host+"/netty/sendMsgToClient",requestEntity , String.class);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
@@ -264,7 +263,7 @@
        params.add("id", jsonObject.getString("id"));
        params.add("type", jsonObject.getString("type"));
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject(host+ "/netty/sendMsgToClient",requestEntity , String.class);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
@@ -294,7 +293,7 @@
        params.add("id", id.toString());
        params.add("type", type.toString());
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject(host+"/netty/sendMsgToClient",requestEntity , String.class);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java

@@ -22,7 +22,6 @@
    @Autowired
    private RestTemplate internalRestTemplate;

    private final String host = "http://ZUUL-GATEWAY/";

    /**
     * 向redis中存储字符串没有过期时间
@@ -40,7 +39,7 @@
            params.add("key", key);
            params.add("value", value);
            HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
            String s = internalRestTemplate.postForObject(host + "/redis/setValue_", requestEntity, String.class);
            String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/setValue_", requestEntity, String.class);
            JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
            if(jsonObject.getIntValue("code") != 200){
                System.err.println("调用redis出错了");
@@ -68,7 +67,7 @@
            params.add("value", value);
            params.add("time", String.valueOf(time));
            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers);
            String s = internalRestTemplate.postForObject(host+"/redis/setValue", requestEntity, String.class);
            String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/setValue", requestEntity, String.class);
            JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
            if(jsonObject.getIntValue("code") != 200){
                System.err.println("调用redis出错了");
@@ -91,7 +90,7 @@
            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
            params.add("key", key);
            HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
            String s = internalRestTemplate.postForObject(host + "/redis/getValue",requestEntity , String.class);
            String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/getValue",requestEntity , String.class);
            JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
            if(jsonObject.getIntValue("code") != 200){
                System.err.println("调用redis出错了");
@@ -115,7 +114,7 @@
            MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
            params.add("key", key);
            HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
            String s = internalRestTemplate.postForObject(host + "/redis/remove",requestEntity , String.class);
            String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/remove",requestEntity , String.class);
            JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
            if(jsonObject.getIntValue("code") != 200){
                System.err.println("调用redis出错了");

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTaxiWarpper.java

File was deleted

 DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java

File was deleted

 DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif

 DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png

 DispatchTravel/guns-admin/src/main/webapp/static/favicon.ico

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/img/bg.png

 DispatchTravel/guns-admin/src/main/webapp/static/img/boy.gif

 DispatchTravel/guns-admin/src/main/webapp/static/img/girl.gif

 DispatchTravel/guns-admin/src/main/webapp/static/img/icons.png

 DispatchTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif

 DispatchTravel/guns-admin/src/main/webapp/static/img/locked.png

 DispatchTravel/guns-admin/src/main/webapp/static/img/user.png

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff

Binary files differ

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif

 DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf

Binary files differ