autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

电单车订单 修改为发送订单信息到rabbitMQ, 进行退款和分账

Browse Source
This commit is contained in:
Guoqs
2025-05-14 16:26:37 +08:00
parent 8b91d097d3
commit 99803d00da
2 changed files with 126 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -658,17 +658,33 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
orderDetail.setTotalOrderAmount(orderDetail.getTotalElectricityAmount().add(orderDetail.getTotalServiceAmount())); // 总消费金额
}
// 退款金额
if (refundAmount.compareTo(BigDecimal.ZERO) > 0) {
// 订单退款, 退款金额大于0才退款
refundOrder(orderBasicInfo);
}
// 退款金额 2025年5月14日16点24分修改为发送订单信息到rabbitMQ, 进行退款和分账
// if (refundAmount.compareTo(BigDecimal.ZERO) > 0) {
// // 订单退款, 退款金额大于0才退款
// refundOrder(orderBasicInfo);
// }
// 更新数据库
OrderTransactionDTO dto = new OrderTransactionDTO();
dto.setOrderBasicInfo(orderBasicInfo);
dto.setOrderDetail(orderDetail);
transactionService.doUpdateOrder(dto);
// 组装after参数
AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
.orderCode(orderBasicInfo.getOrderCode())
.merchantId(orderBasicInfo.getMerchantId())
.stationId(orderBasicInfo.getStationId())
.orderPayAmount(orderBasicInfo.getPayAmount()) // 支付金额
.orderConsumeAmount(orderBasicInfo.getOrderAmount()) // 消费金额
.orderSettleAmount(orderBasicInfo.getSettleAmount()) // 结算金额
.orderElectricityAmount(orderDetail.getTotalElectricityAmount()) // 电费金额
.orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount()) // 电费折扣金额
.orderServiceAmount(orderDetail.getTotalServiceAmount()) // 服务费金额
.orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额
.orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额
.build();
rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO);
}
/**