From 8f07abf7a088629b80b508b45fefbebba09571bc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 10:53:40 +0800
Subject: [PATCH] 日志

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 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 c708ebd..c3a8207 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
@@ -61,6 +61,7 @@
 import com.xiaopeng.api.vo.order.*;
 import com.xiaopeng.api.vo.payFront.CreditOrderCreateVo;
 import com.xiaopeng.api.vo.payFront.CreditPaySignQueryVo;
+import com.xiaopeng.api.vo.payFront.CreditPrecreateVo;
 import com.xiaopeng.api.vo.vehicleConvoy.AddTaxiPassengerVo;
 import com.xiaopeng.api.vo.vehicleConvoy.BluetoothDeliverVo;
 import com.xiaopeng.api.vo.vehicleConvoy.CancelTaxiPassengerVo;
@@ -3228,13 +3229,16 @@
     @Override
     public R payment(XpOrderPayDto dto, String uid) {
 
+
+        HashMap<String, Object> resultMap = new HashMap<>();
+
         // 1.0 免密  //查询是否开通免密
         // 1先查用户是否申请  申请了拿到通过的businessOrderId
         boolean signed = false;
         CreditPaySignQueryDto creditPaySignQueryDto = new CreditPaySignQueryDto();
         creditPaySignQueryDto.setUid(Long.valueOf(uid));
-        creditPaySignQueryDto.setBusinessId(appid);
-        creditPaySignQueryDto.setCategory("xp_robotaxi_api");
+        creditPaySignQueryDto.setBusinessId("xp-robotaxi");
+        creditPaySignQueryDto.setCategory("009001");
         creditPaySignQueryDto.setBusinessOrderId("");
         R<CreditPaySignQueryVo> creditPaySignQueryVoR = xpPayFrontClient.queryCreditPaySign(creditPaySignQueryDto);
         if (creditPaySignQueryVoR.getCode()==200) {
@@ -3251,10 +3255,10 @@
             // y已签约 1.信用下单
             CreditOrderCreateDto creditOrderCreateDto = new CreditOrderCreateDto();
             creditOrderCreateDto.setUid(Long.valueOf(uid));
-            creditOrderCreateDto.setBusinessId(appid);
+            creditOrderCreateDto.setBusinessId("xp-robotaxi");
             creditOrderCreateDto.setCategory("xp_robotaxi_api");
             creditOrderCreateDto.setBusinessOrderId("");
-            creditOrderCreateDto.setSubject("信用下单");
+            creditOrderCreateDto.setSubject("009001");
             creditOrderCreateDto.setPayType("13");
 
 
@@ -3268,7 +3272,9 @@
             R<CreditOrderCreateVo> creditOrderCreateVoR = xpPayFrontClient.createCreditOrder(creditOrderCreateDto);
             if(creditOrderCreateVoR.getCode()==200){
                 CreditOrderCreateVo data = creditOrderCreateVoR.getData();
-                return R.ok(data.getPackageValue());
+                resultMap.put("status", 1);
+                resultMap.put("value", data);
+                return R.ok(resultMap);
             }
 
         }else {
@@ -3278,14 +3284,26 @@
             XpOrder order = this.getById(dto.getOrderId());
             CreditPrecreateDto creditPrecreateDto = new CreditPrecreateDto();
             creditPrecreateDto.setUid(uid);
-            creditPrecreateDto.setBizId(appid);
+            creditPrecreateDto.setBizId("xp-robotaxi");
             creditPrecreateDto.setBizOrderId("");
             creditPrecreateDto.setPayScene(99);
             creditPrecreateDto.setAmount(order.getOrderMoney().multiply(new BigDecimal(100)).intValue());
-            creditPrecreateDto.setCategory("信用下单");
+            creditPrecreateDto.setCategory("009001");
             creditPrecreateDto.setTitle("信用下单");
             creditPrecreateDto.setDetail("信用下单");
 
+            HashMap<String, String> businessExtend = new HashMap<>();
+            businessExtend.put("returnUrl", "");
+            businessExtend.put("notifyUrl", "");
+            creditPrecreateDto.setBusinessExtend(businessExtend);
+
+            R<CreditPrecreateVo> creditPrecreateVoR = xpPayFrontClient.precreate(creditPrecreateDto);
+            if (creditPrecreateVoR.getCode()==200) {
+                CreditPrecreateVo data = creditPrecreateVoR.getData();
+                resultMap.put("status", 2);
+                resultMap.put("value", data);
+                return R.ok(resultMap);
+            }
         }
 
 

--
Gitblit v1.7.1