From ad4edbbf6ad2f20df3c21e60798ea649a47289ff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 08 八月 2023 16:47:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
similarity index 78%
rename from phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
index 8fc78f9..fbff360 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
@@ -1,8 +1,7 @@
package com.hz.his.feign.service.platform.payment;
import com.hx.resultTool.Result;
-import com.hz.his.vo.payment.PayNoVo;
-import com.hz.phis.vo.payment.qr.OrderQrVo;
+import com.hz.phis.vo.payment.qr.OrderQrPayVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,13 +10,13 @@
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "payment-qr")
-public interface PaymentService {
+public interface SPaymentService {
/**
* 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
* data杞寲瀵硅薄OrderQrResponeVo
*/
@PostMapping(value = "/payment/order/qr")
- Result orderQrPay(@RequestBody OrderQrVo orderQrVo);
+ Result orderQrPay(@RequestBody OrderQrPayVo orderQrPayVo);
}
\ No newline at end of file
--
Gitblit v1.8.0