diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java index d476df8..4c834e1 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java @@ -6,11 +6,11 @@ import com.cdzy.user.model.dto.EbikeUserCyclingDto; import com.cdzy.user.model.dto.EbikeUserCyclingEndDto; import com.cdzy.user.model.entity.EbikeOrder; import com.cdzy.user.model.vo.EbikeBikeInfoVo; +import com.cdzy.user.model.vo.EbikeBikeRealInfoVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.cdzy.user.service.EbikeOrderService; import com.ebike.feign.model.dto.FeignEbikeDto; -import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo; import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; @@ -131,4 +131,15 @@ public class EbikeOrderController { List revenueStatistics = ebikeOrderService.getRevenueStatistics(); return JsonResult.success(revenueStatistics); } + + /** + * 查询车辆实时信息 + * + * @return 车辆实时信息 + */ + @GetMapping("getBikeRealTimeInfo") + public JsonResult getBikeRealTimeInfo(@RequestParam("orderId") Long orderId) { + EbikeBikeRealInfoVo revenueStatistics = ebikeOrderService.getBikeRealTimeInfo(orderId); + return JsonResult.success(revenueStatistics); + } } diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeRealInfoVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeRealInfoVo.java new file mode 100644 index 0000000..fba6dea --- /dev/null +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeRealInfoVo.java @@ -0,0 +1,26 @@ +package com.cdzy.user.model.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 车辆实时信息 + * + * @author yanglei + * @since 2025-12-26 11:03 + */ +@Data +public class EbikeBikeRealInfoVo implements Serializable { + + /** + * 当前费用 + */ + private BigDecimal cost; + + /** + * 车辆可用里程 + */ + private Long mileage; +} diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java index 9828fb1..53e655a 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java @@ -5,10 +5,10 @@ import com.cdzy.user.model.dto.EbikeUserCyclingDto; import com.cdzy.user.model.dto.EbikeUserCyclingEndDto; import com.cdzy.user.model.entity.EbikeOrder; import com.cdzy.user.model.vo.EbikeBikeInfoVo; +import com.cdzy.user.model.vo.EbikeBikeRealInfoVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.ebike.feign.model.dto.FeignEbikeDto; -import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo; import com.ebike.feign.model.dto.FeignOrderPaymentDto; import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo; import com.mybatisflex.core.paginate.Page; @@ -128,4 +128,12 @@ public interface EbikeOrderService extends IService { * @return 营收统计 */ List getRevenueStatistics(); + + /** + * 查询车辆实时信息 + * + * @param orderId 订单id + * @return 车辆实时信息 + */ + EbikeBikeRealInfoVo getBikeRealTimeInfo(Long orderId); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java index f2b2908..3d297fd 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java @@ -13,6 +13,7 @@ import com.cdzy.user.model.entity.EbikeOrder; import com.cdzy.user.model.entity.EbikeOrderDetail; import com.cdzy.user.model.entity.EbikePayment; import com.cdzy.user.model.vo.EbikeBikeInfoVo; +import com.cdzy.user.model.vo.EbikeBikeRealInfoVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.cdzy.user.service.EbikeOrderDetailService; @@ -88,10 +89,10 @@ public class EbikeOrderServiceImpl extends ServiceImpl 0 && totalFee.compareTo(maxFee) > 0) { + totalFee = maxFee; + } + return totalFee; + } + /** * 计算增长率并格式化为百分比字符串 *