From 998627faf2b85a764c41c7e733b920208c96d25b Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 09 三月 2026 14:55:31 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi --- xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java | 80 ++-------------------------------------- 1 files changed, 4 insertions(+), 76 deletions(-) diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java index bd63f6b..f1bf8a5 100644 --- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java +++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java @@ -1,105 +1,33 @@ package com.xiaopeng.order.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.ImmutableMap; -import com.xiaopeng.api.dto.account.GetUserCouponDto; -import com.xiaopeng.api.dto.account.UseUserCouponDto; import com.xiaopeng.api.dto.automaticPilot.PushOrderDto; -import com.xiaopeng.api.dto.operation.LonLatDto; -import com.xiaopeng.api.dto.order.GetOrderNumDto; -import com.xiaopeng.api.dto.order.HistoryEndPointsDto; -import com.xiaopeng.api.dto.order.HistoryStartPointsDto; -import com.xiaopeng.api.dto.order.PopOrderDto; -import com.xiaopeng.api.dto.pushMessage.SendMessageDTO; -import com.xiaopeng.api.dto.statistics.DailyCountDTO; -import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO; -import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO; -import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto; -import com.xiaopeng.api.feignClient.account.XpAppUserClient; -import com.xiaopeng.api.feignClient.account.XpAppUserCouponClient; import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient; -import com.xiaopeng.api.feignClient.operation.XpPointClient; -import com.xiaopeng.api.feignClient.operation.XpPricingClient; -import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient; -import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient; -import com.xiaopeng.api.feignClient.vehicleConvoy.UserVehicleClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetVehicleClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; -import com.xiaopeng.api.model.account.XpAppUser; -import com.xiaopeng.api.model.operation.XpFeedbackType; -import com.xiaopeng.api.model.operation.XpGeoQueryEntity; -import com.xiaopeng.api.model.operation.XpPoint; -import com.xiaopeng.api.model.operation.XpPricing; -import com.xiaopeng.api.model.order.*; +import com.xiaopeng.api.model.order.XpCruiseOrder; import com.xiaopeng.api.model.vehicleConvoy.XpFleet; import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; -import com.xiaopeng.api.vo.account.UserCouponVo; -import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperationType; -import com.xiaopeng.api.vo.order.*; -import com.xiaopeng.api.vo.vehicleConvoy.AddTaxiPassengerVo; -import com.xiaopeng.api.vo.vehicleConvoy.CancelTaxiPassengerVo; -import com.xiaopeng.common.core.constant.CacheConstants; +import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType; import com.xiaopeng.common.core.domain.R; -import com.xiaopeng.common.core.enums.OrderStatusEnum; -import com.xiaopeng.common.core.enums.PushMessageTypeEnum; -import com.xiaopeng.common.core.exception.ServiceException; -import com.xiaopeng.common.core.utils.DateUtils; -import com.xiaopeng.common.core.utils.GeodesyUtil; import com.xiaopeng.common.core.utils.StringUtils; import com.xiaopeng.common.core.web.domain.BaseModel; import com.xiaopeng.common.core.web.page.PageInfo; -import com.xiaopeng.common.redis.service.RedisService; -import com.xiaopeng.common.security.utils.SecurityUtils; -import com.xiaopeng.order.constant.I18nKeyConstant; -import com.xiaopeng.order.dto.MileageDto; -import com.xiaopeng.order.job.base.QuartzManager; -import com.xiaopeng.order.job.base.TimeJobType; -import com.xiaopeng.order.job.jobs.EndTripJob; -import com.xiaopeng.order.job.jobs.OrderCancelJob; -import com.xiaopeng.order.mangodb.model.OrderTrajectory; -import com.xiaopeng.order.mangodb.service.OrderTrajectoryService; import com.xiaopeng.order.mapper.XpCruiseOrderMapper; -import com.xiaopeng.order.mapper.XpOrderDetailMapper; -import com.xiaopeng.order.mapper.XpOrderMapper; -import com.xiaopeng.order.model.dto.XpOrderCommentDto; -import com.xiaopeng.order.model.dto.XpOrderPayDto; import com.xiaopeng.order.model.query.XpCruiseOrderPageQuery; -import com.xiaopeng.order.model.query.XpHistoryOrderListQuery; -import com.xiaopeng.order.model.query.XpOrderPageQuery; -import com.xiaopeng.order.model.vo.*; -import com.xiaopeng.order.service.*; -import com.xiaopeng.order.utils.TaxiPricingDemoService; -import com.xiaopeng.order.utils.TrajectoryGenerator; -import com.xiaopeng.order.utils.holiday.HolidayUtil; -import com.xiaopeng.order.vo.OrderDetailVo; +import com.xiaopeng.order.model.vo.XpCruiseOrderPageVO; +import com.xiaopeng.order.service.IXpCruiseOrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; -import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.SimpleDateFormat; -import java.time.*; import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; /** -- Gitblit v1.7.1