From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 10:46:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置
---
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 181 ++++++++++++++-------------------------------
1 files changed, 56 insertions(+), 125 deletions(-)
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 48ae9e3..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
@@ -1,10 +1,8 @@
package com.hz.his.dto.user;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -14,214 +12,129 @@
*/
@Data
@ToString
-public class UserParamDto {
+public class UserParamDto extends UserBaseInfoDto {
- /** 鐢ㄦ埛id */
- private String userId;
-
- /** 濮撳悕 */
- private String name;
-
- /** 涓荤數璇濆彿鐮� */
- private String tel;
/** 鏉ユ簮淇℃伅 */
private UserUnionDto userUnion;
- /** 鍥剧墖 */
- private String imgUrl;
-
/** 浼氬憳绛夌骇 */
private String userLevel;
-
/** 鏄熺骇,100涓�1鏄燂紝150涓�1.5鏄� */
private Integer starLevel;
- /** 鐢ㄦ埛绫诲瀷 */
- private String userType;
-
- /** 鏉ユ簮id */
- private String channelId;
-
- /** 鏉ユ簮 */
- private String channelType;
-
- /** 浜岀骇鏉ユ簮id */
- private String channel2Id;
-
- /** 浜岀骇鏉ユ簮 */
- private String channelType2;
+ /** 鍓笭閬撴爣璇� */
+ private String channelAssistId;
+ /** 鍓笭閬撳悕绉� */
+ private String channelAssistName;
+ /** 鍓笭閬撲簩绾ф爣璇�,鏈骇 */
+ private String channelAssist2Id;
+ /** 鍓笭閬撲簩绾ф潵婧�,鏈骇 */
+ private String channelAssist2Name;
/** QQ */
private String QQ;
-
- /** 鎬у埆 */
- private Integer gender = SEX_WUMAN;
-
/** CIQ */
private String CIQ;
-
/** 浼氬憳鍙� */
private String memberNO;
- /** 澶囨敞 */
- private String remark;
-
/** 娑堣垂閲戦 */
private String money;
-
/** 涓婁竴娆￠绾︾殑鍖荤敓 */
private String lastDoctorId;
-
/** 涓婁竴娆￠绾︾殑椤鹃棶 */
private String lastCorpUserId;
- /** 璇佷欢绫诲瀷 */
- private Integer certificateType;
-
- /** 璇佷欢缂栧彿 */
- private String certificateNo;
-
- /** 鐢熸棩yyyy-MM-dd" */
- private String birthDay;
-
/** 宸ヤ綔浜哄憳Id */
private String corpUserId;
-
/** 鎺ュ彛id */
private String apiId;
-
- /** 鎵�灞為【闂�(閿�鍞【闂�) */
- private String hisCorpUserId;
-
/** 瀹㈡埛寮�鍙戜汉鍛樺伐id */
private String customerDeveloperId;
- /** 鎵�灞為棬搴梚d */
- private String shopId;
-
/** 鐢ㄦ埛瑙掕壊 */
private Integer userRole;
-
/** 鎷奸煶鐮�*/
private String pinyinCode;
- /** 鐢电綉鍜ㄨ椤鹃棶 */
- private String internetCorpUserId;
-
/** 鎵�灞炵編瀹瑰笀*/
private String beauticianCorpUserId;
-
- /** 瀹㈡湇涓撳憳 */
- private String chatCorpUserId;
-
/** 鍜ㄨ鍔╃悊 */
private String consultCorpUserId;
-
/** 鍏变韩瀹㈡埛 */
private Integer shareCustomer = 0;
-
/** 鎵�灞炴姢澹� */
private String nurseCorpUserId;
-
- /** 鎵�灞炲尰鐢� */
- private String doctorCorpUserId;
-
/** 鍜ㄨ甯堥毝灞� */
private String consultBelonging;
/** 鍥藉绫诲瀷鍚嶇О */
private String countryTypeName;
-
/** 璇█绫诲瀷鍚嶇О */
private String languageTypeName;
-
/** 鐢ㄦ埛骞撮緞 */
- private Integer year = 0;
+ private Integer year;
/** 鏄熷骇绫诲瀷鍚嶇О */
private String constellationTypeName;
-
/** 姘戞棌绫诲瀷鍚嶇О */
private String nationalityTypeName;
-
/** 鑱屼笟绫诲瀷鍚嶇О */
private String professionTypeName;
-
/** 鏀跺叆绫诲瀷鍚嶇О */
private String incomeTypeName;
-
/** 濠氬Щ绫诲瀷鍚嶇О */
private String marriageTypeName;
-
/** 鐢熻偛绫诲瀷鍚嶇О */
private String growthTypeName;
-
/** 绫嶈疮绫诲瀷鍚嶇О */
private String nativePlaceTypeName;
-
/** 鍗曚綅鍚嶇О */
private String unitName;
-
/** 娉婅溅闇�姹� */
private Integer isHaveCar = 0;
-
/** 杞︾墝鍙风爜 */
private String carNumber;
/** 杩囨晱鏍囩 */
private String allergyLabel;
-
/** 鍗拌薄鏍囩 json */
private String impressionLabelJson;
-
/** 鐢ㄦ埛鍏磋叮鐖卞ソjson */
private String userInterestsJson;
-
- /** email */
- private String email;
-
- /** 鍟嗗姟閫氱紪鍙� */
- private String merchantNo;
-
- /** 鍥哄畾鐢佃瘽 */
- private String telPhone;
-
- /** wechat */
- private String wechat;
-
- /** Line */
- private String line;
-
- /** 鑱旂粶鏂瑰紡 */
- private String contactType;
-
- /** 鐢ㄦ埛鍦板潃 json */
- private String addressJson;
-
+ /** 绉戝鍏崇郴json */
+ private String departmentJson;
/** 娆¤鐢佃瘽绨� json */
private String phoneBooksJson;
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ /** email */
+ private String email;
+ /** 鍟嗗姟閫氱紪鍙� */
+ private String merchantNo;
+ /** 鍥哄畾鐢佃瘽 */
+ private String telPhone;
+ /** wechat */
+ private String wechat;
+ /** Line */
+ private String line;
+ /** 鑱旂粶鏂瑰紡 */
+ private String contactType;
+
+
/** 鏇存柊鏃堕棿 */
private Date updateTime;
-
- /** 閭�璇蜂汉id 鐢ㄦ埛锛屽憳宸� */
- private String inviteeId;
-
- /** 娓犻亾鏉ユ簮绫诲瀷 */
- private String channelCategory= CATEGORY_ONESELF;
-
/** 鎬у埆0鏈煡1鐢�2濂� */
private Integer sex;
-
/** 浼氬憳鍚嶇О */
private String memberLevel;
-
/** 鎼滅储锛氬仛杩囬」鐩� */
private String projectName;
+ /** 鍖荤敓id */
+ private String doctorId;
+ /** 閮ㄩ棬id */
+ private String department;
/** 鐢ㄦ埛娑堣垂鏃堕棿锛堝紑濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
private String consumeStartTime;
@@ -229,6 +142,32 @@
private String createStartTime;
/** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙缁撴潫锛夛紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss */
private String createEndTime;
+
+ /*鐢ㄦ埛娉ㄥ唽鎺ㄨ崘浜篿d*/
+ private String referrerId;
+ /*鍚屾棰嗗缓鐨勫弬鏁�*/
+ private boolean internal;
+
+ //淇敼鎿嶄綔浜哄悕绉�
+ private String opMan;
+ //淇敼鎿嶄綔浜烘爣璇�
+ private String opId;
+ //淇敼鎿嶄綔鐨勫娉�
+ private String note;
+ /** 鎬у埆0鏈煡1鐢�2濂� */
+ private Integer gender;
+
+ /**鏄惁杞瘖*/
+ private Integer isTransfer;
+ /**杞瘖淇℃伅*/
+ private UserTransferDto transferRecord;
+
+ /**涓昏璇夋眰**/
+ private String mainAppeal;
+ private String minorAppeal;
+
+ public UserParamDto() {
+ }
/**鎬у埆-鏈煡*/
public static final Integer SEX_UNKNOWN = 0;
@@ -246,16 +185,8 @@
/**娓犻亾绫诲埆-鑷繁鏉�*/
public static final String CATEGORY_ONESELF = "oneself";
- /*鐢ㄦ埛娉ㄥ唽鎺ㄨ崘浜篿d*/
- private String referrerId;
- /*鍚屾棰嗗缓鐨勫弬鏁�*/
- private boolean internal;
- //淇敼鎿嶄綔浜哄悕绉�
- private String opMan;
- //淇敼鎿嶄綔浜烘爣璇�
- private String opId;
}
--
Gitblit v1.8.0