From fab86d8babe0fb69ae9956dc3698951b42c49307d73c9a5d89c149bc099e9948 Mon Sep 17 00:00:00 2001 From: yanglei Date: Thu, 15 Jan 2026 13:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=9F=E6=88=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/EbikeOrderController.java | 3 +- .../user/model/dto/EbikeCostDetailDto.java | 56 ++++++ .../user/model/vo/EbikeOrderDetailVo.java | 180 ++++++++++++++++++ .../cdzy/user/service/EbikeOrderService.java | 8 + .../service/impl/EbikeOrderServiceImpl.java | 122 ++++++++++-- 5 files changed, 348 insertions(+), 21 deletions(-) create mode 100644 ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeCostDetailDto.java create mode 100644 ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java 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 c52e3c0..f24f578 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 @@ -8,6 +8,7 @@ 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.EbikeOrderDetailVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.cdzy.user.service.EbikeOrderService; @@ -107,7 +108,7 @@ public class EbikeOrderController { */ @GetMapping("getInfo") public JsonResult getInfo(@RequestParam("orderId") Long orderId) { - EbikeOrder userOrder = ebikeOrderService.getById(orderId); + EbikeOrderDetailVo userOrder = ebikeOrderService.getInfo(orderId); return JsonResult.success(userOrder); } diff --git a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeCostDetailDto.java b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeCostDetailDto.java new file mode 100644 index 0000000..5188e24 --- /dev/null +++ b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeCostDetailDto.java @@ -0,0 +1,56 @@ +package com.cdzy.user.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author yanglei + * @since 2026-01-15 10:52 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EbikeCostDetailDto implements Serializable { + + /** + * 起步费用 + */ + private BigDecimal baseFee; + + /** + * 时长费用 + */ + private BigDecimal durationFee; + + /** + * 禁停区调度费（元) + */ + private BigDecimal noParkingZoneFee; + + /** + * 停车区外调度费（元） + */ + private BigDecimal outOfParkingAreaFee; + + /** + * 运营区域外调度费（元） + */ + private BigDecimal outOfServiceAreaFee; + + /** + * 头盔管理费（元) + */ + private BigDecimal helmetManagementFee; + + /** + * 总计费用 + */ + private BigDecimal totalCost; +} diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java new file mode 100644 index 0000000..b0de5af --- /dev/null +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java @@ -0,0 +1,180 @@ +package com.cdzy.user.model.vo; + +import com.cdzy.user.handler.PointDeserializer; +import com.cdzy.user.handler.PointSerializer; +import com.cdzy.user.handler.PointTypeHandler; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.mybatisflex.annotation.Column; +import lombok.Data; +import org.locationtech.jts.geom.Point; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author yanglei + * @since 2026-01-15 11:18 + */ +@Data +public class EbikeOrderDetailVo { + + /** + * 订单表主键ID + */ + private Long orderId; + + /** + * 用户ID，关联用户表 + */ + private Long userId; + + /** + * 运营商ID + */ + private Long operatorId; + + /** + * 车辆编码 + */ + private String bikeCode; + + /** + * 订单类型：1-单次骑行 2-骑行卡购买 3-会员卡续费 + */ + private Integer orderType; + + /** + * 订单状态：0-进行中 1-已取消 2-待支付 3-已支付 4-退款中 5-已退款 + */ + @Column(onInsertValue = "0") + private Integer orderStatus; + + /** + * 订单总金额（单位：元） + */ + private BigDecimal totalAmount; + + /** + * 实付金额（扣除卡券优惠后） + */ + private BigDecimal actualAmount; + + /** + * 骑行开始时间（仅骑行订单有效） + */ + private LocalDateTime startTime; + + /** + * 骑行结束时间（仅骑行订单有效） + */ + private LocalDateTime endTime; + + /** + * 支付成功时间 + */ + private LocalDateTime paymentTime; + + /** + * 支付方式：1-wechat 2-alipay 3-balance + */ + private Integer paymentMethod; + + /** + * 起步时长（分钟 + */ + private Integer baseDurationMinutes; + + /** + * 起步费用 + */ + private BigDecimal baseFee; + + /** + * 时长费用 + */ + private BigDecimal durationFee; + + /** + * 免费时长（分钟） + */ + private Integer freeDurationMinutes; + + /** + * 时长（分钟） + */ + private Integer chargeDurationMinutes; + + /** + * 禁停区调度费（元) + */ + private BigDecimal noParkingZoneFee; + + /** + * 停车区外调度费（元） + */ + private BigDecimal outOfParkingAreaFee; + + /** + * 运营区域外调度费（元） + */ + private BigDecimal outOfServiceAreaFee; + + /** + * 封顶金额（元) + */ + private BigDecimal maxFeeAmount; + + /** + * 头盔管理费（元) + */ + private BigDecimal helmetManagementFee; + + /** + * 骑行起始点 + */ + @Column(typeHandler = PointTypeHandler.class) + @JsonSerialize(using = PointSerializer.class) + @JsonDeserialize(using = PointDeserializer.class) + private Point startLocation; + + /** + * 骑行结束点 + */ + @Column(typeHandler = PointTypeHandler.class) + @JsonSerialize(using = PointSerializer.class) + @JsonDeserialize(using = PointDeserializer.class) + private Point endLocation; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + @Column(onInsertValue = "now()") + private LocalDateTime createTime; + + /** + * 更新人 + */ + private Long updateBy; + + /** + * 更新时间 + */ + @Column(onUpdateValue = "now()") + private LocalDateTime updateTime; + + /** + * 删除状态（true表示已删除） + */ + private Boolean isDeleted; + + /** + * 是否免费订单 true-免费 false-收费 + */ + private Boolean isFreeOrder; +} 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 1ff424c..4ff96af 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,6 +5,7 @@ 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.EbikeOrderDetailVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.ebike.feign.model.dto.FeignEbikeDto; @@ -105,4 +106,11 @@ public interface EbikeOrderService extends IService { * @return 营收统计 */ List getRevenueStatistics(); + + /** + * 根据订单id查看订单详情 + * @param orderId 订单id + * @return 订单详情 + */ + EbikeOrderDetailVo getInfo(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 41f948d..d524969 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 @@ -5,14 +5,21 @@ import com.cdzy.common.enums.GlobalConstants; import com.cdzy.common.ex.EbikeException; import com.cdzy.common.model.request.PageParam; import com.cdzy.common.model.response.JsonResult; -import com.cdzy.user.enums.*; +import com.cdzy.user.enums.EbikeOrderDetailType; +import com.cdzy.user.enums.EbikePaymentMethod; +import com.cdzy.user.enums.EbikePaymentTradeStatus; +import com.cdzy.user.enums.OrderStatus; +import com.cdzy.user.enums.OrderType; import com.cdzy.user.mapper.EbikeOrderMapper; +import com.cdzy.user.model.dto.EbikeCostDetailDto; 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.entity.EbikeOrderDetail; import com.cdzy.user.model.entity.EbikePayment; import com.cdzy.user.model.vo.EbikeBikeInfoVo; +import com.cdzy.user.model.vo.EbikeOrderDetailVo; +import com.cdzy.user.model.vo.EbikePaymentCostDetailVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.cdzy.user.service.EbikeOrderDetailService; @@ -42,6 +49,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import static com.cdzy.user.model.entity.table.EbikeOrderDetailTableDef.EBIKE_ORDER_DETAIL; import static com.cdzy.user.model.entity.table.EbikeOrderTableDef.EBIKE_ORDER; import static com.cdzy.user.model.entity.table.EbikeRefundTableDef.EBIKE_REFUND; @@ -221,7 +229,9 @@ public class EbikeOrderServiceImpl extends ServiceImpl orderDetails = buildOrderDetails(order); + List orderDetails = buildOrderDetails(order, ebikeCostDetail); ebikeOrderDetailService.saveBatch(orderDetails); return order.getOrderId(); } @@ -296,6 +306,68 @@ public class EbikeOrderServiceImpl extends ServiceImpl details = ebikeOrderDetailService.getOrderDetailsByOrderId(orderId); + if (Objects.nonNull(details)) { + for (EbikePaymentCostDetailVo payDetailVo : details) { + //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 + switch (payDetailVo.getDetailType()) { + case 1 -> { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setDurationFee((current != null ? current : BigDecimal.ZERO)); + } + case 2 -> { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setBaseFee((current != null ? current : BigDecimal.ZERO)); + } + case 3 -> { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setOutOfServiceAreaFee((current != null ? current : BigDecimal.ZERO)); + } + case 4 -> { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setOutOfParkingAreaFee((current != null ? current : BigDecimal.ZERO)); + } + case 5 -> { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setNoParkingZoneFee((current != null ? current : BigDecimal.ZERO)); + } + case 6 -> { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setHelmetManagementFee((current != null ? current : BigDecimal.ZERO)); + } + } + } + } + return ebikeOrderDetailVo; + } + /** * 计算增长率并格式化为百分比字符串 * @@ -325,39 +397,39 @@ public class EbikeOrderServiceImpl extends ServiceImpl buildOrderDetails(EbikeOrder order) { + private List buildOrderDetails(EbikeOrder order, EbikeCostDetailDto ebikeCostDetail) { List details = new ArrayList<>(); //时长费用 - if (order.getDurationFee() != null && order.getDurationFee().compareTo(BigDecimal.ZERO) > 0) { - details.add(buildDetail(order, EbikeOrderDetailType.DURATION_FEE, order.getDurationFee(), "骑行时长费用")); + if (ebikeCostDetail.getDurationFee() != null && ebikeCostDetail.getDurationFee().compareTo(BigDecimal.ZERO) > 0) { + details.add(buildDetail(order, EbikeOrderDetailType.DURATION_FEE, ebikeCostDetail.getDurationFee(), "骑行时长费用")); } // 起步费用 - if (order.getBaseFee() != null && order.getBaseFee().compareTo(BigDecimal.ZERO) > 0) { - details.add(buildDetail(order, EbikeOrderDetailType.STARTUP_FEE, order.getBaseFee(), "起步费用")); + if (ebikeCostDetail.getBaseFee() != null && ebikeCostDetail.getBaseFee().compareTo(BigDecimal.ZERO) > 0) { + details.add(buildDetail(order, EbikeOrderDetailType.STARTUP_FEE, ebikeCostDetail.getBaseFee(), "起步费用")); } - if (order.getOutOfServiceAreaFee() != null && order.getOutOfServiceAreaFee().compareTo(BigDecimal.ZERO) > 0) { + if (ebikeCostDetail.getOutOfServiceAreaFee() != null && ebikeCostDetail.getOutOfServiceAreaFee().compareTo(BigDecimal.ZERO) > 0) { details.add(buildDetail(order, EbikeOrderDetailType.OPERATION_AREA_DISPATCH_FEE, - order.getOutOfServiceAreaFee(), "运营区外调度费")); + ebikeCostDetail.getOutOfServiceAreaFee(), "运营区外调度费")); } // 4. 停车区外调度费用 - if (order.getOutOfParkingAreaFee() != null && order.getOutOfParkingAreaFee().compareTo(BigDecimal.ZERO) > 0) { + if (ebikeCostDetail.getOutOfParkingAreaFee() != null && ebikeCostDetail.getOutOfParkingAreaFee().compareTo(BigDecimal.ZERO) > 0) { details.add(buildDetail(order, EbikeOrderDetailType.OUT_OF_PARKING_AREA_FEE, - order.getOutOfParkingAreaFee(), "停车区外调度费")); + ebikeCostDetail.getOutOfParkingAreaFee(), "停车区外调度费")); } // 5. 禁停区调度费用 - if (order.getNoParkingZoneFee() != null && order.getNoParkingZoneFee().compareTo(BigDecimal.ZERO) > 0) { + if (ebikeCostDetail.getNoParkingZoneFee() != null && ebikeCostDetail.getNoParkingZoneFee().compareTo(BigDecimal.ZERO) > 0) { details.add(buildDetail(order, EbikeOrderDetailType.NO_PARKING_ZONE_FEE, - order.getNoParkingZoneFee(), "禁停区调度费")); + ebikeCostDetail.getNoParkingZoneFee(), "禁停区调度费")); } // 6. 头盔使用费用 - if (order.getHelmetManagementFee() != null && order.getHelmetManagementFee().compareTo(BigDecimal.ZERO) > 0) { + if (ebikeCostDetail.getHelmetManagementFee() != null && ebikeCostDetail.getHelmetManagementFee().compareTo(BigDecimal.ZERO) > 0) { details.add(buildDetail(order, EbikeOrderDetailType.HELMET_FEE, - order.getHelmetManagementFee(), "头盔使用费")); + ebikeCostDetail.getHelmetManagementFee(), "头盔使用费")); } return details; } @@ -386,8 +458,8 @@ public class EbikeOrderServiceImpl extends ServiceImpl 0) { totalCost = maxFee; } - return totalCost; + ebikeCostDetailDto.setTotalCost(totalCost); + return ebikeCostDetailDto; } /**