java/IgoTravel.git

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson.JSONArray;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.plugins.Page;
			import com.google.gson.Gson;
			import com.stylefeng.guns.core.base.controller.BaseController;
			import com.stylefeng.guns.core.common.constant.factory.PageFactory;
			import com.stylefeng.guns.core.shiro.ShiroKit;
			@@ -13,6 +14,7 @@
			import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
			import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
			import com.stylefeng.guns.modular.system.util.PushURL;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			@@ -61,6 +63,9 @@

			@Value("${filePath}")
			private String filePath;

			@Autowired
			private FleetEngineUtil fleetEngineUtil;



			@@ -295,13 +300,21 @@
			OrderCancel orderCancel = new OrderCancel();
			orderCancel.setOrderId(tOrderPrivateCarId);
			orderCancel.setOrderType(1);
			orderCancel.setReason("平台取消订单");
			orderCancel.setRemark("平台取消订单");
			orderCancel.setReason("The platform cancels the order");
			orderCancel.setRemark("The platform cancels the order");
			orderCancel.setUserType(2);
			orderCancel.setState(2);
			orderCancel.setInsertTime(new Date());
			orderCancelMapper.insert(orderCancel);


			//修改行程信息
			try {
			fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderPrivateCar.getTripId(), null, null, null, null);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}


			//增加推送
			Map<String,String> map = new HashMap<>();
			map.put("id", tOrderPrivateCar.getId().toString());