From fa0af2d56f26f8bd45a0fefe75f64364e18a53cb Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 05 九月 2023 17:18:49 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
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..e283663 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
@@ -8,9 +8,11 @@
@Data
public class PayNoVo {
- /**Y-16-璁㈠崟鍙�*/
+ /**N-3-鍓嶇紑*/
+ private String prefix;
+ /**Y-20-璁㈠崟鍙�*/
private String orderNo;
- /**Y-12-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛�
+ /**Y-9-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛�
* 娌℃湁鐗规畩瑕佹眰閮芥槸榛樿6锛屾渶澶�12*/
private Integer lengrhCount = 6;
/**N-浜ゆ槗鏂瑰紡锛孭ayWay鑾峰彇*/
@@ -27,7 +29,16 @@
/**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;
+ /**杩斿洖鍥炶皟閫氱煡URL绫诲瀷-POS鏈洪��娆惧洖璋冿紝鏈粨璐︾殑閫�娆�*/
+ public static final int NOTIFY_TYPE_POS_REFUND_ALL = 3;
}
--
Gitblit v1.8.0