From ddccbbcbb377a679c55e7560b53858513beefef3 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 01 九月 2023 14:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java | 4 ++--
phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java | 11 +++++++++--
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java | 4 ++--
phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java | 5 ++---
4 files changed, 15 insertions(+), 9 deletions(-)
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 3eea9ae..6a7b91f 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
@@ -13,8 +13,8 @@
public interface SPayNoService {
/**
- * 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
- * data灏辨槸鏀粯缂栧彿
+ * 鑾峰彇鏀粯缂栧彿
+ * data灏辨槸杞� PayNoResVo
*/
@PostMapping(value = "/pay/create")
Result payCreate(@RequestBody PayNoVo payNoVo);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
index fbff360..cdbb1ab 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
@@ -13,8 +13,8 @@
public interface SPaymentService {
/**
- * 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
- * data杞寲瀵硅薄OrderQrResponeVo
+ * 璇锋眰璁㈠崟浜岀淮鐮佹敮浠�
+ * data杞寲瀵硅薄 OrderQrResponeVo
*/
@PostMapping(value = "/payment/order/qr")
Result orderQrPay(@RequestBody OrderQrPayVo orderQrPayVo);
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java
index 17357e6..ce01c5b 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java
@@ -10,8 +10,7 @@
/**Y-鏀粯缂栧彿*/
private String payNo;
- /**N-鍥炶皟鍦板潃锛屽钩鍙扮殑缁熶竴澶勭悊*/
+ /**N-鍥炶皟鍦板潃锛屽钩鍙扮殑缁熶竴澶勭悊
+ * 濡傛灉鏈夌壒鍒殑澶勭悊锛屽彲浠ヤ笉浣跨敤璇ュ洖璋冩帴鍙�*/
private String notifyUrl;
-
-
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
index 28020a4..4f14a72 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
@@ -27,7 +27,14 @@
/**N-鏀粯鏂瑰紡缂栧彿锛圥aymentMethod閲岄潰鐨勭紪鍙凤級锛屽叧鑱旇鍗曠殑鏀粯鏂瑰紡璁板綍*/
private String paymentNo;
- /**鍏宠仈绫诲瀷-鎬昏鍗�*/
- public static final int TYPE_ORDER = 0;
+ /**Y-1-杩斿洖鍥炶皟閫氱煡绫诲瀷*/
+ private Integer notifyType = NOTIFY_TYPE_PAY;
+ /**鍏宠仈绫诲瀷-鎬昏鍗�*/
+ public static final int TYPE_ORDER = 1;
+
+ /**杩斿洖鍥炶皟閫氱煡URL绫诲瀷-鏀粯鍥炶皟*/
+ public static final int NOTIFY_TYPE_PAY = 1;
+ /**杩斿洖鍥炶皟閫氱煡URL绫诲瀷-POS鏈洪��娆惧洖璋�*/
+ public static final int NOTIFY_TYPE_POS_REFUND = 2;
}
--
Gitblit v1.8.0