java/IgoTravel.git

			@@ -5,9 +5,10 @@
			import com.stylefeng.guns.core.common.constant.factory.PageFactory;
			import com.stylefeng.guns.core.shiro.ShiroKit;
			import com.stylefeng.guns.core.util.SinataUtil;
			import com.stylefeng.guns.modular.system.model.TDriver;
			import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
			import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.ITDriverService;
			import com.stylefeng.guns.modular.system.service.ITUserService;
			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;
			@@ -19,9 +20,10 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import com.stylefeng.guns.core.log.LogObjectHolder;
			import org.springframework.web.bind.annotation.RequestParam;
			import com.stylefeng.guns.modular.system.model.TOrderLogistics;
			import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;

			import javax.annotation.Resource;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.Map;

			@@ -42,6 +44,12 @@

			@Autowired
			private FleetEngineUtil fleetEngineUtil;

			@Resource
			private ITUserService userService;

			@Resource
			private OrderCancelMapper orderCancelMapper;

			/**
			* 跳转到小件物流订单首页
			@@ -117,7 +125,19 @@

			tOrderLogistics.setState(10);
			tOrderLogisticsService.updateById(tOrderLogistics);


			TUser tUser = userService.selectById(tOrderLogistics.getUserId());
			Integer language = tUser.getLanguage();
			OrderCancel orderCancel = new OrderCancel();
			orderCancel.setOrderId(tOrderLogisticsId);
			orderCancel.setOrderType(4);
			orderCancel.setReason(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande");
			orderCancel.setRemark(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande");
			orderCancel.setUserType(2);
			orderCancel.setState(2);
			orderCancel.setInsertTime(new Date());
			orderCancelMapper.insert(orderCancel);

			//修改行程信息
			try {
			fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);