From 5c863676b014e5ae2fa601d89a83160b6e7a6c07 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 15 五月 2026 18:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/payFront/XpPayFrontClient.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/payFront/XpPayFrontClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/payFront/XpPayFrontClient.java
index 9f9240b..2293388 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/payFront/XpPayFrontClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/payFront/XpPayFrontClient.java
@@ -18,7 +18,6 @@
 import com.xiaopeng.api.vo.payFront.CreditPaySignVo;
 import com.xiaopeng.api.vo.payFront.CreditPrecreateVo;
 import com.xiaopeng.api.vo.payFront.RefundVo;
-import com.xiaopeng.api.vo.payFront.UnsignCreditPayVo;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -35,9 +34,12 @@
         fallbackFactory = XpPayFrontClientFallbackFactory.class)
 public interface XpPayFrontClient {
 
+
+    // 微信支付分开通接口
     @PostMapping("/logan/pay/creditPay/sign")
     R<CreditPaySignVo> creditPaySign(@RequestBody CreditPaySignDto dto);
 
+    // 主动查询开通结果接口
     @PostMapping("/logan/pay/creditPay/sign/query")
     R<CreditPaySignQueryVo> queryCreditPaySign(@RequestBody CreditPaySignQueryDto dto);
 
@@ -60,5 +62,5 @@
     R<CreditPrecreateVo> precreate(@RequestBody CreditPrecreateDto dto);
 
     @PostMapping("/logan/pay/creditPay/unsign")
-    R<UnsignCreditPayVo> unsign(@RequestBody UnsignCreditPayDto dto);
+    R<?> unsign(@RequestBody UnsignCreditPayDto dto);
 }

--
Gitblit v1.7.1