From 00b97acec0f98d7f4f4a62e16ca182823ce983e2 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:13:38 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java | 6 +++
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 29 ++++++++++++++
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java | 24 ++++++++++++
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java | 26 +++++++++++++
4 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
index ba67f69..0fb33a9 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
@@ -25,6 +25,12 @@
@PostMapping(value = "/user/card/delay/cardBag")
Result delayCardBag(@RequestBody CardBagDto cardBagDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭�
+ * @return 杞寲瀵硅薄UserCardVo
+ */
+ @PostMapping(value = "/user/card/get/deduction-data")
+ Result deductionData(@RequestBody CardBagDto cardBagDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java
new file mode 100644
index 0000000..ce3be1e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java
@@ -0,0 +1,26 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鐢ㄦ埛鍗￠」鏉冪泭淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardEquityVo {
+
+ /**鐢ㄦ埛鍗￠」鏉冪泭-鏍囪瘑*/
+ private String equityId;
+ /**鐢ㄦ埛鍗￠」鏉冪泭-鍚嶇О*/
+ private String equityName;
+ /**鐢ㄦ埛鍗￠」鏉冪泭-绫诲瀷*/
+ private Integer equityType;
+ /**鐢ㄦ埛鍗￠」鏉冪泭-鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鏉′欢鍊�*/
+ private Integer conditionValue;
+ /**鍏宠仈鐨勬潯鐩�*/
+ private List<UserCardItemVo> userCardItemVoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
new file mode 100644
index 0000000..7f60784
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
@@ -0,0 +1,29 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鐢ㄦ埛鍗￠」鏉＄洰淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardItemVo {
+
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鏍囪瘑*/
+ private String itemId;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍚嶇О*/
+ private String itemName;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍒嗘憡鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸閲戦*/
+ private BigDecimal singleAmount;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鎬绘姷鎵ｆ鏁�*/
+ private Integer deductionNum;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸娆℃暟*/
+ private Integer deductionSingle;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�*/
+ private Integer usedNum;
+ /**鍓╀綑鍙姷鎵ｆ�绘鏁�*/
+ private Integer surplusNum;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
new file mode 100644
index 0000000..ecdba91
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
@@ -0,0 +1,24 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鐢ㄦ埛鍗￠」淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardVo {
+
+ /**鐢ㄦ埛鍗￠」-鏍囪瘑*/
+ private String userCardId;
+ /**鍗￠」-鏍囪瘑*/
+ private String cardId;
+ /**鍗￠」-鍚嶇О*/
+ private String cardName;
+ /**鍗￠」-鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鍏宠仈鐨勬潈鐩�*/
+ private List<UserCardEquityVo> userCardEquityVoList;
+
+}
--
Gitblit v1.8.0