From acce9d97f475f3b71b33ec3e6f8a0893b49183b8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 26 二月 2026 10:41:53 +0800
Subject: [PATCH] update
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java | 1 +
xp-robotaxi-account-boot/src/main/resources/mapper/account/XpAppUserCouponMapper.xml | 9 ++++-----
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 3 ++-
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/util/holiday/HolidayUtil.java | 2 +-
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/XpAppUserCouponListVo.java | 11 +++++++++++
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 16 ++++++++++------
6 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
index 183e457..ef80d6f 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
@@ -135,6 +135,7 @@
vo.setCouponId(coupon.getId().toString());
vo.setTitle(coupon.getCouponName());
vo.setExpireTime(coupon.getExpirationTime());
+ vo.setTimeRule(coupon.getTimeJson());
if("0".equals(vo.getCouponId())){
vo.setApplicableCities(Arrays.asList("不限"));
}else {
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/XpAppUserCouponListVo.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/XpAppUserCouponListVo.java
index 822b067..6d5e96b 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/XpAppUserCouponListVo.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/XpAppUserCouponListVo.java
@@ -31,4 +31,15 @@
@ApiModelProperty(value = "状态 1-未使用 2-已使用 3-已过期 0待领取")
private Integer status;
+
+ @ApiModelProperty(value = "使用时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime useTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "时段规则")
+ private String timeRule;
}
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/util/holiday/HolidayUtil.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/util/holiday/HolidayUtil.java
index 110690f..166650e 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/util/holiday/HolidayUtil.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/util/holiday/HolidayUtil.java
@@ -44,7 +44,7 @@
}
/**
- * 2非工作日 0工作日 1节假日 3调休日
+ * 2非工作日 0工作日 1节假日
* @return
*/
public Integer isHolidayToday() {
diff --git a/xp-robotaxi-account-boot/src/main/resources/mapper/account/XpAppUserCouponMapper.xml b/xp-robotaxi-account-boot/src/main/resources/mapper/account/XpAppUserCouponMapper.xml
index 8c2d84e..c48fb82 100644
--- a/xp-robotaxi-account-boot/src/main/resources/mapper/account/XpAppUserCouponMapper.xml
+++ b/xp-robotaxi-account-boot/src/main/resources/mapper/account/XpAppUserCouponMapper.xml
@@ -10,7 +10,7 @@
<select id="userCouponList" resultType="com.xiaopeng.account.model.vo.XpAppUserCouponListVo">
- select * from (
+ select t.*,t.status from (
SELECT id as couponId,
coupon_name as title,
money as discountAmount,
@@ -18,11 +18,10 @@
create_time as createTime,
expiration_time as expireTime,
case
- when status =1 and now()>expiration_time then 3
- when status =1 and expiration_time >now() then 1
+ when status = 1 and now() >= expiration_time then 3 -- 包含等于的情况
+ when status = 1 and expiration_time > now() then 1
else status
- end
- status
+ end as `status`
FROM xp_app_user_coupon
WHERE app_user_id = #{uid}
) as t
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index 1fca048..dafd694 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -427,13 +427,17 @@
if (orderId.contains("XU")) {
orderType = OrderType.CRUISE_ORDER;
// todo 下发巡游单的导航数据
+
+ R<XpCruiseOrder> cruiseOrder = xpCruiseOrderClient.getCruiseOrder(orderId);
+ XpCruiseOrder xpCruiseOrder = cruiseOrder.getData();
+
//先响应消息
responseMessage(sequence, "");
//构建导航数据给到车端
- origin.setLongitude(116.40528);
- origin.setLatitude(39.90498);
- destination.setLongitude(116.40528);
- destination.setLatitude(39.90498);
+ origin.setLongitude(longitude);
+ origin.setLatitude(latitude);
+ destination.setLongitude(xpCruiseOrder.getEndLon());
+ destination.setLatitude(xpCruiseOrder.getEndLat());
OrderRouteAndFareDto dto = new OrderRouteAndFareDto();
dto.setOrderId(Long.parseLong(orderId));
@@ -447,7 +451,7 @@
routeID = routeVo.getRouteID();
-// vehicleId = xpOrder.getVehicleId();
+ vehicleId = xpCruiseOrder.getVehicleId();
} else {
orderType = OrderType.USER_ORDER;
//正常单
@@ -557,7 +561,7 @@
routeID = routeVo.getRouteID();
-// vehicleId = xpOrder.getVehicleId();
+ vehicleId = xpCruiseOrder.getVehicleId();
}
} else {
orderType = OrderType.USER_ORDER;
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 4be8b12..f66f078 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1446,6 +1446,7 @@
public R<FareBreakdownVo> fareBreakdown(Long orderId, String uid) {
XpOrder order = this.getById(orderId);
+ order.setAppUserId(null);
// 查询订单轨迹
List<OrderTrajectory> trajectories = mongoTemplate.find(
new Query(Criteria.where("orderId").is(orderId))
@@ -1494,7 +1495,7 @@
res.setRedPacketMoney(order.getRedPacketMoney());
res.setCouponMoney(order.getCouponMoney());
res.setOrderMoney(order.getOrderMoney());
- res.setKilometer(BigDecimal.valueOf(order.getMileageKilometers()));
+ res.setKilometer(order.getMileageKilometers()==null?BigDecimal.ZERO:BigDecimal.valueOf(order.getMileageKilometers()));
LocalDateTime createTime = order.getCreateTime();
LocalDateTime tripEnd = order.getTripEnd();
if (tripEnd==null){
--
Gitblit v1.7.1