From 59f70d9b19408d36f40ee0f418bf98232c40fb33 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 09:41:42 +0800
Subject: [PATCH] 代码调整
---
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java | 2
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff | 0
DispatchTravel/guns-admin/src/main/webapp/static/img/bg.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 14
DispatchTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml | 279 +++++++-
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java | 65 +
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml | 77 --
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java | 34
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java | 2
DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java | 24
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 7
DispatchTravel/guns-admin/src/main/webapp/static/img/girl.gif | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2 | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java | 3
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java | 2
DispatchTravel/guns-admin/src/main/webapp/static/img/user.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 35 -
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java | 2
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java | 4
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java | 9
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java | 156 +++--
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java | 2
DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot | 0
DispatchTravel/guns-admin/src/main/webapp/static/img/boy.gif | 0
DispatchTravel/guns-admin/src/main/webapp/static/img/locked.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2 | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java | 43 -
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 2
DispatchTravel/guns-admin/src/main/webapp/static/img/icons.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java | 13
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java | 6
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml | 88 --
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java | 278 ---------
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java | 184 ------
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 298 ---------
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png | 0
/dev/null | 121 ----
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png | 0
DispatchTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 11
DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf | 0
DispatchTravel/guns-admin/src/main/webapp/static/favicon.ico | 0
DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png | 0
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java | 2
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java | 9
80 files changed, 428 insertions(+), 1,348 deletions(-)
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 0738cac..2574128 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/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();
}
}
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
index e1c228f..1cebee4 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
+++ b/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");
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarServiceMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarServiceMapper.java
deleted file mode 100644
index 66c9fac..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarServiceMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.CarService;
-import org.apache.ibatis.annotations.Param;
-
-public interface CarServiceMapper extends BaseMapper<CarService> {
-
-
- CarService query(@Param("type") Integer orderType, @Param("carId") Integer carId);
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyCityMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyCityMapper.java
deleted file mode 100644
index a6ae86b..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyCityMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.CompanyCity;
-
-public interface CompanyCityMapper extends BaseMapper<CompanyCity> {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyMapper.java
deleted file mode 100644
index 43f3ff0..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface CompanyMapper extends BaseMapper<Company> {
-
-
- /**
- * 根据行政区域代码获取企业
- * @param code
- * @return
- */
- List<Company> query(@Param("province") String province, @Param("city") String city, @Param("code") String code);
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java
index db76e0a..ea0a2e4 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java
+++ b/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);
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverWorkMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverWorkMapper.java
deleted file mode 100644
index ffa0506..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverWorkMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.DriverWork;
-
-public interface DriverWorkMapper extends BaseMapper<DriverWork> {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityBusinessMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityBusinessMapper.java
deleted file mode 100644
index c982df7..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityBusinessMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.OpenCityBusiness;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface OpenCityBusinessMapper extends BaseMapper<OpenCityBusiness> {
-
-
- /**
- * 获取业务类型
- * @param province 省名称
- * @param city 市名称
- * @param district 区县名称
- * @return
- */
- List<OpenCityBusiness> queryBusiness(@Param("province") String province, @Param("city") String city,
- @Param("district") String district);
-
-
- /**
- * 根据开通城市id获取业务类型
- * @param id
- * @return
- */
- List<OpenCityBusiness> queryBusinessById(@Param("id") Integer id);
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityMapper.java
deleted file mode 100644
index 1286955..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.OpenCity;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface OpenCityMapper extends BaseMapper<OpenCity> {
-
-
- /**
- * 获取开通城市列表（有效的）
- * @return
- */
- List<OpenCity> queryOpenCity();
-
-
- /**
- * 获取开通城市
- * @param code
- * @return
- */
- List<OpenCity> queryByCode(@Param("code") String code);
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java
index 4888f56..9a521a0 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCrossCityMapper.java
+++ b/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);
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java
index 025b981..1d8007e 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderPrivateCarMapper.java
+++ b/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;
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java
index d79254e..1720dda 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderTaxiMapper.java
+++ b/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,
- @Param("type") Integer type, @Param("state") Integer...state);
+ List<OrderTaxi> queryByState_(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
+ @Param("type") Integer type, @Param("state") Integer... state);
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ServerCarModelMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ServerCarModelMapper.java
deleted file mode 100644
index 351f1a9..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ServerCarModelMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.ServerCarModel;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ServerCarModelMapper extends BaseMapper<ServerCarModel> {
-
-
- /**
- * 获取业务对应的所有有效服务车型
- * @param type
- * @return
- */
- List<Map<String, Object>> queryServerCarModel(@Param("type") Integer type);
-
-
-
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceMapper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceMapper.java
deleted file mode 100644
index ef37769..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.stylefeng.guns.modular.system.dao;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.stylefeng.guns.modular.system.model.SystemPrice;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Map;
-
-public interface SystemPriceMapper extends BaseMapper<SystemPrice> {
-
-
- /**
- * 获取价格
- * @param companyId
- * @param type
- * @return
- */
- Map<String, Object> query(@Param("companyId") Integer companyId, @Param("type") Integer type,
- @Param("serverCarModelId") Integer serverCarModelId);
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarServiceMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarServiceMapper.xml
deleted file mode 100644
index 919a8b2..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarServiceMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.CarServiceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.CarService">
- <id column="id" property="id"/>
- <result column="carId" property="carId"/>
- <result column="type" property="type"/>
- <result column="serverCarModelId" property="serverCarModelId"/>
- </resultMap>
-
-
- <select id="query" resultType="CarService">
- select
- id as id,
- carId as carId,
- `type` as `type`,
- serverCarModelId as serverCarModelId
- from t_car_service where `type` = #{type} and carId = #{carId}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyCityMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyCityMapper.xml
deleted file mode 100644
index 2dba5b5..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyCityMapper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.CompanyCityMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.CompanyCity">
- <id column="id" property="id"/>
- <result column="companyId" property="companyId"/>
- <result column="provinceCode" property="provinceCode"/>
- <result column="cityCode" property="cityCode"/>
- <result column="areaCode" property="areaCode"/>
- <result column="state" property="state"/>
- </resultMap>
-
- <select id="query" resultType="CompanyCity">
- select
- id as id,
- companyId as companyId,
- provinceCode as provinceCode,
- cityCode as cityCode,
- areaCode as areaCode,
- state as state
- from t_company_city where state = 1
- <if test="null != province">
- and provinceCode = #{province}
- </if>
- <if test="null != city">
- and cityCode = #{city}
- </if>
- <if test="null != code">
- and areaCode = #{code}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml
deleted file mode 100644
index 9007d02..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyMapper.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.CompanyMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Company">
- <id column="id" property="id"/>
- <result column="isSpe" property="isSpe"/>
- <result column="isTaxi" property="isTaxi"/>
- <result column="isCross" property="isCross"/>
- <result column="isCrossLogistics" property="isCrossLogistics"/>
- <result column="isSameLogistics" property="isSameLogistics"/>
- <result column="isCharter" property="isCharter"/>
- <result column="isSpeFixedOrProportional" property="isSpeFixedOrProportional"/>
- <result column="isTaxiFixedOrProportional" property="isTaxiFixedOrProportional"/>
- <result column="isCrossLogisticsFixedOrProportional" property="isCrossLogisticsFixedOrProportional"/>
- <result column="isSameLogisticsFixedOrProportional" property="isSameLogisticsFixedOrProportional"/>
- <result column="speMoney" property="speMoney"/>
- <result column="taxiMoney" property="taxiMoney"/>
- <result column="crossLogisticsMoney" property="crossLogisticsMoney"/>
- <result column="sameLogisticsMoney" property="sameLogisticsMoney"/>
- <result column="isNeedFerry" property="isNeedFerry"/>
- <result column="name" property="name"/>
- <result column="type" property="type"/>
- <result column="superiorId" property="superiorId"/>
- <result column="principalName" property="principalName"/>
- <result column="principalPhone" property="principalPhone"/>
- <result column="adminName" property="adminName"/>
- <result column="adminPhone" property="adminPhone"/>
- <result column="urgentPhoen" property="urgentPhoen"/>
- <result column="setupTime" property="setupTime"/>
- <result column="identifier" property="identifier"/>
- <result column="addressCode" property="addressCode"/>
- <result column="businessScope" property="businessScope"/>
- <result column="contactAddress" property="contactAddress"/>
- <result column="documentAddress" property="documentAddress"/>
- <result column="economicType" property="economicType"/>
- <result column="regCapital" property="regCapital"/>
- <result column="legalName" property="legalName"/>
- <result column="legalId" property="legalId"/>
- <result column="legalPhone" property="legalPhone"/>
- <result column="legalPhotoUrl" property="legalPhotoUrl"/>
- <result column="licensingAgency" property="licensingAgency"/>
- <result column="licenseTime" property="licenseTime"/>
- <result column="licenseStartTime" property="licenseStartTime"/>
- <result column="licenseEndTime" property="licenseEndTime"/>
- <result column="licenseNumber" property="licenseNumber"/>
- <result column="carNum" property="carNum"/>
- <result column="driverNum" property="driverNum"/>
- <result column="mac" property="mac"/>
- <result column="state" property="state"/>
- <result column="flag" property="flag"/>
- <result column="upload" property="upload"/>
- <result column="insertTime" property="insertTime"/>
- </resultMap>
-
-
- <select id="query" resultType="Company">
- select
- id as id,
- isSpe as isSpe,
- isTaxi as isTaxi,
- isCross as isCross,
- isCrossLogistics as isCrossLogistics,
- isSameLogistics as isSameLogistics,
- isCharter as isCharter,
- isSpeFixedOrProportional as isSpeFixedOrProportional,
- isTaxiFixedOrProportional as isTaxiFixedOrProportional,
- isCrossLogisticsFixedOrProportional as isCrossLogisticsFixedOrProportional,
- isSameLogisticsFixedOrProportional as isSameLogisticsFixedOrProportional,
- speMoney as speMoney,
- taxiMoney as taxiMoney,
- crossLogisticsMoney as crossLogisticsMoney,
- sameLogisticsMoney as sameLogisticsMoney,
- isNeedFerry as isNeedFerry,
- name as name,
- type as type,
- superiorId as superiorId,
- principalName as principalName,
- principalPhone as principalPhone,
- adminName as adminName,
- adminPhone as adminPhone,
- urgentPhoen as urgentPhoen,
- setupTime as setupTime,
- identifier as identifier,
- addressCode as addressCode,
- businessScope as businessScope,
- contactAddress as contactAddress,
- documentAddress as documentAddress,
- economicType as economicType,
- regCapital as regCapital,
- legalName as legalName,
- legalId as legalId,
- legalPhone as legalPhone,
- legalPhotoUrl as legalPhotoUrl,
- licensingAgency as licensingAgency,
- licenseTime as licenseTime,
- licenseStartTime as licenseStartTime,
- licenseEndTime as licenseEndTime,
- licenseNumber as licenseNumber,
- carNum as carNum,
- driverNum as driverNum,
- mac as mac,
- state as state,
- flag as flag,
- upload as upload,
- insertTime as insertTime
- from t_company where flag != 3 and state = 0 and id in (
- select companyId from t_company_city where state = 1
- <if test="null != province and null != city and null != code">
- and provinceCode = #{province} and cityCode = #{city} and areaCode = #{code}
- </if>
- <if test="null != province and null != city and null == code">
- and provinceCode = #{province} and cityCode = #{city} and (areaCode = '' or areaCode is null)
- </if>
- <if test="null != province and null == city and null == code">
- and provinceCode = #{province} and (cityCode = '' or cityCode is null) and (areaCode = '' or areaCode is null)
- </if>
- )
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 5386853..a9c2a6b 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml
deleted file mode 100644
index 290179b..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverWorkMapper.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverWorkMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverWork">
- <id column="id" property="id" />
- <result column="driverId" property="driverId" />
- <result column="startTime" property="startTime" />
- <result column="endTime" property="endTime" />
- <result column="type" property="type" />
- <result column="state" property="state" />
- </resultMap>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityBusinessMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityBusinessMapper.xml
deleted file mode 100644
index f1938ef..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityBusinessMapper.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.OpenCityBusinessMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OpenCityBusiness">
- <id column="id" property="id"/>
- <result column="openCityId" property="openCityId"/>
- <result column="businessType" property="businessType"/>
- <result column="sort" property="sort"/>
-
- <result column="flag" property="flag"/>
- <result column="insertTime" property="insertTime"/>
- <result column="insertUser" property="insertUser"/>
- <result column="updateTime" property="updateTime"/>
- <result column="updateUser" property="updateUser"/>
- </resultMap>
-
-
-
- <select id="queryBusiness" resultType="OpenCityBusiness">
- select
- a.id as id,
- a.openCityId as openCityId,
- a.businessType as businessType,
- a.sort as sort,
- a.flag as flag,
- a.insertTime as insertTime,
- a.insertUser as insertUser,
- a.updateTime as updateTime,
- a.updateUser as updateUser
- from t_open_city_business a
- left join t_open_city b on (a.openCityId = b.id)
- where a.flag != 3 and b.flag != 3
- <if test="null != district">
- and b.provinceName = #{district}
- </if>
- <if test="null != city">
- and b.cityName = #{city}
- </if>
- <if test="null != province">
- and b.areaName = #{province}
- </if>
- order by a.sort
- </select>
-
-
- <select id="queryBusinessById" resultType="OpenCityBusiness">
- select
- id as id,
- openCityId as openCityId,
- businessType as businessType,
- sort as sort,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
- from t_open_city_business
- where flag != 3 and openCityId = #{id} order by sort
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityMapper.xml
deleted file mode 100644
index 9c6a66e..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.OpenCityMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OpenCity">
- <id column="id" property="id"/>
- <result column="code" property="code"/>
- <result column="lon" property="lon"/>
- <result column="lat" property="lat"/>
- <result column="isQualifications" property="isQualifications"/>
- <result column="areaName" property="areaName"/>
- <result column="cityName" property="cityName"/>
- <result column="provinceName" property="provinceName"/>
-
- <result column="flag" property="flag"/>
- <result column="insertTime" property="insertTime"/>
- <result column="insertUser" property="insertUser"/>
- <result column="updateTime" property="updateTime"/>
- <result column="updateUser" property="updateUser"/>
- </resultMap>
-
-
-
- <select id="queryOpenCity" resultType="OpenCity">
- select
- id as id,
- code as code,
- lon as lon,
- lat as lat,
- isQualifications as isQualifications,
- areaName as areaName,
- cityName as cityName,
- provinceName as provinceName,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
- from t_open_city where flag = 1
- </select>
-
-
- <select id="queryByCode" resultType="OpenCity">
- select
- id as id,
- code as code,
- lon as lon,
- lat as lat,
- isQualifications as isQualifications,
- areaName as areaName,
- cityName as cityName,
- provinceName as provinceName,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
- from t_open_city where flag = 1 and code = #{code}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml
index c5b5f90..37cac7e 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCrossCityMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml
index 81b0236..f5791aa 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderPrivateCarMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml
index 1ffa6d0..34b0ab0 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderTaxiMapper.xml
+++ b/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,25 +200,59 @@
<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.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.driverId as driverId,
+ a.orderMoney as orderMoney,
+ 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)
- where a.id = #{orderId}
+ 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,
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml
deleted file mode 100644
index 95202f6..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.ServerCarModelMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.ServerCarModel">
- <id column="id" property="id"/>
- <result column="type" property="type"/>
- <result column="name" property="name"/>
- <result column="img" property="img"/>
- <result column="price" property="price"/>
- <result column="state" property="state"/>
- <result column="insertTime" property="insertTime"/>
- </resultMap>
-
-
-
- <select id="queryServerCarModel" resultType="map">
- select
- id as id,
- `name` as `name`,
- img as img,
- price as price
- from t_server_carmodel where state = 1 and `type` = #{type}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml
deleted file mode 100644
index 0e2480f..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.stylefeng.guns.modular.system.dao.SystemPriceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.SystemPrice">
- <id column="id" property="id"/>
- <result column="type" property="type"/>
- <result column="companyId" property="companyId"/>
- <result column="serverCarModelId" property="serverCarModelId"/>
- <result column="content" property="content"/>
- </resultMap>
-
- <select id="query" resultType="map">
- select
- id as id,
- content as content
- from t_system_price where state = 1 and companyId = #{companyId}
- <if test="null != type">
- and `type` = #{type}
- </if>
- <if test="null != serverCarModelId">
- and serverCarModelId = #{serverCarModelId}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
deleted file mode 100644
index 5454c56..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
-/**
- * 车辆服务
- */
-@TableName("t_car_service")
-public class CarService {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 服务类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，7=公务出行）
- */
- @TableField("type")
- private Integer type;
- /**
- * 服务车型id
- */
- @TableField("serverCarModelId")
- private Integer serverCarModelId;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- @Override
- public String toString() {
- return "CarService{" +
- "id=" + id +
- ", carId=" + carId +
- ", type=" + type +
- ", serverCarModelId=" + serverCarModelId +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
deleted file mode 100644
index aa38c5c..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
+++ /dev/null
@@ -1,694 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
-import java.util.Date;
-
-/**
- * 企业信息
- */
-@TableName("t_company")
-public class Company {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 是否经营专车(1=是，2=否)
- */
- @TableField("isSpe")
- private Integer isSpe;
- /**
- * 是否经营出租车(1=是，2=否)
- */
- @TableField("isTaxi")
- private Integer isTaxi;
- /**
- * 是否经营跨城(1=是，2=否)
- */
- @TableField("isCross")
- private Integer isCross;
- /**
- * 是否经营跨城物流(1=是，2=否)
- */
- @TableField("isCrossLogistics")
- private Integer isCrossLogistics;
- /**
- * 是否经营同城物流(1=是，2=否)
- */
- @TableField("isSameLogistics")
- private Integer isSameLogistics;
- /**
- * 是否经营包车(1=是，2=否)
- */
- @TableField("isCharter")
- private Integer isCharter;
- /**
- * 专车提成方式(1=比例，2=固定)
- */
- @TableField("isSpeFixedOrProportional")
- private Integer isSpeFixedOrProportional;
- /**
- * 出租车提成方式(1=比例，2=固定)
- */
- @TableField("isTaxiFixedOrProportional")
- private Integer isTaxiFixedOrProportional;
- /**
- * 跨城物流提成方式(1=比例，2=固定)
- */
- @TableField("isCrossLogisticsFixedOrProportional")
- private Integer isCrossLogisticsFixedOrProportional;
- /**
- * 同城物流提成方式(1=比例，2=固定)
- */
- @TableField("isSameLogisticsFixedOrProportional")
- private Integer isSameLogisticsFixedOrProportional;
- /**
- * 专车提成数值
- */
- @TableField("speMoney")
- private Double speMoney;
- /**
- * 出租车提成数值
- */
- @TableField("taxiMoney")
- private Double taxiMoney;
- /**
- * 跨城物流提成数值
- */
- @TableField("crossLogisticsMoney")
- private Double crossLogisticsMoney;
- /**
- * 同城物流
- */
- @TableField("sameLogisticsMoney")
- private Double sameLogisticsMoney;
- /**
- * 是否需要摆渡车(1=是，2=否)
- */
- @TableField("isNeedFerry")
- private Integer isNeedFerry;
- /**
- * 企业名称
- */
- @TableField("name")
- private String name;
- /**
- * 企业类型（1=平台，2=分公司，3=加盟商）
- */
- @TableField("type")
- private Integer type;
- /**
- * 上级企业
- */
- @TableField("superiorId")
- private Integer superiorId;
- /**
- * 负责人姓名
- */
- @TableField("principalName")
- private String principalName;
- /**
- * 负责人电话
- */
- @TableField("principalPhone")
- private String principalPhone;
- /**
- * 管理员姓名
- */
- @TableField("adminName")
- private String adminName;
- /**
- * 管理员电话
- */
- @TableField("adminPhone")
- private String adminPhone;
- /**
- * 紧急联系电话
- */
- @TableField("urgentPhoen")
- private String urgentPhoen;
- /**
- * 服务机构设立时间
- */
- @TableField("setupTime")
- private Date setupTime;
- /**
- * 社会统一信用代码
- */
- @TableField("identifier")
- private String identifier;
- /**
- * 注册地行政区域代码
- */
- @TableField("addressCode")
- private String addressCode;
- /**
- * 经营范围
- */
- @TableField("businessScope")
- private String businessScope;
- /**
- * 通信地址
- */
- @TableField("contactAddress")
- private String contactAddress;
- /**
- * 行政文书送达地址
- */
- @TableField("documentAddress")
- private String documentAddress;
- /**
- * 经营业户经济类型
- */
- @TableField("economicType")
- private String economicType;
- /**
- * 注册资本
- */
- @TableField("regCapital")
- private String regCapital;
- /**
- * 法人代表姓名
- */
- @TableField("legalName")
- private String legalName;
- /**
- * 法人代表身份证号码
- */
- @TableField("legalId")
- private String legalId;
- /**
- * 法人代表电话
- */
- @TableField("legalPhone")
- private String legalPhone;
- /**
- * 法人代表身份证图片地址
- */
- @TableField("legalPhotoUrl")
- private String legalPhotoUrl;
- /**
- * 经营许可证发证机构
- */
- @TableField("licensingAgency")
- private String licensingAgency;
- /**
- * 经营许可证初次发证日期
- */
- @TableField("licenseTime")
- private Date licenseTime;
- /**
- * 镜经营许可证有效日期起
- */
- @TableField("licenseStartTime")
- private Date licenseStartTime;
- /**
- * 经营许可证有效日期止
- */
- @TableField("licenseEndTime")
- private Date licenseEndTime;
- /**
- * 网络预约车经营许可证号
- */
- @TableField("licenseNumber")
- private String licenseNumber;
- /**
- * 注册网络预约车数量
- */
- @TableField("carNum")
- private Integer carNum;
- /**
- * 注册网络预约车驾驶员数量
- */
- @TableField("driverNum")
- private Integer driverNum;
- /**
- * 绑定mac地址
- */
- @TableField("mac")
- private String mac;
- /**
- * 状态（1=正常，2=禁用）
- */
- @TableField("state")
- private Integer state;
- /**
- * 1=创建，2=修改，3=删除
- */
- @TableField("flag")
- private Integer flag;
- /**
- * 上传标识（1：未上传，2：已上传）
- */
- @TableField("upload")
- private Integer upload;
- /**
- * 创建日期
- */
- @TableField("insertTime")
- private Date insertTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getIsSpe() {
- return isSpe;
- }
-
- public void setIsSpe(Integer isSpe) {
- this.isSpe = isSpe;
- }
-
- public Integer getIsTaxi() {
- return isTaxi;
- }
-
- public void setIsTaxi(Integer isTaxi) {
- this.isTaxi = isTaxi;
- }
-
- public Integer getIsCross() {
- return isCross;
- }
-
- public void setIsCross(Integer isCross) {
- this.isCross = isCross;
- }
-
- public Integer getIsCrossLogistics() {
- return isCrossLogistics;
- }
-
- public void setIsCrossLogistics(Integer isCrossLogistics) {
- this.isCrossLogistics = isCrossLogistics;
- }
-
- public Integer getIsSameLogistics() {
- return isSameLogistics;
- }
-
- public void setIsSameLogistics(Integer isSameLogistics) {
- this.isSameLogistics = isSameLogistics;
- }
-
- public Integer getIsCharter() {
- return isCharter;
- }
-
- public void setIsCharter(Integer isCharter) {
- this.isCharter = isCharter;
- }
-
- public Integer getIsSpeFixedOrProportional() {
- return isSpeFixedOrProportional;
- }
-
- public void setIsSpeFixedOrProportional(Integer isSpeFixedOrProportional) {
- this.isSpeFixedOrProportional = isSpeFixedOrProportional;
- }
-
- public Integer getIsTaxiFixedOrProportional() {
- return isTaxiFixedOrProportional;
- }
-
- public void setIsTaxiFixedOrProportional(Integer isTaxiFixedOrProportional) {
- this.isTaxiFixedOrProportional = isTaxiFixedOrProportional;
- }
-
- public Integer getIsCrossLogisticsFixedOrProportional() {
- return isCrossLogisticsFixedOrProportional;
- }
-
- public void setIsCrossLogisticsFixedOrProportional(Integer isCrossLogisticsFixedOrProportional) {
- this.isCrossLogisticsFixedOrProportional = isCrossLogisticsFixedOrProportional;
- }
-
- public Integer getIsSameLogisticsFixedOrProportional() {
- return isSameLogisticsFixedOrProportional;
- }
-
- public void setIsSameLogisticsFixedOrProportional(Integer isSameLogisticsFixedOrProportional) {
- this.isSameLogisticsFixedOrProportional = isSameLogisticsFixedOrProportional;
- }
-
- public Double getSpeMoney() {
- return speMoney;
- }
-
- public void setSpeMoney(Double speMoney) {
- this.speMoney = speMoney;
- }
-
- public Double getTaxiMoney() {
- return taxiMoney;
- }
-
- public void setTaxiMoney(Double taxiMoney) {
- this.taxiMoney = taxiMoney;
- }
-
- public Double getCrossLogisticsMoney() {
- return crossLogisticsMoney;
- }
-
- public void setCrossLogisticsMoney(Double crossLogisticsMoney) {
- this.crossLogisticsMoney = crossLogisticsMoney;
- }
-
- public Double getSameLogisticsMoney() {
- return sameLogisticsMoney;
- }
-
- public void setSameLogisticsMoney(Double sameLogisticsMoney) {
- this.sameLogisticsMoney = sameLogisticsMoney;
- }
-
- public Integer getIsNeedFerry() {
- return isNeedFerry;
- }
-
- public void setIsNeedFerry(Integer isNeedFerry) {
- this.isNeedFerry = isNeedFerry;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getSuperiorId() {
- return superiorId;
- }
-
- public void setSuperiorId(Integer superiorId) {
- this.superiorId = superiorId;
- }
-
- public String getPrincipalName() {
- return principalName;
- }
-
- public void setPrincipalName(String principalName) {
- this.principalName = principalName;
- }
-
- public String getPrincipalPhone() {
- return principalPhone;
- }
-
- public void setPrincipalPhone(String principalPhone) {
- this.principalPhone = principalPhone;
- }
-
- public String getAdminName() {
- return adminName;
- }
-
- public void setAdminName(String adminName) {
- this.adminName = adminName;
- }
-
- public String getAdminPhone() {
- return adminPhone;
- }
-
- public void setAdminPhone(String adminPhone) {
- this.adminPhone = adminPhone;
- }
-
- public String getUrgentPhoen() {
- return urgentPhoen;
- }
-
- public void setUrgentPhoen(String urgentPhoen) {
- this.urgentPhoen = urgentPhoen;
- }
-
- public Date getSetupTime() {
- return setupTime;
- }
-
- public void setSetupTime(Date setupTime) {
- this.setupTime = setupTime;
- }
-
- public String getIdentifier() {
- return identifier;
- }
-
- public void setIdentifier(String identifier) {
- this.identifier = identifier;
- }
-
- public String getAddressCode() {
- return addressCode;
- }
-
- public void setAddressCode(String addressCode) {
- this.addressCode = addressCode;
- }
-
- public String getBusinessScope() {
- return businessScope;
- }
-
- public void setBusinessScope(String businessScope) {
- this.businessScope = businessScope;
- }
-
- public String getContactAddress() {
- return contactAddress;
- }
-
- public void setContactAddress(String contactAddress) {
- this.contactAddress = contactAddress;
- }
-
- public String getDocumentAddress() {
- return documentAddress;
- }
-
- public void setDocumentAddress(String documentAddress) {
- this.documentAddress = documentAddress;
- }
-
- public String getEconomicType() {
- return economicType;
- }
-
- public void setEconomicType(String economicType) {
- this.economicType = economicType;
- }
-
- public String getRegCapital() {
- return regCapital;
- }
-
- public void setRegCapital(String regCapital) {
- this.regCapital = regCapital;
- }
-
- public String getLegalName() {
- return legalName;
- }
-
- public void setLegalName(String legalName) {
- this.legalName = legalName;
- }
-
- public String getLegalId() {
- return legalId;
- }
-
- public void setLegalId(String legalId) {
- this.legalId = legalId;
- }
-
- public String getLegalPhone() {
- return legalPhone;
- }
-
- public void setLegalPhone(String legalPhone) {
- this.legalPhone = legalPhone;
- }
-
- public String getLegalPhotoUrl() {
- return legalPhotoUrl;
- }
-
- public void setLegalPhotoUrl(String legalPhotoUrl) {
- this.legalPhotoUrl = legalPhotoUrl;
- }
-
- public String getLicensingAgency() {
- return licensingAgency;
- }
-
- public void setLicensingAgency(String licensingAgency) {
- this.licensingAgency = licensingAgency;
- }
-
- public Date getLicenseTime() {
- return licenseTime;
- }
-
- public void setLicenseTime(Date licenseTime) {
- this.licenseTime = licenseTime;
- }
-
- public Date getLicenseStartTime() {
- return licenseStartTime;
- }
-
- public void setLicenseStartTime(Date licenseStartTime) {
- this.licenseStartTime = licenseStartTime;
- }
-
- public Date getLicenseEndTime() {
- return licenseEndTime;
- }
-
- public void setLicenseEndTime(Date licenseEndTime) {
- this.licenseEndTime = licenseEndTime;
- }
-
- public String getLicenseNumber() {
- return licenseNumber;
- }
-
- public void setLicenseNumber(String licenseNumber) {
- this.licenseNumber = licenseNumber;
- }
-
- public Integer getCarNum() {
- return carNum;
- }
-
- public void setCarNum(Integer carNum) {
- this.carNum = carNum;
- }
-
- public Integer getDriverNum() {
- return driverNum;
- }
-
- public void setDriverNum(Integer driverNum) {
- this.driverNum = driverNum;
- }
-
- public String getMac() {
- return mac;
- }
-
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getFlag() {
- return flag;
- }
-
- public void setFlag(Integer flag) {
- this.flag = flag;
- }
-
- public Integer getUpload() {
- return upload;
- }
-
- public void setUpload(Integer upload) {
- this.upload = upload;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- public String toString() {
- return "Company{" +
- "id=" + id +
- ", isSpe=" + isSpe +
- ", isTaxi=" + isTaxi +
- ", isCross=" + isCross +
- ", isCrossLogistics=" + isCrossLogistics +
- ", isSameLogistics=" + isSameLogistics +
- ", isCharter=" + isCharter +
- ", isSpeFixedOrProportional=" + isSpeFixedOrProportional +
- ", isTaxiFixedOrProportional=" + isTaxiFixedOrProportional +
- ", isCrossLogisticsFixedOrProportional=" + isCrossLogisticsFixedOrProportional +
- ", isSameLogisticsFixedOrProportional=" + isSameLogisticsFixedOrProportional +
- ", speMoney=" + speMoney +
- ", taxiMoney=" + taxiMoney +
- ", crossLogisticsMoney=" + crossLogisticsMoney +
- ", sameLogisticsMoney=" + sameLogisticsMoney +
- ", isNeedFerry=" + isNeedFerry +
- ", name='" + name + '\'' +
- ", type=" + type +
- ", superiorId=" + superiorId +
- ", principalName='" + principalName + '\'' +
- ", principalPhone='" + principalPhone + '\'' +
- ", adminName='" + adminName + '\'' +
- ", adminPhone='" + adminPhone + '\'' +
- ", urgentPhoen='" + urgentPhoen + '\'' +
- ", setupTime=" + setupTime +
- ", identifier='" + identifier + '\'' +
- ", addressCode='" + addressCode + '\'' +
- ", businessScope='" + businessScope + '\'' +
- ", contactAddress='" + contactAddress + '\'' +
- ", documentAddress='" + documentAddress + '\'' +
- ", economicType='" + economicType + '\'' +
- ", regCapital='" + regCapital + '\'' +
- ", legalName='" + legalName + '\'' +
- ", legalId='" + legalId + '\'' +
- ", legalPhone='" + legalPhone + '\'' +
- ", legalPhotoUrl='" + legalPhotoUrl + '\'' +
- ", licensingAgency='" + licensingAgency + '\'' +
- ", licenseTime=" + licenseTime +
- ", licenseStartTime=" + licenseStartTime +
- ", licenseEndTime=" + licenseEndTime +
- ", licenseNumber='" + licenseNumber + '\'' +
- ", carNum=" + carNum +
- ", driverNum=" + driverNum +
- ", mac='" + mac + '\'' +
- ", state=" + state +
- ", flag=" + flag +
- ", upload=" + upload +
- ", insertTime=" + insertTime +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CompanyCity.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CompanyCity.java
deleted file mode 100644
index ee81ae0..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CompanyCity.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
-/**
- * 企业经营范围
- */
-@TableName("t_company_city")
-public class CompanyCity {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 省编号
- */
- @TableField("provinceCode")
- private String provinceCode;
- /**
- * 市编号
- */
- @TableField("cityCode")
- private String cityCode;
- /**
- * 区编号
- */
- @TableField("areaCode")
- private String areaCode;
- /**
- * 状态（1=正常，2=删除）
- */
- @TableField("state")
- private Integer state;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(String provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(String cityCode) {
- this.cityCode = cityCode;
- }
-
- public String getAreaCode() {
- return areaCode;
- }
-
- public void setAreaCode(String areaCode) {
- this.areaCode = areaCode;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- public String toString() {
- return "CompanyCity{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", provinceCode='" + provinceCode + '\'' +
- ", cityCode='" + cityCode + '\'' +
- ", areaCode='" + areaCode + '\'' +
- ", state=" + state +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
index 578d719..7c58371 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverService.java
+++ b/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;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
deleted file mode 100644
index 6deeb1c..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverWork.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
-import java.sql.Date;
-
-/**
- * 司机上下班记录
- */
-@TableName("t_driver_work")
-public class DriverWork {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 上班时间
- */
- @TableField("startTime")
- private Date startTime;
- /**
- * 下班时间
- */
- @TableField("endTime")
- private Date endTime;
- /**
- * 业务类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）
- */
- @TableField("type")
- private String type;
- /**
- * 上下班状态（1=上班，2=下班）
- */
- @TableField("state")
- private Integer state;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- public String toString() {
- return "DriverWork{" +
- "id=" + id +
- ", driverId=" + driverId +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", type=" + type +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCity.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCity.java
deleted file mode 100644
index 0cf1845..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCity.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-
-/**
- * 开通城市
- */
-@TableName("t_open_city")
-public class OpenCity extends BaseBean {
- /**
- * 城市编号（行政编号）
- */
- @TableField("code")
- private String code;
- /**
- * 经度
- */
- @TableField("lon")
- private Double lon;
- /**
- * 纬度
- */
- @TableField("lat")
- private Double lat;
- /**
- * 是否需要网约车资格（1：是，2：否）
- */
- @TableField("isQualifications")
- private Integer isQualifications;
- /**
- * 省名称
- */
- @TableField("areaName")
- private String areaName;
- /**
- * 市名称
- */
- @TableField("cityName")
- private String cityName;
- /**
- * 区县名称
- */
- @TableField("provinceName")
- private String provinceName;
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public Integer getIsQualifications() {
- return isQualifications;
- }
-
- public void setIsQualifications(Integer isQualifications) {
- this.isQualifications = isQualifications;
- }
-
- public String getAreaName() {
- return areaName;
- }
-
- public void setAreaName(String areaName) {
- this.areaName = areaName;
- }
-
- public String getCityName() {
- return cityName;
- }
-
- public void setCityName(String cityName) {
- this.cityName = cityName;
- }
-
- public String getProvinceName() {
- return provinceName;
- }
-
- public void setProvinceName(String provinceName) {
- this.provinceName = provinceName;
- }
-
- public Double getLon() {
- return lon;
- }
-
- public void setLon(Double lon) {
- this.lon = lon;
- }
-
- public Double getLat() {
- return lat;
- }
-
- public void setLat(Double lat) {
- this.lat = lat;
- }
-
- @Override
- public String toString() {
- return "OpenCity{" +
- "code='" + code + '\'' +
- ", lon=" + lon +
- ", lat=" + lat +
- ", isQualifications=" + isQualifications +
- ", areaName='" + areaName + '\'' +
- ", cityName='" + cityName + '\'' +
- ", provinceName='" + provinceName + '\'' +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java
deleted file mode 100644
index 8a56b05..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCityBusiness.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-
-/**
- * 开通城市业务类型
- */
-@TableName("t_open_city_business")
-public class OpenCityBusiness extends BaseBean {
- /**
- * 业务类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）
- */
- @TableField("businessType")
- private Integer businessType;
- /**
- * 排序
- */
- @TableField("sort")
- private Integer sort;
-
- public Integer getBusinessType() {
- return businessType;
- }
-
- public void setBusinessType(Integer businessType) {
- this.businessType = businessType;
- }
-
- public Integer getSort() {
- return sort;
- }
-
- public void setSort(Integer sort) {
- this.sort = sort;
- }
-
- @Override
- public String toString() {
- return "OpenCityBusiness{" +
- "businessType=" + businessType +
- ", sort=" + sort +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
index c6cfea2..e372cc1 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
+++ b/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;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
index 61542c8..9b07899 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderPosition.java
+++ b/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;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
index 5cd49e2..0ad04e9 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java
+++ b/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;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ServerCarModel.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ServerCarModel.java
deleted file mode 100644
index e12def7..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ServerCarModel.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
-import java.util.Date;
-
-/**
- * 服务车型设置
- */
-@TableName("t_server_carmodel")
-public class ServerCarModel {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 业务类型（1=专车，2=城际，3=包车）
- */
- @TableField("type")
- private Integer type;
- /**
- * 车型名称
- */
- @TableField("name")
- private String name;
- /**
- * 车型照片
- */
- @TableField("img")
- private String img;
- /**
- * 包车价格（100-300）
- */
- @TableField("price")
- private String price;
- /**
- * 状态（1=正常，2=冻结，3=删除）
- */
- @TableField("state")
- private Integer state;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImg() {
- return img;
- }
-
- public void setImg(String img) {
- this.img = img;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
- @Override
- public String toString() {
- return "ServerCarModel{" +
- "id=" + id +
- ", type=" + type +
- ", name='" + name + '\'' +
- ", img='" + img + '\'' +
- ", price='" + price + '\'' +
- ", state=" + state +
- ", insertTime=" + insertTime +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
deleted file mode 100644
index d287338..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.stylefeng.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
-/**
- * 服务价格规则
- */
-@TableName("t_system_price")
-public class SystemPrice {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 业务类型（1=专车/快车，2=出租车，3=机场专线，7=景区直通车，8=公务出行）
- */
- @TableField("type")
- private Integer type;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 服务车型设置
- */
- @TableField("serverCarModelId")
- private Integer serverCarModelId;
- /**
- * 价格规则，每个输入框为一个参数{"num1":1,"num2":2.3}
- */
- @TableField("content")
- private String content;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- @Override
- public String toString() {
- return "SystemPrice{" +
- "id=" + id +
- ", type=" + type +
- ", companyId=" + companyId +
- ", serverCarModelId=" + serverCarModelId +
- ", content='" + content + '\'' +
- '}';
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarServiceService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarServiceService.java
deleted file mode 100644
index ca38975..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarServiceService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.CarService;
-
-public interface ICarServiceService extends IService<CarService> {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyCityService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyCityService.java
deleted file mode 100644
index 8719561..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyCityService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.CompanyCity;
-
-public interface ICompanyCityService extends IService<CompanyCity> {
-
-
- /**
- * 根据经纬度获取所属企业
- * @param lon
- * @param lat
- * @return
- * @throws Exception
- */
- Company query(String lon, String lat) throws Exception;
-
-
- /**
- * 根据行政编号获取所有企业
- * @param code
- * @return
- * @throws Exception
- */
- Company query(String code) throws Exception;
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyService.java
deleted file mode 100644
index 396786d..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.Company;
-
-public interface ICompanyService extends IService<Company> {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index 3f7ae42..dde3fa2 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/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;
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverServiceService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverServiceService.java
deleted file mode 100644
index 930ec41..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverServiceService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.DriverService;
-
-import java.util.List;
-
-public interface IDriverServiceService extends IService<DriverService> {
-
-
- /**
- * 获取司机服务业务
- * @param driverId
- * @param type
- * @return
- * @throws Exception
- */
- List<DriverService> query(Integer driverId, Integer... type) throws Exception;
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverWorkService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverWorkService.java
deleted file mode 100644
index eb29af0..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverWorkService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.DriverWork;
-
-public interface IDriverWorkService extends IService<DriverWork> {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityBusinessService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityBusinessService.java
deleted file mode 100644
index cea641f..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityBusinessService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.OpenCityBusiness;
-import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
-
-import java.util.List;
-
-public interface IOpenCityBusinessService extends IService<OpenCityBusiness> {
-
-
- /**
- * 获取业务类型
- * @param province 省名
- * @param city 市名称
- * @param district 区县名称
- * @return
- * @throws Exception
- */
- List<BaseWarpper> queryBusiness(String province, String city, String district) throws Exception;
-
-
- /**
- * 根据选择的城市id获取业务类型
- * @param id
- * @return
- * @throws Exception
- */
- List<BaseWarpper> queryBusinessById(Integer id) throws Exception;
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java
deleted file mode 100644
index 7134db9..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.OpenCity;
-import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
-
-import java.util.List;
-
-public interface IOpenCityService extends IService<OpenCity> {
-
-
- /**
- * 获取开通城市列表
- * @return
- * @throws Exception
- */
- List<BaseWarpper> queryOpenCity() throws Exception;
-
-
- /**
- * 判断是否是开通城市
- * @param code
- * @return
- * @throws Exception
- */
- boolean openCity(String code) throws Exception;
-
-
- OpenCity openCity1(String code) throws Exception;
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java
index 315b4cc..a9fc0a0 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderPrivateCarService.java
+++ b/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;
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java
index 8136445..8f0bbb6 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderTaxiService.java
+++ b/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;
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java
deleted file mode 100644
index de7da0c..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IServerCarModelService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.stylefeng.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.stylefeng.guns.modular.system.model.ServerCarModel;
-import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.warpper.ServerCarModelWarpper;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IServerCarModelService extends IService<ServerCarModel> {
-
-
- /**
- * 根据起点和终点获取车型和金额
- * @param startLonLat
- * @param endLonLat
- * @param type 业务类型
- * @return
- * @throws Exception
- */
- ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type) throws Exception;
-
-
- /**
- * 获取业务类型对应的所有车型
- * @param type
- * @return
- */
- List<Map<String, Object>> queryServerCarModels(Integer type);
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceServiceImpl.java
deleted file mode 100644
index 76410cb..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.CarServiceMapper;
-import com.stylefeng.guns.modular.system.model.CarService;
-import com.stylefeng.guns.modular.system.service.ICarServiceService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CarServiceServiceImpl extends ServiceImpl<CarServiceMapper, CarService> implements ICarServiceService {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
deleted file mode 100644
index 12ac48f..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.CompanyCityMapper;
-import com.stylefeng.guns.modular.system.dao.CompanyMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.CompanyCity;
-import com.stylefeng.guns.modular.system.service.ICompanyCityService;
-import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-
-@Service
-public class CompanyCityServiceImpl extends ServiceImpl<CompanyCityMapper, CompanyCity> implements ICompanyCityService {
-
- @Resource
- private CompanyMapper companyMapper;
-
- @Autowired
- private GDMapGeocodingUtil gdMapGeocodingUtil;
-
-
- /**
- * 根据经纬度获取所属企业
- * @param lon
- * @param lat
- * @return
- * @throws Exception
- */
- @Override
- public Company query(String lon, String lat) throws Exception {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(String.valueOf(lon), String.valueOf(lat));
- String districtCode = geocode.get("districtCode");
- Company query = this.query(districtCode);
- return query;
- }
-
-
- /**
- * 根据行政编号获取所属企业
- * @param code
- * @return
- * @throws Exception
- */
- @Override
- public Company query(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
- List<Company> query = companyMapper.query(province, city, code);
- if(query.size() == 0){
- query = companyMapper.query(province, city, null);
- }
- if(query.size() == 0){
- query = companyMapper.query(province, null, null);
- }
- for(int i = 3; i > 0; i--){
- for(Company company : query){
- if(company.getType() == i){
- return company;
- }
- }
- }
- return null;
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyServiceImpl.java
deleted file mode 100644
index b305d08..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.CompanyMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.service.ICompanyService;
-import org.springframework.stereotype.Service;
-
-
-@Service
-public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements ICompanyService {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index d860977..3998f97 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/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;
}
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceServiceImpl.java
deleted file mode 100644
index d77a3af..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.DriverServiceMapper;
-import com.stylefeng.guns.modular.system.model.DriverService;
-import com.stylefeng.guns.modular.system.service.IDriverServiceService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-@Service
-public class DriverServiceServiceImpl extends ServiceImpl<DriverServiceMapper, DriverService> implements IDriverServiceService {
-
- @Resource
- private DriverServiceMapper driverServiceMapper;
-
-
- /**
- * 获取司机服务业务
- * @param driverId
- * @param type
- * @return
- * @throws Exception
- */
- @Override
- public List<DriverService> query(Integer driverId, Integer... type) throws Exception {
- return driverServiceMapper.queryBusiness(driverId, type);
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverWorkServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverWorkServiceImpl.java
deleted file mode 100644
index 546f86a..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverWorkServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.DriverWorkMapper;
-import com.stylefeng.guns.modular.system.model.DriverWork;
-import com.stylefeng.guns.modular.system.service.IDriverWorkService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DriverWorkServiceImpl extends ServiceImpl<DriverWorkMapper, DriverWork> implements IDriverWorkService {
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java
deleted file mode 100644
index c10d83e..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.dao.OpenCityBusinessMapper;
-import com.stylefeng.guns.modular.system.model.OpenCityBusiness;
-import com.stylefeng.guns.modular.system.service.IOpenCityBusinessService;
-import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-
-@Service
-public class OpenCityBusinessServiceImpl extends ServiceImpl<OpenCityBusinessMapper, OpenCityBusiness> implements IOpenCityBusinessService {
-
- @Resource
- private OpenCityBusinessMapper openCityBusinessMapper;
-
-
- /**
- * 获取业务类型
- * @param province 省名
- * @param city 市名称
- * @param district 区县名称
- * @return
- * @throws Exception
- */
- @Override
- public List<BaseWarpper> queryBusiness(String province, String city, String district) throws Exception {
- List<OpenCityBusiness> openCityBusinesses = openCityBusinessMapper.queryBusiness(province, city, district);
- if(openCityBusinesses.size() == 0){
- openCityBusinesses = openCityBusinessMapper.queryBusiness(province, city, null);
- }
- if(openCityBusinesses.size() == 0){
- openCityBusinesses = openCityBusinessMapper.queryBusiness(province, null, null);
- }
- List<BaseWarpper> list = new ArrayList<>();
- for(OpenCityBusiness b : openCityBusinesses){
- BaseWarpper baseWarpper = new BaseWarpper();
- switch (b.getBusinessType()){
- case 1:
- baseWarpper.setName("专车");
- baseWarpper.setId(1);
- break;
- case 2:
- baseWarpper.setName("出租车");
- baseWarpper.setId(2);
- break;
- case 3:
- baseWarpper.setName("跨城出行");
- baseWarpper.setId(3);
- break;
- case 4:
- baseWarpper.setName("同城小件物流");
- baseWarpper.setId(4);
- break;
- case 5:
- baseWarpper.setName("跨城小件物流");
- baseWarpper.setId(5);
- break;
- case 6:
- baseWarpper.setName("包车");
- baseWarpper.setId(6);
- break;
- case 7:
- baseWarpper.setName("助老模式");
- baseWarpper.setId(7);
- break;
- }
- list.add(baseWarpper);
- }
- return list;
- }
-
-
- /**
- * 根据开通的城市id获取业务类型
- * @param id
- * @return
- * @throws Exception
- */
- @Override
- public List<BaseWarpper> queryBusinessById(Integer id) throws Exception {
- List<OpenCityBusiness> openCityBusinesses = openCityBusinessMapper.queryBusinessById(id);
- List<BaseWarpper> list = new ArrayList<>();
- for(OpenCityBusiness b : openCityBusinesses){
- BaseWarpper baseWarpper = new BaseWarpper();
- switch (b.getBusinessType()){
- case 1:
- baseWarpper.setName("专车");
- baseWarpper.setId(1);
- break;
- case 2:
- baseWarpper.setName("出租车");
- baseWarpper.setId(2);
- break;
- case 3:
- baseWarpper.setName("跨城出行");
- baseWarpper.setId(3);
- break;
- case 4:
- baseWarpper.setName("同城小件物流");
- baseWarpper.setId(4);
- break;
- case 5:
- baseWarpper.setName("跨城小件物流");
- baseWarpper.setId(5);
- break;
- case 6:
- baseWarpper.setName("包车");
- baseWarpper.setId(6);
- break;
- case 7:
- baseWarpper.setName("助老模式");
- baseWarpper.setId(7);
- break;
- }
- list.add(baseWarpper);
- }
- return list;
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
deleted file mode 100644
index 5627905..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.dao.OpenCityMapper;
-import com.stylefeng.guns.modular.system.model.OpenCity;
-import com.stylefeng.guns.modular.system.service.IOpenCityService;
-import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-
-@Service
-public class OpenCityServiceImpl extends ServiceImpl<OpenCityMapper, OpenCity> implements IOpenCityService {
-
- @Resource
- private OpenCityMapper openCityMapper;
-
-
- /**
- * 获取开通城市列表
- * @return
- * @throws Exception
- */
- @Override
- public List<BaseWarpper> queryOpenCity() throws Exception {
- List<OpenCity> openCities = openCityMapper.queryOpenCity();
- List<BaseWarpper> list = new ArrayList<>();
- for(OpenCity c : openCities){
- BaseWarpper baseWarpper = new BaseWarpper();
- baseWarpper.setId(c.getId());
- baseWarpper.setName(ToolUtil.isEmpty(c.getProvinceName()) ?
- (ToolUtil.isEmpty(c.getCityName()) ? (ToolUtil.isEmpty(c.getAreaName()) ? "" : c.getAreaName()) : c.getCityName()) : c.getProvinceName());
- baseWarpper.setLon(null != c.getLon() ? c.getLon() : 0);
- baseWarpper.setLat(null != c.getLat() ? c.getLat() : 0);
- baseWarpper.setContent(c.getCode());
- baseWarpper.setName(baseWarpper.getName().replaceAll("市辖区", ""));
- list.add(baseWarpper);
- }
- return list;
- }
-
-
- /**
- * 判断是否是开通城市
- * @param code
- * @return
- * @throws Exception
- */
- @Override
- public boolean openCity(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
- List<OpenCity> openCities = openCityMapper.queryByCode(code);
- if(openCities.size() == 0){
- openCities = openCityMapper.queryByCode(city);
- }
- if(openCities.size() == 0){
- openCities = openCityMapper.queryByCode(province);
- }
- if(openCities.size() == 0){
- return false;
- }
- return true;
- }
-
- @Override
- public OpenCity openCity1(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
- List<OpenCity> openCities = openCityMapper.queryByCode(code);
- if(openCities.size() == 0){
- openCities = openCityMapper.queryByCode(city);
- }
- if(openCities.size() == 0){
- openCities = openCityMapper.queryByCode(province);
- }
- if(openCities.size() == 0){
- return null;
- }
- return openCities.get(0);
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java
index 6912f6e..4d6d71b 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCrossCityServiceImpl.java
+++ b/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"));
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java
index e194a17..44a1879 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPrivateCarServiceImpl.java
+++ b/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);
}
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java
index d663fc7..a78d7bf 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTaxiServiceImpl.java
+++ b/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);
- }
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
deleted file mode 100644
index c5e187a..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package com.stylefeng.guns.modular.system.service.impl;
-
-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.modular.system.dao.ServerCarModelMapper;
-import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.OpenCity;
-import com.stylefeng.guns.modular.system.model.OpenCityBusiness;
-import com.stylefeng.guns.modular.system.model.ServerCarModel;
-import com.stylefeng.guns.modular.system.service.ICompanyCityService;
-import com.stylefeng.guns.modular.system.service.IOpenCityBusinessService;
-import com.stylefeng.guns.modular.system.service.IOpenCityService;
-import com.stylefeng.guns.modular.system.service.IServerCarModelService;
-import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
-import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
-import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.warpper.ServerCarModelWarpper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.*;
-
-
-@Service
-public class ServerCarModelServiceImpl extends ServiceImpl<ServerCarModelMapper, ServerCarModel> implements IServerCarModelService {
-
- @Resource
- private ServerCarModelMapper serverCarModelMapper;
-
- @Resource
- private SystemPriceMapper systemPriceMapper;
-
- @Autowired
- private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
- @Autowired
- private GDMapGeocodingUtil gdMapGeocodingUtil;
-
- @Autowired
- private ICompanyCityService companyCityService;
-
- @Autowired
- private IOpenCityService openCityService;
-
- @Autowired
- private IOpenCityBusinessService openCityBusinessService;
-
-
-
-
-
-
- /**
- * 根据起点和终点获取车型
- * @param startLonLat
- * @param endLonLat
- * @param type 业务类型
- * @return
- * @throws Exception
- */
- @Override
- public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type) throws Exception {
- //查找与起点匹配的企业（经营范围）
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(startLonLat.split(",")[0], startLonLat.split(",")[1]);
- Company query = companyCityService.query(geocode.get("districtCode"));
- if(null == query){
- return ResultUtil.error("起点暂无企业提供服务", new ArrayList<>());
- }
- if(type == 1 && query.getIsSpe() == 2){
- return ResultUtil.success(new ArrayList<>());
- }
- OpenCity openCity = openCityService.openCity1(geocode.get("districtCode"));
- if(null != openCity){
- OpenCityBusiness openCityBusiness = openCityBusinessService.selectOne(new EntityWrapper<OpenCityBusiness>().eq("businessType", 1).eq("openCityId", openCity.getId()).ne("flag", 3));
- if(null == openCityBusiness){
- return ResultUtil.success(new ArrayList<>());
- }
- }
-
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(startLonLat, endLonLat, 1);
- if(null == distance){
- return ResultUtil.error("获取预估距离出错", new ArrayList<>());
- }
- String distance1 = distance.get("distance");//距离（米）
- double distance1_ = Double.valueOf(distance1).doubleValue();
- String duration = distance.get("duration");//时间（秒）
- long duration_ = Long.valueOf(duration).longValue();
-
- List<ServerCarModelWarpper> price = this.getPrice(query.getId(), distance1_, duration_, 0, 1);
-// if(price.size() == 0){
-// return ResultUtil.error("未获取到可服务的车型", new ArrayList<>());
-// }
- return ResultUtil.success(price);
- }
-
-
- /**
- * 获取业务类型对应的所有服务车型
- * @param type
- * @return
- */
- @Override
- public List<Map<String, Object>> queryServerCarModels(Integer type) {
- return serverCarModelMapper.queryServerCarModel(type);
- }
-
-
- /**
- * 计算价格
- * @param companyId
- * @param distance
- * @param duration
- * @param wait
- * @param type
- * @return
- * @throws Exception
- */
- public List<ServerCarModelWarpper> getPrice(Integer companyId, double distance, long duration, long wait, Integer type) throws Exception {
- List<Map<String, Object>> list = serverCarModelMapper.queryServerCarModel(type);
- List<ServerCarModelWarpper> data = new ArrayList<>();
- for(Map<String, Object> map : list){
- Map<String, Object> query1 = systemPriceMapper.query(companyId, type, Integer.valueOf(map.get("id").toString()));
- if(null == query1){//排除没有设置价格的车型
- continue;
- }
- //开始根据不同的方式计算金额
- double amount = 0;
- if(type == 1){//专车
- JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());
- Double num1 = jsonObject.getDouble("num1");//起步价（元）
- Double num2 = jsonObject.getDouble("num2");//起步公里（公里）
- Double num3 = jsonObject.getDouble("num3");//起步时间（分钟）
- Double num4 = jsonObject.getDouble("num4");//里程费（元）
- Double num5 = jsonObject.getDouble("num5");//时长费（分钟）
- Double num6 = jsonObject.getDouble("num6");//等待费（分钟）
- Double num7 = jsonObject.getDouble("num7");//等待费（元）
- Double num8 = jsonObject.getDouble("num8");//远途费（公里）
- Double num9 = jsonObject.getDouble("num9");//远途费（公里）
- Double num10 = jsonObject.getDouble("num10");//远途费（元）
- Double num11 = jsonObject.getDouble("num11");//远途费（公里）
- Double num12 = jsonObject.getDouble("num12");//远途费（公里）
- Double num13 = jsonObject.getDouble("num13");//远途费（元）
- Double num14 = jsonObject.getDouble("num14");//远途费（公里）
- Double num15 = jsonObject.getDouble("num15");//远途费（元）
- String num16 = jsonObject.getString("num16");//夜间费（开始时间）
- Double num17 = jsonObject.getDouble("num17");//夜间费（元）
- Double num18 = jsonObject.getDouble("num18");//夜间费（元）
- Double num19 = jsonObject.getDouble("num19");//夜间费（元）
- Double num20 = jsonObject.getDouble("num20");//夜间费（元）
- Double num21 = jsonObject.getDouble("num21");//夜间费（元）
- Double num22 = jsonObject.getDouble("num22");//夜间费（元）
- String num23 = jsonObject.getString("num23");//高峰费（开始时间）
- String num24 = jsonObject.getString("num24");//高峰费（开始时间）
- Double num25 = jsonObject.getDouble("num25");//高峰费（元）
- Double num26 = jsonObject.getDouble("num26");//高峰费（元）
- Double num27 = jsonObject.getDouble("num27");//高峰费（元）
- Double num28 = jsonObject.getDouble("num28");//高峰费（元）
- Double num29 = jsonObject.getDouble("num29");//高峰费（元）
- Double num30 = jsonObject.getDouble("num30");//高峰费（元）
-
- Date date = new Date();
- double d = distance / 1000;//实际公里
- double t = duration / 60;//实际时间
-
- double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
- double t1 = (t - num3) < 0 ? 0 : t - num3;//超过起步分钟数的时间
- double yt1 = 0;//远途1段
- double yt2 = 0;//远途2段
- double yt3 = 0;//远途3段
-
-
- //夜间服务处理逻辑
- Calendar s = Calendar.getInstance();
- s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
- s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
-
- Calendar e = Calendar.getInstance();
- e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
-
- if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(d > num8.doubleValue()){
- yt1 = num20 * (num9 - num8);
- }
- if(d > num11.doubleValue()){
- yt2 = num21 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num22 * (d - num14);
- }
- amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3;
- ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
- serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setMileage(d);
- serverCarModelWarpper.setDuration(t);
- data.add(serverCarModelWarpper);
- continue;
- }
-
-
- //高峰时段处理逻辑
- Calendar s1 = Calendar.getInstance();
- s1.setTime(date);
- s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[0].split(":")[0]));
- s1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[0].split(":")[1]));
-
- Calendar e1 = Calendar.getInstance();
- e1.setTime(date);
- e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[1].split(":")[0]));
- e1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[1].split(":")[1]));
-
- Calendar s2 = Calendar.getInstance();
- s2.setTime(date);
- s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[0].split(":")[0]));
- s2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[0].split(":")[1]));
-
- Calendar e2 = Calendar.getInstance();
- e2.setTime(date);
- e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[1].split(":")[0]));
- e2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[1].split(":")[1]));
-
- if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
- if(d > num8.doubleValue()){
- yt1 = num28 * (num9 - num8);
- }
- if(d > num11.doubleValue()){
- yt2 = num29 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num30 * (d - num14);
- }
- amount = num25 + (d1 * num26) + (t1 * num27) + (wait * num7) + yt1 + yt2 + yt3;
- ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
- serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setMileage(d);
- serverCarModelWarpper.setDuration(t);
- data.add(serverCarModelWarpper);
- continue;
- }
-
- //其他时间段的计算
- if(d > num8.doubleValue()){
- yt1 = num10 * (num9 - num8);
- }
- if(d > num11.doubleValue()){
- yt2 = num13 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num15 * (d - num14);
- }
- amount = num1 + (d1 * num4) + (t1 * num5) + (wait * num7) + yt1 + yt2 + yt3;
- ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
- serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setMileage(d);
- serverCarModelWarpper.setDuration(t);
- data.add(serverCarModelWarpper);
- continue;
- }
- }
- return data;
- }
-
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index b8efc38..aaa844a 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -11,7 +11,7 @@
@Service
-public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements IUserInfoService {
+public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements IUserInfoService {
@Resource
private UserInfoMapper userInfoMapper;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
index 10ab947..ddcaead 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
+++ b/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格式。
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java
index 37b568a..5ef83bd 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java
+++ b/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{
+ map1.put("code", jsonObject.getString("code"));
+ map1.put("msg", jsonObject.getString("message"));
+ }
}else{
- map.put("code", "200");
- map.put("telX", bindAxbResponse.getBody().getSecretBindDTO().getSecretNo());
- map.put("bindId", bindAxbResponse.getBody().getSecretBindDTO().getSubsId());
+ map1.put("code", "-1");
+ map1.put("msg", post);
}
- return map;
+
+ 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;
}
}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java
index 26e63e3..7e25e4c 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java
+++ b/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;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
index f84c6fe..a65a160 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
+++ b/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();
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java
index d831ec9..c488e51 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java
+++ b/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;
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java
index bdb7a69..ca8d6d0 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ICBCPayUtil.java
+++ b/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());
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index d5d47ff..1f693a5 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/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"));
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
index c4ff6fc..533a93d 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
+++ b/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出错了");
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTaxiWarpper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTaxiWarpper.java
deleted file mode 100644
index ea31d2b..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTaxiWarpper.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.stylefeng.guns.modular.system.warpper;
-
-import com.stylefeng.guns.modular.system.model.OrderTaxi;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-
-@ApiModel("出租车订单")
-public class OrderTaxiWarpper {
- @ApiModelProperty(dataType = "int", required = true, value = "司机id")
- private Integer driverId;
- @ApiModelProperty(dataType = "double", required = true, value = "下单地点经度")
- private Double placementLon;
- @ApiModelProperty(dataType = "double", required = true, value = "下单地点纬度")
- private Double placementLat;
- @ApiModelProperty(dataType = "double", required = true, value = "起点经度")
- private Double startLon;
- @ApiModelProperty(dataType = "double", required = true, value = "起点纬度")
- private Double startLat;
- @ApiModelProperty(dataType = "double", required = true, value = "起点详情地址")
- private String startAddress;
- @ApiModelProperty(dataType = "double", required = true, value = "终点经度")
- private Double endLon;
- @ApiModelProperty(dataType = "double", required = true, value = "终点纬度")
- private Double endLat;
- @ApiModelProperty(dataType = "double", required = true, value = "终点详细地址")
- private String endAddress;
- @ApiModelProperty(dataType = "String", required = true, value = "乘车人姓名")
- private String passengers;
- @ApiModelProperty(dataType = "String", required = true, value = "乘车人电话")
- private String passengersPhone;
- @ApiModelProperty(dataType = "string", required = true, value = "出行时间(2020-06-06 08:47)")
- private Date travelTime;
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Double getPlacementLon() {
- return placementLon;
- }
-
- public void setPlacementLon(Double placementLon) {
- this.placementLon = placementLon;
- }
-
- public Double getPlacementLat() {
- return placementLat;
- }
-
- public void setPlacementLat(Double placementLat) {
- this.placementLat = placementLat;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public Double getEndLon() {
- return endLon;
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon;
- }
-
- public Double getEndLat() {
- return endLat;
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat;
- }
-
- public String getPassengers() {
- return passengers;
- }
-
- public void setPassengers(String passengers) {
- this.passengers = passengers;
- }
-
- public String getPassengersPhone() {
- return passengersPhone;
- }
-
- public void setPassengersPhone(String passengersPhone) {
- this.passengersPhone = passengersPhone;
- }
-
- public Date getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(Date travelTime) {
- this.travelTime = travelTime;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- @Override
- public String toString() {
- return "OrderTaxiWarpper{" +
- "driverId=" + driverId +
- ", placementLon=" + placementLon +
- ", placementLat=" + placementLat +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", startAddress='" + startAddress + '\'' +
- ", endLon=" + endLon +
- ", endLat=" + endLat +
- ", endAddress='" + endAddress + '\'' +
- ", passengers='" + passengers + '\'' +
- ", passengersPhone='" + passengersPhone + '\'' +
- ", travelTime='" + travelTime + '\'' +
- '}';
- }
-
- public static OrderTaxi getOrderTaxi(OrderTaxiWarpper orderTaxiWarpper){
- OrderTaxi orderTaxi = new OrderTaxi();
- orderTaxi.setDriverId(orderTaxiWarpper.getDriverId());
- orderTaxi.setType(1);
- orderTaxi.setPlacementLon(orderTaxiWarpper.getPlacementLon());
- orderTaxi.setPlacementLat(orderTaxiWarpper.getPlacementLat());
- orderTaxi.setStartLon(orderTaxiWarpper.getStartLon());
- orderTaxi.setStartLat(orderTaxiWarpper.getStartLat());
- orderTaxi.setEndLon(orderTaxiWarpper.getEndLon());
- orderTaxi.setEndLat(orderTaxiWarpper.getEndLat());
- orderTaxi.setTipMoney(0D);
- orderTaxi.setSubstitute(0);
- orderTaxi.setPassengers(orderTaxiWarpper.getPassengers());
- orderTaxi.setPassengersPhone(orderTaxiWarpper.getPassengersPhone());
- orderTaxi.setOrderType(1);
- if(orderTaxiWarpper.getTravelTime().getTime() > (System.currentTimeMillis() + 600000)){
- orderTaxi.setOrderType(2);
- }
- orderTaxi.setOrderSource(5);
- orderTaxi.setTravelTime(orderTaxiWarpper.getTravelTime());
- orderTaxi.setStartAddress(orderTaxiWarpper.getStartAddress());
- orderTaxi.setEndAddress(orderTaxiWarpper.getEndAddress());
- return orderTaxi;
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
deleted file mode 100644
index 66ff9f4..0000000
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.stylefeng.guns.modular.system.warpper;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@ApiModel("服务车型")
-public class ServerCarModelWarpper {
- @ApiModelProperty("车型id")
- private Integer id;
- @ApiModelProperty("车型名称")
- private String name;
- @ApiModelProperty("车型照片")
- private String img;
- @ApiModelProperty("预估金额")
- private Double amount;
- @ApiModelProperty("包车的价格")
- private String price;
- @ApiModelProperty("预估里程（公里）")
- private Double mileage;
- @ApiModelProperty("预估时间（分钟）")
- private Double duration;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImg() {
- return img;
- }
-
- public void setImg(String img) {
- this.img = img;
- }
-
- public Double getAmount() {
- return amount;
- }
-
- public void setAmount(Double amount) {
- this.amount = amount;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
- public Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Double getDuration() {
- return duration;
- }
-
- public void setDuration(Double duration) {
- this.duration = duration;
- }
-
- @Override
- public String toString() {
- return "ServerCarModelWarpper{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", img='" + img + '\'' +
- ", amount=" + amount +
- ", price='" + price + '\'' +
- ", mileage=" + mileage +
- ", duration=" + duration +
- '}';
- }
-
- public static ServerCarModelWarpper getServerCarModelWarpper(Map<String, Object> map){
- ServerCarModelWarpper serverCarModelWarpper = new ServerCarModelWarpper();
- if(null != map){
- serverCarModelWarpper.setId(null != map.get("id") ? Integer.valueOf(map.get("id").toString()) : 0);
- serverCarModelWarpper.setName(null != map.get("name") ? map.get("name").toString() : "");
- serverCarModelWarpper.setImg(null != map.get("img") ? map.get("img").toString() : "");
- serverCarModelWarpper.setAmount(null != map.get("amount") ? Double.valueOf(map.get("amount").toString()) : 0);
- serverCarModelWarpper.setPrice(null != map.get("price") ? map.get("price").toString() : "");
- serverCarModelWarpper.setMileage(null != map.get("mileage") ? Double.valueOf(map.get("mileage").toString()) : 0);
- serverCarModelWarpper.setDuration(null != map.get("duration") ? Double.valueOf(map.get("duration").toString()) : 0);
- }
- return serverCarModelWarpper;
- }
-
-
- public static List<ServerCarModelWarpper>getServerCarModelWarppers(List<Map<String, Object>> list){
- List<ServerCarModelWarpper> data = new ArrayList<>();
- if(null != list){
- for(Map<String, Object> map : list){
- data.add(ServerCarModelWarpper.getServerCarModelWarpper(map));
- }
- }
- return data;
- }
-}
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png
index 41c5c08..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png
index 7a80132..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png
index 7dea7f2..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/header-profile.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png
index 90ed42b..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/patterns/shattered.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png
index 3611ae4..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png
index ffe4d7d..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png
index cf62300..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png
index 3bda5be..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png
index 8356fc5..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png
index 68ccb3c..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png
index d6ff36d..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png
index 9eff506..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png
index d7ba6d0..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png
index 753e2bf..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png
index 0c5eccd..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png
index 070b835..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png
index 532b037..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png
index a8f3a86..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png
index 4db73cd..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif
index d561d36..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif
index e8c2892..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif
index 50c94fd..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png
index ffda01e..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/favicon.ico b/DispatchTravel/guns-admin/src/main/webapp/static/favicon.ico
index fe6cf7a..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/favicon.ico
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/favicon.ico
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf
index 681bdd4..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot
index a30335d..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf
index d7994e1..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff
index 6fd4ede..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2 b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2
index 5560193..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
index b93a495..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
index 1413fc6..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
index 9e61285..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2 b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2
index 64539b5..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/bg.png b/DispatchTravel/guns-admin/src/main/webapp/static/img/bg.png
index 73d102d..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/bg.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/bg.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/boy.gif b/DispatchTravel/guns-admin/src/main/webapp/static/img/boy.gif
index e1ba77e..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/boy.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/boy.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/girl.gif b/DispatchTravel/guns-admin/src/main/webapp/static/img/girl.gif
index 8ef9a59..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/girl.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/girl.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/icons.png b/DispatchTravel/guns-admin/src/main/webapp/static/img/icons.png
index 12e4700..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/icons.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/icons.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif b/DispatchTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif
index 6fba776..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/loading-upload.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/locked.png b/DispatchTravel/guns-admin/src/main/webapp/static/img/locked.png
index c831c1f..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/locked.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/locked.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/img/user.png b/DispatchTravel/guns-admin/src/main/webapp/static/img/user.png
index 7f77fd0..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/img/user.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/img/user.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot
index c861caa..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf
index 0bd6c4a..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff
index bfe5599..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png
index bbbb669..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png
index 3e17da8..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif
index 6f3c953..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif
index db3a483..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif
index 5bb90fd..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif
Binary files differ
diff --git a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf
index bd75d60..e69de29 100644
--- a/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf
+++ b/DispatchTravel/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf
Binary files differ
--
Gitblit v1.7.1