From d9e79296cd5e701d2a41c4c2b751f54a502a6c77 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 11 九月 2023 17:27:49 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 7 +++
phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java | 7 +++
phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 5 ++
phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java | 58 +++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 2
6 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 260182b..6ff579f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -25,7 +25,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
- private String id;
+ private List<String> idList;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
index ea7148e..ca3f5b5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
@@ -12,7 +12,7 @@
@Data
public class CardItemInfoDto {
/**
- * 浣跨敤娆℃暟
+ * 璐拱鍟嗗搧鏁伴噺锛屾敞鎰忥細涓嶆槸鎶垫墸娆℃暟
*/
private Integer userNum;
/**
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
index f4bfde3..31b48a3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
@@ -27,6 +27,13 @@
/** 瀵瑰簲鍒ゆ柇鏍囪瘑锛屽鏋滄椂绉垎鏀粯鏃跺搴旓細101=涓嶉渶鎵ｅ噺绉垎锛�100=闇�瑕佹墸鍑忕Н鍒� */
private Integer isDel = 0;
+ /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+ private String otherOrderNo;
+ /**闈炲繀濉� 娆＄骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+ private String assistOrderNo;
+ /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+ private String ocrImageUrl;
+
public OrderConsumePayDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index a92147a..7b0dc41 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -30,4 +30,11 @@
* isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
*/
private Integer isDel = 0;
+
+ /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+ private String otherOrderNo;
+ /**闈炲繀濉� 娆＄骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+ private String assistOrderNo;
+ /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+ private String ocrImageUrl;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 913d936..48d240c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -157,6 +157,11 @@
/** 鎬у埆0鏈煡1鐢�2濂� */
private Integer gender;
+ /**鏄惁杞瘖*/
+ private Integer isTransfer;
+ /**杞瘖淇℃伅*/
+ private UserTransferDto transferRecord;
+
public UserParamDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java
new file mode 100644
index 0000000..a23627b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java
@@ -0,0 +1,58 @@
+package com.hz.his.dto.user;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 杞瘖鍙傛暟
+ */
+@Data
+public class UserTransferDto{
+ /**鐢ㄦ埛id*/
+ private String userId;
+ /**鐘舵��*/
+ private Integer status;
+ /**绫诲瀷 0 杞瘖 1 杞枟*/
+ private Integer type;
+ /**杞嚭闂ㄥ簵id*/
+ private String transferOutShopId;
+ /**杞嚭闂ㄥ簵鍚嶇О*/
+ private String transferOutShopName;
+ /**杞叆闂ㄥ簵id*/
+ private String transferIntoShopId;
+ /**杞叆闂ㄥ簵鍚嶇О*/
+ private String transferIntoShopName;
+ /**杞叆鏃堕棿*/
+ private Date transferTime;
+ /**鐢宠浜虹被鍨�*/
+ private Integer applyAdminType;
+ /**鐢宠浜篿d*/
+ private String applyAdminId;
+ /**鐢宠浜哄悕绉�*/
+ private String applyAdminName;
+ /**瀹℃牳浜虹被鍨�*/
+ private Integer approvedAdminType;
+ /**瀹℃牳浜篿d*/
+ private String approvedAdminId;
+ /**瀹℃牳浜哄悕绉�*/
+ private String approvedAdminName;
+ /**瀹℃牳鏃堕棿*/
+ private Date approvedTime;
+ /**澶囨敞*/
+ private String remark;
+ /**鏄惁鐭俊鎻愰啋*/
+ private Integer isNotice;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+ /**鎿嶄綔浜篒d*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉癗ame*/
+ private String operatorName;
+
+
+
+
+
+}
--
Gitblit v1.8.0