From f6adad210793ad1942f469bc9a06b44e0537bdae Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期一, 05 九月 2022 16:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 9 ++++-----
phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java | 28 ++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java | 18 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java | 2 ++
5 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
new file mode 100644
index 0000000..d4e3418
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+/**鐢ㄦ埛鎷ユ湁鏌ヨ瀹炰綋*/
+@Data
+public class UserHaveDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+
+ /*************浼樻儬鍒告煡璇㈠弬鏁�******************/
+ /**鏄惁鏈夋晥*/
+ private Integer validState;
+ /**鏄惁杩囨湡*/
+ private Integer isExpired;
+ /**鏄惁浣跨敤*/
+ private Integer isUse;
+ /**骞冲彴*/
+ private String platform;
+
+ /************棰勭害鏌ヨ鍙傛暟***************************/
+ /**鏄惁鍒板簵*/
+ private Integer isArrive;
+
+ /************椤圭洰鏌ヨ鍙傛暟**************************/
+ /**鏄惁鏈嶅姟*/
+ private Integer isService;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
index ba96616..3ca5adc 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -57,6 +57,8 @@
private String userCouponId;
/**骞冲彴绫诲瀷*/
private String platform;
+ /**鍒楄〃鐘舵��:0鍏ㄩ儴1鏈娇鐢�2宸蹭娇鐢�3宸茶繃鏈�*/
+ private Integer listStatus;
/**棰嗗彇绫诲瀷-鏈煡*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index f500d29..be84009 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -1,10 +1,8 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserAppointmentDto;
-import com.hz.his.dto.user.UserDto;
-import com.hz.his.dto.user.UserIdsDto;
-import com.hz.his.dto.user.UserLevelDto;
+import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.user.*;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
import com.hz.his.dto.user.coupon.*;
@@ -172,9 +170,10 @@
/**
* 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
+ * 杩斿洖浣跨敤UserHaveDt
* */
@PostMapping(value = "/user/have/count")
- Result userHaveCount(@RequestParam("userId") String userId);
+ Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
/**
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java
index 5ee9035..06ddb88 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java
@@ -16,6 +16,8 @@
private String id;
/**瑙勬牸鏍囪瘑*/
private String specId;
+ /**瑙勬牸鍚嶇О*/
+ private String specName;
/**瑙勬牸鍊�*/
private List<SpuSpecValueDt> specValueList;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java
new file mode 100644
index 0000000..8f70551
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java
@@ -0,0 +1,18 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鐢ㄦ埛鎷ユ湁杩斿洖瀹炰綋*/
+@Data
+public class UserHaveDt {
+ /**浼樻儬鍒告暟閲�*/
+ private Integer couponNum;
+ /**椤圭洰鏁伴噺*/
+ private Integer projectNum;
+ /**鍗￠」鏁伴噺*/
+ private Integer cardNum;
+ /**棰勭害鏁伴噺*/
+ private Integer appointNum;
+}
--
Gitblit v1.8.0