Merge remote-tracking branch 'origin/master'

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;

src/main/java/com/four/common/duck/interrogation/RegistrationInformation.java

@@ -19,6 +19,11 @@ public class RegistrationInformation {
      */
     private Integer userId;
 
+    /**
+     * 用户表id
+     */
+    private Integer userId;
+
     /**
      * 真实姓名
      */
@@ -79,6 +84,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。。
      */

src/main/java/com/four/common/duck/my/User.java

@@ -74,10 +74,42 @@ public class User {
     private BigDecimal userMoney;
 
     /**
-     * 余额
+     * 邀请码
      */
     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;
     }

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;
+}
+

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;
+    }
+}

src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java

@@ -0,0 +1,218 @@
+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;
+    //--------------------------------------------
+    //--------------------------------------------
+    //--------------------------------------------
+    /**
+     * 点赞和嘲讽id
+     */
+    private Integer likeMockId;
+
+    /**
+     * 点赞或嘲讽人id
+     */
+    private Integer likeMockPeopleId;
+
+    /**
+     * 点赞时间
+     */
+    private Date thumbsTime;
+
+    /**
+     * 状态1：代表点赞2：代表嘲讽
+     */
+    private String likeMockStatus;
+}
+