From 9314ee848f4e8276f9f9be97e1720f3dbd1f5a29 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 19 三月 2024 14:53:25 +0800
Subject: [PATCH] 新增标签获取
---
phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java | 2 ++
phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 10 +++++-----
phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java | 10 ++++++++--
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 0e68d0c..b17c67c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -59,15 +59,15 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
- /**璧犻�佸埌璐︾敤鎴�*/
+ /**璧犻�佸埌璐︾敤鎴�-锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private String giveIncreaseUserId;
- /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級*/
+ /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private BigDecimal giveIncrease;
- /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
+ /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private String giveIncreaseId;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseTitle;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseInfo;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
index 98ef5c6..05f0770 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
@@ -31,11 +31,17 @@
/**
- * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛�
- * @return Result
+ * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛撅紙鏍规嵁鑼冨洿鑾峰彇锛�
+ * @return Result鐨刣ata杞垚LabelTypeVo鐨勯泦鍚�
*/
@PostMapping(value = "/label/type/tree/by-label")
Result getLabelTypeTreeByLabel(@RequestBody LabelFindVo labelFindVo);
+ /**鏍规嵁鑼冨洿鑾峰彇
+ * 鑾峰彇鐢ㄦ埛鏍囩
+ * @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
+ */
+ @PostMapping(value = "/label/user/label")
+ Result getLabelUserLabel(@RequestBody LabelFindVo labelFindVo);
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
index 1cc0769..ae63cc7 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
@@ -10,5 +10,7 @@
/**鑼冨洿鏍囪瘑*/
private String rangeCode;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
index 1ed9883..c63bd87 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
@@ -15,6 +15,8 @@
private String id;
/**鏍囩鍚嶇О*/
private String name;
+ /**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
+ private Integer isCustom;
public LabelVo() {
}
@@ -23,4 +25,10 @@
this.id = id;
this.name = name;
}
+
+ public LabelVo(String id, String name, Integer isCustom) {
+ this.id = id;
+ this.name = name;
+ this.isCustom = isCustom;
+ }
}
--
Gitblit v1.8.0