From c1675fe3f33a3beb681ec46bc37807873a196009 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 21 五月 2026 09:34:19 +0800
Subject: [PATCH] 修改bug
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index d99a9a0..3ebda38 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -3502,6 +3502,7 @@
// creditOrderCreateDto.setBusinessOrderId(OrderCodeUtil.getOrderCode("MMZF"));
// creditOrderCreateDto.setSubject("小鹏集团|robotaxi");
// creditOrderCreateDto.setPayType("13");
+ // TODO 需要根据环境补充路径
// creditOrderCreateDto.setPayCallbackUrl("");
//
// creditOrderCreateDto.setBusinessExtendData("{\"mainOrderId\":\"" +order.getOrderNumber() + "\"}");
@@ -4943,7 +4944,7 @@
if (order.getPayType() == 3) {
// 免密查询 如果成功则调用结算
CreditOrderQueryDto dto = new CreditOrderQueryDto();
- dto.setBusinessOrderId(OrderCodeUtil.getOrderCode("MMZF"));
+ dto.setBusinessOrderId(order.getBusinessOrderId());
dto.setAuthOrderId(order.getAuthOrderId());
dto.setPayType("13");
R<CreditOrderQueryVo> creditOrderQueryVoR = xpPayFrontClient.queryCreditOrder(dto);
@@ -4952,12 +4953,16 @@
if (creditOrderQueryVo.getCreditOrderStatus().equals("DONE")) {
// 订单确认 需要吊起扣款
CreditOrderWxPayDto creditOrderWxPayDto = new CreditOrderWxPayDto();
- creditOrderWxPayDto.setBusinessOrderId(OrderCodeUtil.getOrderCode("MMZF"));
+ creditOrderWxPayDto.setBusinessOrderId(order.getBusinessOrderId());
creditOrderWxPayDto.setAuthOrderId(order.getAuthOrderId());
- creditOrderWxPayDto.setPayCallbackUrl("13");
+
+ // TODO 需要根据环境补充路径
+ creditOrderWxPayDto.setPayCallbackUrl("");
creditOrderWxPayDto.setTotalAmount(order.getOrderMoney().multiply(BigDecimal.valueOf(100)).longValue());
creditOrderWxPayDto.setSubject("小鹏集团|robotaxi");
creditOrderWxPayDto.setPayType("13");
+ creditOrderWxPayDto.setBusinessId("xp-robotaxi");
+ creditOrderWxPayDto.setCategory("009001");
List<CreditOrderCreateDto.PostPayment> postPayments = new ArrayList<>();
CreditOrderCreateDto.PostPayment postPayment = new CreditOrderCreateDto.PostPayment();
@@ -4966,6 +4971,7 @@
postPayments.add(postPayment);
creditOrderWxPayDto.setPostPayments(postPayments);
R<CreditOrderWxPayVo> creditOrderWxPayVoR = xpPayFrontClient.creditOrderWxPay(creditOrderWxPayDto);
+
}
}
@@ -5014,6 +5020,7 @@
dto.setBusinessOrderId(order.getBusinessOrderId());
dto.setAuthOrderId(order.getAuthOrderId());
dto.setCategory("009001");
+ // TODO 需要根据环境补充路径
dto.setPayCallbackUrl("");
dto.setTotalAmount(order.getOrderMoney().multiply(BigDecimal.valueOf(100)).longValue());
dto.setSubject("小鹏集团|robotaxi");
--
Gitblit v1.7.1