From 21ccde1873113d6819aa4e69a99e7fc7b707d9a5 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 07 八月 2023 15:19:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java | 20 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java | 9 ++++++---
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java | 10 ++++++++++
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
index 8eb208c..d8eb62d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
@@ -35,6 +35,16 @@
/** 鍒拌璁㈠崟id(闂ㄥ簵鍔╂墜浣跨敤缁熻浣跨敤) */
private String visitOrderId;
+ /**鏁版嵁绫诲瀷(AppearanceConstants)*/
+ private Integer dataType;
+
+ /** 鐭湡瑙勫垝 */
+ private String shortPlan;
+ /** 涓湡瑙勫垝 */
+ private String middlePlan;
+ /** 闀挎湡瑙勫垝 */
+ private String longPlan;
+
public AppearanceDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java
new file mode 100644
index 0000000..6b926a3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java
@@ -0,0 +1,20 @@
+package com.hz.his.vo.order.refund.qr;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**璁㈠崟浜岀淮鐮侀��娆惧疄浣�
+ * @author CJH
+ */
+@Data
+public class RefundQrVo {
+ /**Y-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /**Y-鏀粯璁㈠崟缂栧彿*/
+ private String payNo;
+ /**Y-閫�娆鹃噾椤嶏紝蹇呴』鍜屾敮浠橀噾棰濅竴鏍�*/
+ private BigDecimal refundTotal;
+ /**Y-鎿嶄綔鍛樺伐*/
+ private String employeeId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
index b939104..9fb4fb5 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
@@ -8,14 +8,17 @@
@Data
public class PayNoVo {
- /**Y-璁㈠崟鍙�*/
+ /**Y-16-璁㈠崟鍙�*/
private String orderNo;
- /**Y-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛屾病鏈夌壒娈婅姹傞兘鏄粯璁�6*/
+ /**Y-12-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛�
+ * 娌℃湁鐗规畩瑕佹眰閮芥槸榛樿6锛屾渶澶�12*/
private Integer lengrhCount = 6;
- /**Y-浜ゆ槗鏂瑰紡*/
+ /**N-浜ゆ槗鏂瑰紡*/
private String payWay;
/**Y-璋冭捣鏀粯鐢ㄦ埛*/
private String userId;
+ /**N-璋冭捣鏀粯鍛樺伐*/
+ private String employeeId;
/**Y-鍏宠仈绫诲瀷*/
private Integer type;
/**Y-鍏宠仈绫诲瀷鏍囪瘑*/
--
Gitblit v1.8.0