attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单明细优惠费用

Browse Source
This commit is contained in:
yanglei 2026-03-04 09:49:42 +08:00
parent 1511e1f8f8
commit ba6b471523
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignEbikeRefundOrderDetailVo.java
View File

@ -99,6 +99,11 @@ public class FeignEbikeRefundOrderDetailVo {
*/ */
private BigDecimal helmetManagementFee; private BigDecimal helmetManagementFee;
/**
* 优惠费用
*/
private BigDecimal discountAmount;
/** /**
* 退款申请类型 * 退款申请类型
*/ */

2
ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrderDetail.java
View File

@ -44,7 +44,7 @@ public class EbikeOrderDetail implements Serializable {
private Long operatorId; private Long operatorId;
/** /**
* 费用类型：1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 * 费用类型：1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
*/ */
private Integer detailType; private Integer detailType;

2
ebike-payment/src/main/java/com/cdzy/payment/model/vo/EbikePaymentCostDetailVo.java
View File

@ -24,7 +24,7 @@ public class EbikePaymentCostDetailVo implements Serializable {
private Long detailId; private Long detailId;
/** /**
* 费用类型 1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 * 费用类型 1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
*/ */
private Integer detailType; private Integer detailType;

2
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
View File

@ -673,7 +673,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
private EbikeOrderDetailVo getEbikeOrderDetailVo(EbikeOrderDetailVo ebikeOrderDetailVo, List<EbikePaymentCostDetailVo> details) { private EbikeOrderDetailVo getEbikeOrderDetailVo(EbikeOrderDetailVo ebikeOrderDetailVo, List<EbikePaymentCostDetailVo> details) {
if (!CollectionUtils.isEmpty(details)) { if (!CollectionUtils.isEmpty(details)) {
for (EbikePaymentCostDetailVo payDetailVo : details) { for (EbikePaymentCostDetailVo payDetailVo : details) {
//1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
switch (payDetailVo.getDetailType()) { switch (payDetailVo.getDetailType()) {
case 1 -> { case 1 -> {
BigDecimal current = payDetailVo.getDetailAmount(); BigDecimal current = payDetailVo.getDetailAmount();

11
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java
View File

@ -179,7 +179,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
List<EbikePaymentCostDetailVo> details = orderDetailService.getOrderDetailsByOrderId(detailVo.getOrderId()); List<EbikePaymentCostDetailVo> details = orderDetailService.getOrderDetailsByOrderId(detailVo.getOrderId());
if (Objects.nonNull(details)) { if (Objects.nonNull(details)) {
for (EbikePaymentCostDetailVo payDetailVo : details) { for (EbikePaymentCostDetailVo payDetailVo : details) {
//1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
switch (payDetailVo.getDetailType()) { switch (payDetailVo.getDetailType()) {
case 1 -> { case 1 -> {
BigDecimal current = payDetailVo.getDetailAmount(); BigDecimal current = payDetailVo.getDetailAmount();
@ -205,6 +205,11 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
BigDecimal current = payDetailVo.getDetailAmount(); BigDecimal current = payDetailVo.getDetailAmount();
detailVo.setHelmetManagementFee((current != null ? current : BigDecimal.ZERO)); detailVo.setHelmetManagementFee((current != null ? current : BigDecimal.ZERO));
} }
case 7 -> {
BigDecimal current = payDetailVo.getDetailAmount();
detailVo.setDiscountAmount((current != null ? current : BigDecimal.ZERO));
}
} }
} }
} }
@ -443,7 +448,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
List<EbikePaymentCostDetailVo> details = orderDetailService.getOrderDetailsByOrderId(orderId); List<EbikePaymentCostDetailVo> details = orderDetailService.getOrderDetailsByOrderId(orderId);
if (details != null && !details.isEmpty()) { if (details != null && !details.isEmpty()) {
for (EbikePaymentCostDetailVo detailVo : details) { for (EbikePaymentCostDetailVo detailVo : details) {
//1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
switch (detailVo.getDetailType()) { switch (detailVo.getDetailType()) {
case 1 -> detailInfo.setDurationFee( case 1 -> detailInfo.setDurationFee(
Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO)); Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO));
@ -457,6 +462,8 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO)); Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO));
case 6 -> detailInfo.setHelmetManagementFee( case 6 -> detailInfo.setHelmetManagementFee(
Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO)); Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO));
case 7 -> detailInfo.setDiscountAmount(
Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO));
} }
} }
} }