From 6f337fb3e6346e9a0da2f2fb9c22730095a45323 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 22 九月 2023 15:49:19 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-phis下载中心
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 3
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java | 219 +++++++++++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java | 30 ++++++
6 files changed, 260 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index d5ee25f..cee6e84 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -37,6 +37,8 @@
private String sourceName;
/**鏄惁杩囨护娴嬭瘯璐﹀彿*/
private Integer isFilterTestAccount;
+ /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+ private Integer isHedging;
/**涓氱哗绫诲瀷*/
private List<Integer> sourceTypeList;
/*******淇濆瓨鍙傛暟********/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
index ab01413..c05f351 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -24,4 +24,7 @@
private String sleepTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
}
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 48d240c..eae2439 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
@@ -162,6 +162,10 @@
/**杞瘖淇℃伅*/
private UserTransferDto transferRecord;
+ /**涓昏璇夋眰**/
+ private String mainAppeal;
+ private String minorAppeal;
+
public UserParamDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
new file mode 100644
index 0000000..dd2365a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
@@ -0,0 +1,219 @@
+package com.hz.his.dto.user.usercompleteInfo;
+
+
+/***
+ * 鐢ㄦ埛鎵爜瀹屽杽璧勬枡 dto
+ */
+public class UserInfoCompleteDto {
+
+ //鐢ㄦ埛ID
+ private String userId;
+ //鐢ㄦ埛鍚嶇О
+ private String name;
+ //鎬у埆 0=鏈煡 1=鐢� 2=濂�
+ private Integer gender;
+ //鎵嬫満鍙�
+ private String tel;
+ //閭
+ private String email;
+ //璇佷欢绫诲瀷
+ private Integer certificateType;
+ //璇佷欢鍙风爜
+ private String certificateNo;
+ //鍑虹敓鏃ユ湡
+ private String birthDay;
+ //宸ヤ綔
+ private String professionTypeName;
+ //濠氬惁
+ private String marriageTypeName;
+ //鐢熻偛
+ private String growthTypeName;
+
+ //鍦板潃淇℃伅
+ private String country;
+ private String province;
+ private String city;
+ private String area;
+ private String detail;
+
+ //鏉ユ簮-娓犻亾鍚嶇О
+ private String sourceName;
+
+ //鏄惁濂藉弸鎺ㄨ崘 0=鍚� 1=鏄�
+ private Integer isFriendReferrer;
+ //濂藉弸鍚嶇О
+ private String friendName;
+ //涓昏璇夋眰
+ private String mainAppeal;
+ //娆¤璇夋眰
+ private String minorAppeal;
+
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getGender() {
+ return gender;
+ }
+
+ public void setGender(Integer gender) {
+ this.gender = gender;
+ }
+
+ public String getTel() {
+ return tel;
+ }
+
+ public void setTel(String tel) {
+ this.tel = tel;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public Integer getCertificateType() {
+ return certificateType;
+ }
+
+ public void setCertificateType(Integer certificateType) {
+ this.certificateType = certificateType;
+ }
+
+ public String getCertificateNo() {
+ return certificateNo;
+ }
+
+ public void setCertificateNo(String certificateNo) {
+ this.certificateNo = certificateNo;
+ }
+
+ public String getBirthDay() {
+ return birthDay;
+ }
+
+ public void setBirthDay(String birthDay) {
+ this.birthDay = birthDay;
+ }
+
+ public String getProfessionTypeName() {
+ return professionTypeName;
+ }
+
+ public void setProfessionTypeName(String professionTypeName) {
+ this.professionTypeName = professionTypeName;
+ }
+
+ public String getMarriageTypeName() {
+ return marriageTypeName;
+ }
+
+ public void setMarriageTypeName(String marriageTypeName) {
+ this.marriageTypeName = marriageTypeName;
+ }
+
+ public String getGrowthTypeName() {
+ return growthTypeName;
+ }
+
+ public void setGrowthTypeName(String growthTypeName) {
+ this.growthTypeName = growthTypeName;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public String getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public Integer getIsFriendReferrer() {
+ return isFriendReferrer;
+ }
+
+ public void setIsFriendReferrer(Integer isFriendReferrer) {
+ this.isFriendReferrer = isFriendReferrer;
+ }
+
+ public String getFriendName() {
+ return friendName;
+ }
+
+ public void setFriendName(String friendName) {
+ this.friendName = friendName;
+ }
+
+ public String getMainAppeal() {
+ return mainAppeal;
+ }
+
+ public void setMainAppeal(String mainAppeal) {
+ this.mainAppeal = mainAppeal;
+ }
+
+ public String getMinorAppeal() {
+ return minorAppeal;
+ }
+
+ public void setMinorAppeal(String minorAppeal) {
+ this.minorAppeal = minorAppeal;
+ }
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java
new file mode 100644
index 0000000..d8297f3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.user.usercompleteInfo.UserInfoCompleteDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-complete")
+
+public interface SPhipUserInfoCompleteService {
+
+
+ /**
+ * 寮�鏀惧钩鍙�-澶勭悊鎵爜鐢ㄦ埛瀹屽杽璧勬枡椤典俊鎭� (缂栬緫)
+ */
+ @PostMapping(value = "/user/complete/edit")
+ Result userCompleteEdit(@RequestBody UserInfoCompleteDto userInfoCompleteDto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-灞曠ず 瀹屽杽璧勬枡椤佃鎯呮暟鎹�
+ */
+ @PostMapping(value = "/user/complete/detail")
+ Result userCompleteDetail(@RequestBody UserInfoCompleteDto userInfoCompleteDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 3d638b7..243414e 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -40,6 +40,8 @@
private Date endCreateTime;
/**鏄惁杩囨护娴嬭瘯璐﹀彿*/
private Integer isFilterTestAccount;
+ /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+ private Integer isHedging;
/**涓氱哗绫诲瀷*/
private List<Integer> sourceTypeList;
--
Gitblit v1.8.0