java/Robotaxi.git

			@@ -29,4 +29,6 @@
			@ApiModelProperty(value = "订单行驶时间")
			private BigDecimal time;



			}

			@@ -86,15 +86,19 @@

			<if test="query.sortType != null">
			<if test="query.sortType == 1">
			order by t1.task_urgency_level, t1.create_time desc
			<if test="query.sortRule == 1">
			order by t1.task_urgency_level asc, t1.create_time desc
			</if>
			<if test="query.sortRule == 2">
			desc, t1.create_time desc
			order by t1.task_urgency_level desc, t1.create_time desc
			</if>
			</if>
			<if test="query.sortType == 2">
			order by t2.plate_number, t1.create_time desc
			<if test="query.sortRule == 1">
			order by t2.plate_number, t1.create_time desc
			</if>
			<if test="query.sortRule == 2">
			desc, t1.create_time desc
			order by t2.plate_number desc, t1.create_time desc
			</if>
			</if>
			<if test="query.sortType == 3">

			@@ -246,7 +246,7 @@
			() -> {
			// 优惠券
			return xpAppUserCouponClient.getUserCoupon(
			new GetUserCouponDto(Long.valueOf(userId), finalXpPricingCardVo.getTotalPrice(),routeAndFareDto.getOpenCityId())
			new GetUserCouponDto(Long.valueOf(userId), finalXpPricingCardVo.getTotalPrice(),routeAndFareDto.getOpenCityId(),null)
			// new GetUserCouponDto(Long.valueOf(userId), 1d, routeAndFareDto.getOpenCityId())
			);
			},

	xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/FareBreakdownVo.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpTaskMapper.xml	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史