java/Robotaxi.git

			@@ -11,6 +11,7 @@
			import com.xiaopeng.api.dto.map.RouteStaleCheckDto;
			import com.xiaopeng.api.dto.map.SelectNavigationRouteDto;
			import com.xiaopeng.api.enums.RouteStrategyKind;
			import com.xiaopeng.api.feignClient.account.UserRoutePlanRuleClient;
			import com.xiaopeng.api.feignClient.account.XpAppUserClient;
			import com.xiaopeng.api.feignClient.account.XpAppUserCouponClient;
			import com.xiaopeng.api.feignClient.map.XpMapClient;
			@@ -18,6 +19,7 @@
			import com.xiaopeng.api.feignClient.order.XpOrderClient;
			import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient;
			import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
			import com.xiaopeng.api.model.account.XpUserRoutePlanRule;
			import com.xiaopeng.api.model.operation.*;
			import com.xiaopeng.api.model.order.XpOrder;
			import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
			@@ -137,6 +139,9 @@
			private GDMapGeocodingUtil gdMapGeocodingUtil;
			@Resource
			private XpPointClient xpPointClient;

			@Resource
			private UserRoutePlanRuleClient userRoutePlanRuleClient;

			@Value("${navigation.route.stale-seconds:60}")
			private int navigationStaleSeconds;
			@@ -659,7 +664,16 @@
			XpOpenCity xpOpenCity = openCities;
			dto.setOpenCityId(xpOpenCity.getId());
			xpOrder.setCityCode(xpOpenCity.getCityCode());
			XpRoutePlan xpRoutePlan = xpRoutePlanMapper.selectOne(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getAuditStatus, 2).eq(XpRoutePlan::getCityCode, xpOpenCity.getCityCode()));
			XpUserRoutePlanRule xpUserRoutePlanRule = userRoutePlanRuleClient.getXpUserRoutePlanRule(uid).getData();
			XpRoutePlan xpRoutePlan = null;
			if(null != xpUserRoutePlanRule){
			xpRoutePlan = xpRoutePlanMapper.selectOne(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getAuditStatus, 2)
			.eq(XpRoutePlan::getCityCode, xpOpenCity.getCityCode()).eq(XpRoutePlan::getRoutePlanRule, xpUserRoutePlanRule.getRoutePlanRule()));
			xpRoutePlanMapper.selectById(xpUserRoutePlanRule.getRoutePlanRule());
			}else{
			xpRoutePlan = xpRoutePlanMapper.selectOne(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getAuditStatus, 2)
			.eq(XpRoutePlan::getCityCode, xpOpenCity.getCityCode()).last(" limit 1"));
			}

			Integer distance = 0;
			Integer duration = 0;

	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/dto/XpOrderDto.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -48,10 +48,6 @@
			@NotNull(message = "下单地址不能为空")
			private String placementAddress;

			@ApiModelProperty("路线规划规则")
			@NotNull(message = "路线规划规则不能为空")
			private Integer routePlanRule;

			@ApiModelProperty("用户优惠券主键：null 或 0 表示不使用券；>0 为具体券 id")
			private Long userCouponId;