From b4b7120d9c33cf1347767f5612dca66e616c571b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 20 Oct 2023 20:36:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/four/common/duck/my/User.java | 2 +- .../request/RechargeWithdrawCashRequest.java | 214 ++++++++++++++++++ 2 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java diff --git a/src/main/java/com/four/common/duck/my/User.java b/src/main/java/com/four/common/duck/my/User.java index c4f43c5..52d2a43 100644 --- a/src/main/java/com/four/common/duck/my/User.java +++ b/src/main/java/com/four/common/duck/my/User.java @@ -74,7 +74,7 @@ public class User { private BigDecimal userMoney; /** - * 余额 + * 邀请码 */ private String invitationCode; diff --git a/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java b/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java new file mode 100644 index 0000000..25039f4 --- /dev/null +++ b/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java @@ -0,0 +1,214 @@ +package com.four.common.duck.request; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: RechargeWithdrawCashRequest + * @date: 2023-10-20 20:25 + **/ +public class RechargeWithdrawCashRequest { + /** + * 充值+提现id + */ + private Integer rechargeWithdrawCashId; + + /** + * 充值+提现用户id + */ + private Integer userId; + + /** + * 充值+提现金额 + */ + private BigDecimal money; + + /** + * 充值+提现时间 + */ + private Date time; + + /** + * 状态：1:提现 2:充值+签到 + */ + private Integer status; + + /** + * 用户的实名认证和银行卡id + */ + private Integer certifiedBankCardId; + + /** + * 用户名称 + */ + private String username; + + /** + * 绑定微信状态 1：未绑定 2：已绑定 + */ + private Integer bindWechatStatus; + + /** + * 实名认证状态 1：未绑定 2：已绑定 + */ + private Integer realNameAuthenticationStatus; + + /** + * 绑定银行卡状态 1：未绑定 2：已绑定 + */ + private Integer bindBankCardStatus; + + /** + * 余额 + */ + private BigDecimal userMoney; + + /** + * 身份证号 + */ + private Integer idNumber; + + /** + * 开户行：银行名称 + */ + private String bankName; + + /** + * 银行卡号 + */ + private String bankCardNumber; + + public Integer getRechargeWithdrawCashId() { + return rechargeWithdrawCashId; + } + + public void setRechargeWithdrawCashId(Integer rechargeWithdrawCashId) { + this.rechargeWithdrawCashId = rechargeWithdrawCashId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public BigDecimal getMoney() { + return money; + } + + public void setMoney(BigDecimal money) { + this.money = money; + } + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getCertifiedBankCardId() { + return certifiedBankCardId; + } + + public void setCertifiedBankCardId(Integer certifiedBankCardId) { + this.certifiedBankCardId = certifiedBankCardId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public Integer getBindWechatStatus() { + return bindWechatStatus; + } + + public void setBindWechatStatus(Integer bindWechatStatus) { + this.bindWechatStatus = bindWechatStatus; + } + + public Integer getRealNameAuthenticationStatus() { + return realNameAuthenticationStatus; + } + + public void setRealNameAuthenticationStatus(Integer realNameAuthenticationStatus) { + this.realNameAuthenticationStatus = realNameAuthenticationStatus; + } + + public Integer getBindBankCardStatus() { + return bindBankCardStatus; + } + + public void setBindBankCardStatus(Integer bindBankCardStatus) { + this.bindBankCardStatus = bindBankCardStatus; + } + + public BigDecimal getUserMoney() { + return userMoney; + } + + public void setUserMoney(BigDecimal userMoney) { + this.userMoney = userMoney; + } + + public Integer getIdNumber() { + return idNumber; + } + + public void setIdNumber(Integer idNumber) { + this.idNumber = idNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBankCardNumber() { + return bankCardNumber; + } + + public void setBankCardNumber(String bankCardNumber) { + this.bankCardNumber = bankCardNumber; + } + + public RechargeWithdrawCashRequest() { + } + + public RechargeWithdrawCashRequest(Integer rechargeWithdrawCashId, Integer userId, BigDecimal money, Date time, Integer status, Integer certifiedBankCardId, String username, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, Integer idNumber, String bankName, String bankCardNumber) { + this.rechargeWithdrawCashId = rechargeWithdrawCashId; + this.userId = userId; + this.money = money; + this.time = time; + this.status = status; + this.certifiedBankCardId = certifiedBankCardId; + this.username = username; + this.bindWechatStatus = bindWechatStatus; + this.realNameAuthenticationStatus = realNameAuthenticationStatus; + this.bindBankCardStatus = bindBankCardStatus; + this.userMoney = userMoney; + this.idNumber = idNumber; + this.bankName = bankName; + this.bankCardNumber = bankCardNumber; + } +} From 92452a6373072578d3e20764e94ceb8ba9ded7da Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Sat, 21 Oct 2023 08:56:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/DetailsPatientCircleRequest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/com/four/common/duck/request/DetailsPatientCircleRequest.java diff --git a/src/main/java/com/four/common/duck/request/DetailsPatientCircleRequest.java b/src/main/java/com/four/common/duck/request/DetailsPatientCircleRequest.java new file mode 100644 index 0000000..4e7f237 --- /dev/null +++ b/src/main/java/com/four/common/duck/request/DetailsPatientCircleRequest.java @@ -0,0 +1,20 @@ +package com.four.common.duck.request; + +import lombok.Data; + +/** + * @program: four-common-duck + * @author: spc + * @create: 2023-10-21 08:43 + * @Version 1.0 + **/ + +@Data +public class DetailsPatientCircleRequest { + + /* + 病症 + */ + private String name; +} + From db418939d6084cbe8ac138d94dfde8c53dc05749 Mon Sep 17 00:00:00 2001 From: TangZhaoZhen <207525215@qq.com> Date: Sun, 22 Oct 2023 10:34:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0user=E8=A1=A8=E4=B8=8E?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E6=B3=A8=E5=86=8C=E8=A1=A8=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegistrationInformation.java | 30 +++++++++++++++++ .../java/com/four/common/duck/my/User.java | 32 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/src/main/java/com/four/common/duck/interrogation/RegistrationInformation.java b/src/main/java/com/four/common/duck/interrogation/RegistrationInformation.java index a68200d..5ad4e73 100644 --- a/src/main/java/com/four/common/duck/interrogation/RegistrationInformation.java +++ b/src/main/java/com/four/common/duck/interrogation/RegistrationInformation.java @@ -13,6 +13,11 @@ public class RegistrationInformation { */ private Integer registrationInformationId; + /** + * 用户表id + */ + private Integer userId; + /** * 真实姓名 */ @@ -73,6 +78,31 @@ public class RegistrationInformation { */ private Integer registrationInformationMedicStatus; + public RegistrationInformation(Integer registrationInformationId, Integer userId, String realName, String affiliatedHospital, Integer medicalDepartmentId, Integer professionalTitleDoctorId, String personalResume, String areaExpertise, Date registrationTime, String numberPatientsServed, BigDecimal consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Integer registrationInformationMedicStatus) { + this.registrationInformationId = registrationInformationId; + this.userId = userId; + this.realName = realName; + this.affiliatedHospital = affiliatedHospital; + this.medicalDepartmentId = medicalDepartmentId; + this.professionalTitleDoctorId = professionalTitleDoctorId; + this.personalResume = personalResume; + this.areaExpertise = areaExpertise; + this.registrationTime = registrationTime; + this.numberPatientsServed = numberPatientsServed; + this.consultingPrice = consultingPrice; + this.praise = praise; + this.registrationInformationExamineStatus = registrationInformationExamineStatus; + this.registrationInformationMedicStatus = registrationInformationMedicStatus; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + /** * 构造函数、getter、setter。。 */ diff --git a/src/main/java/com/four/common/duck/my/User.java b/src/main/java/com/four/common/duck/my/User.java index 52d2a43..b7ae1d9 100644 --- a/src/main/java/com/four/common/duck/my/User.java +++ b/src/main/java/com/four/common/duck/my/User.java @@ -78,6 +78,38 @@ public class User { */ private String invitationCode; + /** + * 状态1：患者 2：医生 + * @return + */ + private Integer differentialState; + + public Integer getDifferentialState() { + return differentialState; + } + + public void setDifferentialState(Integer differentialState) { + this.differentialState = differentialState; + } + + public User(Integer userId, String username, String password, String userEmail, String userPhone, String userAvatar, String userSex, String userSign, Date registrationTime, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, String invitationCode, Integer differentialState) { + this.userId = userId; + this.username = username; + this.password = password; + this.userEmail = userEmail; + this.userPhone = userPhone; + this.userAvatar = userAvatar; + this.userSex = userSex; + this.userSign = userSign; + this.registrationTime = registrationTime; + this.bindWechatStatus = bindWechatStatus; + this.realNameAuthenticationStatus = realNameAuthenticationStatus; + this.bindBankCardStatus = bindBankCardStatus; + this.userMoney = userMoney; + this.invitationCode = invitationCode; + this.differentialState = differentialState; + } + public Integer getUserId() { return userId; } From c5435a420429ee00001a97b77026affd9ae0a3ba Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Sun, 22 Oct 2023 20:05:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0response?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailsPatientCircleDetailCollection.java | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java new file mode 100644 index 0000000..e593182 --- /dev/null +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java @@ -0,0 +1,196 @@ +package com.four.common.duck.response; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @program: four-common-duck + * @author: spc + * @create: 2023-10-22 20:02 + * @Version 1.0 + **/ + +@Data +public class DetailsPatientCircleDetailCollection { + /** + * 病友圈详情id + */ + private Integer detailsPatientCircleId; + + /** + * 标题 + */ + private String title; + + /** + * 发布人id + */ + private Integer publisherId; + + /** + * 病症id + */ + private Integer diseaseId; + + /** + * 科室id + */ + private Integer departmentId; + + /** + * 病症详情 + */ + private String detailsSymptoms; + + /** + * 治疗经历开始时间 + */ + private Date treatmentExperienceStartTime; + + /** + * 治疗经历结束时间 + */ + private Date treatmentExperienceEndTime; + + /** + * 治疗经历 + */ + private String treatmentExperience; + + /** + * 相关图片 + */ + private String relatedPictures; + + /** + * 提升悬赏额度 + */ + private Integer rewardAmount; + + /** + * 收藏数量 + */ + private Integer collectionQuantity; + + /** + * 评论数量 + */ + private Integer numberComments; + + //-------------------------------------------------------- + //-------------------------------------------------------- + //-------------------------------------------------------- + /** + * 常见病症+常见药品id + */ + private Integer id; + + /** + * 名称 + */ + private String name; + + /** + * 与id关联 + */ + private Integer pid; + + //----------------------------------------------------------- + //----------------------------------------------------------- + //----------------------------------------------------------- + + /** + * 详情表中的收藏id + */ + private Integer detailCollectionId; + /** + * 收藏时间 + */ + private Date collectionTime; + + /** + * 收藏人 + */ + private String collector; + //------------------------------------------------------------ + //------------------------------------------------------------ + //------------------------------------------------------------ + /** + * 用户id + */ + private Integer userId; + + /** + * 用户名称 + */ + private String username; + + /** + * 用户密码 + */ + private String password; + + /** + * 邮箱 + */ + private String userEmail; + + /** + * 手机号 + */ + private String userPhone; + + /** + * 头像 + */ + private String userAvatar; + + /** + * 性别 + */ + private String userSex; + + /** + * 体征 + */ + private String userSign; + + /** + * 注册时间 + */ + private Date registrationTime; + + /** + * 绑定微信状态 1：未绑定 2：已绑定 + */ + private Integer bindWechatStatus; + + /** + * 实名认证状态 1：未绑定 2：已绑定 + */ + private Integer realNameAuthenticationStatus; + + /** + * 绑定银行卡状态 1：未绑定 2：已绑定 + */ + private Integer bindBankCardStatus; + + /** + * 余额 + */ + private BigDecimal userMoney; + + /** + * 邀请码 + */ + private String invitationCode; + + /** + * 状态1：患者 2：医生 + * @return + */ + private Integer differentialState; +} + From 82e0869ccbc5f35ca8c6e3758a822ed2791651fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Sun, 22 Oct 2023 21:00:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/interrogation/AdvisoryCollection.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java b/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java index 9521b1d..37e5729 100644 --- a/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java +++ b/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java @@ -20,7 +20,7 @@ public class AdvisoryCollection { /** * 收藏人id */ - private Integer userId; + private Long userId; public Integer getAdvisoryCollectionId() { return advisoryCollectionId; @@ -38,18 +38,18 @@ public class AdvisoryCollection { this.consultationDetailsId = consultationDetailsId; } - public Integer getUserId() { + public Long getUserId() { return userId; } - public void setUserId(Integer userId) { + public void setUserId(Long userId) { this.userId = userId; } public AdvisoryCollection() { } - public AdvisoryCollection(Integer advisoryCollectionId, Integer consultationDetailsId, Integer userId) { + public AdvisoryCollection(Integer advisoryCollectionId, Integer consultationDetailsId, Long userId) { this.advisoryCollectionId = advisoryCollectionId; this.consultationDetailsId = consultationDetailsId; this.userId = userId; From 11518b610ec8cc448d5791af8ac43ab427ca7c1b Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 23 Oct 2023 10:19:32 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9response=E7=9A=84DetailsP?= =?UTF-8?q?atientCircleDetailCollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailsPatientCircleDetailCollection.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java index e593182..8e3a58c 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java @@ -192,5 +192,27 @@ public class DetailsPatientCircleDetailCollection { * @return */ private Integer differentialState; + //-------------------------------------------- + //-------------------------------------------- + //-------------------------------------------- + /** + * 点赞和嘲讽id + */ + private Integer likeMockId; + + /** + * 点赞或嘲讽人id + */ + private Integer likeMockPeopleId; + + /** + * 点赞时间 + */ + private Date thumbsTime; + + /** + * 状态1：代表点赞2：代表嘲讽 + */ + private String likeMockStatus; } From a45d5c2d41c311c7c08ee73cc831a4d6a86e260e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 24 Oct 2023 11:06:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/request/RechargeWithdrawCashRequest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java b/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java index 25039f4..cac5ad5 100644 --- a/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java +++ b/src/main/java/com/four/common/duck/request/RechargeWithdrawCashRequest.java @@ -43,7 +43,7 @@ public class RechargeWithdrawCashRequest { /** * 用户名称 */ - private String username; + private String userName; /** * 绑定微信状态 1：未绑定 2：已绑定 @@ -128,12 +128,12 @@ public class RechargeWithdrawCashRequest { this.certifiedBankCardId = certifiedBankCardId; } - public String getUsername() { - return username; + public String getUserName() { + return userName; } - public void setUsername(String username) { - this.username = username; + public void setUserName(String userName) { + this.userName = userName; } public Integer getBindWechatStatus() { @@ -195,14 +195,14 @@ public class RechargeWithdrawCashRequest { public RechargeWithdrawCashRequest() { } - public RechargeWithdrawCashRequest(Integer rechargeWithdrawCashId, Integer userId, BigDecimal money, Date time, Integer status, Integer certifiedBankCardId, String username, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, Integer idNumber, String bankName, String bankCardNumber) { + public RechargeWithdrawCashRequest(Integer rechargeWithdrawCashId, Integer userId, BigDecimal money, Date time, Integer status, Integer certifiedBankCardId, String userName, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, Integer idNumber, String bankName, String bankCardNumber) { this.rechargeWithdrawCashId = rechargeWithdrawCashId; this.userId = userId; this.money = money; this.time = time; this.status = status; this.certifiedBankCardId = certifiedBankCardId; - this.username = username; + this.userName = userName; this.bindWechatStatus = bindWechatStatus; this.realNameAuthenticationStatus = realNameAuthenticationStatus; this.bindBankCardStatus = bindBankCardStatus;