From 7083b63aad7b3f5870d23b436c6a667bc244ee25 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 08 八月 2023 15:47:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java | 7 +++----
phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java | 2 +-
phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java | 2 +-
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java | 1 -
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java | 2 +-
phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java | 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
index 1f00177..82eee24 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
@@ -2,7 +2,6 @@
import com.hx.resultTool.Result;
import com.hz.his.vo.order.refund.qr.RefundQrVo;
-import com.hz.his.vo.payment.PayNoVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
index d02644e..3eea9ae 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
@@ -1,7 +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.PayNoVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
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
diff --git a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
index 7476c03..28020a4 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
@@ -1,4 +1,4 @@
-package com.hz.his.vo.payment;
+package com.hz.phis.vo.payment;
import lombok.Data;
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
index 85c4cc2..1f7ef58 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
@@ -7,7 +7,7 @@
* @author CJH
*/
@Data
-public class OrderQrResponeVo {
+public class OrderQrPayResponeVo {
/**鍟嗘埛鍙�-Y-32锛堝晢鎴峰湪鎷涜瀹屾垚鍟嗘埛杩涗欢鍚庡垎閰嶇殑鎷涜鍟嗘埛鍙凤級*/
private String merId;
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
index e58b107..6b98361 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
@@ -8,7 +8,7 @@
* @author CJH
*/
@Data
-public class OrderQrVo {
+public class OrderQrPayVo {
/**N-32-绗笁鏂瑰晢鎴峰彿锛屾病鏈夋寚瀹氬彲涓嶄紶*/
private String merId;
--
Gitblit v1.8.0