Merge remote-tracking branch 'origin/master'

src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java

@@ -1,5 +1,8 @@
 package com.four.common.duck.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -9,51 +12,36 @@ import java.util.Date;
 public class RechargeWithdrawCash {
 
     /**
-     * 充值+提现id
+     * 钱包记录id
      */
     private Long rechargeWithdrawCashId;
 
     /**
-     * 充值+提现用户id
+     * 用户id
      */
     private Long userId;
 
     /**
-     * 充值+提现金额
+     * 钱包记录时间
-     */
-    private BigDecimal money;
-
-    /**
-     * 充值+提现时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8")
     private Date time;
 
     /**
-     * 状态：1:提现  2:充值+签到
+     * 钱包记录描述
      */
-    private Long status;
+    private String description;
 
     /**
-     * 用户的实名认证和银行卡id
+     * 金额
      */
-    private Long certifiedBankCardId;
+    private BigDecimal amount;
 
     public Long getRechargeWithdrawCashId() {
         return rechargeWithdrawCashId;
     }
 
-    public RechargeWithdrawCash() {
-    }
-
-    public RechargeWithdrawCash(Long rechargeWithdrawCashId, Long userId, BigDecimal money, Date time, Long status, Long certifiedBankCardId) {
-        this.rechargeWithdrawCashId = rechargeWithdrawCashId;
-        this.userId = userId;
-        this.money = money;
-        this.time = time;
-        this.status = status;
-        this.certifiedBankCardId = certifiedBankCardId;
-    }
-
     public void setRechargeWithdrawCashId(Long rechargeWithdrawCashId) {
         this.rechargeWithdrawCashId = rechargeWithdrawCashId;
     }
@@ -66,14 +54,6 @@ public class RechargeWithdrawCash {
         this.userId = userId;
     }
 
-    public BigDecimal getMoney() {
-        return money;
-    }
-
-    public void setMoney(BigDecimal money) {
-        this.money = money;
-    }
-
     public Date getTime() {
         return time;
     }
@@ -82,19 +62,30 @@ public class RechargeWithdrawCash {
         this.time = time;
     }
 
-    public Long getStatus() {
+    public String getDescription() {
-        return status;
+        return description;
     }
 
-    public void setStatus(Long status) {
+    public void setDescription(String description) {
-        this.status = status;
+        this.description = description;
     }
 
-    public Long getCertifiedBankCardId() {
+    public BigDecimal getAmount() {
-        return certifiedBankCardId;
+        return amount;
     }
 
-    public void setCertifiedBankCardId(Long certifiedBankCardId) {
+    public void setAmount(BigDecimal amount) {
-        this.certifiedBankCardId = certifiedBankCardId;
+        this.amount = amount;
+    }
+
+    public RechargeWithdrawCash() {
+    }
+
+    public RechargeWithdrawCash(Long rechargeWithdrawCashId, Long userId, Date time, String description, BigDecimal amount) {
+        this.rechargeWithdrawCashId = rechargeWithdrawCashId;
+        this.userId = userId;
+        this.time = time;
+        this.description = description;
+        this.amount = amount;
     }
 }

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

@@ -1,11 +1,14 @@
 package com.four.common.duck.interrogation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**
  * 健康咨询详情表
  */
-public class ConsultationDetails extends ConsultationDetailsType{
+public class ConsultationDetails {
 
     /**
      * 健康咨询详情id
@@ -25,6 +28,8 @@ public class ConsultationDetails extends ConsultationDetailsType{
     /**
      * 发布时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8")
     private Date releaseTime;
 
     /**
@@ -33,16 +38,19 @@ public class ConsultationDetails extends ConsultationDetailsType{
     private String consultationDetailsContent;
 
     /**
-     * 类型
+     * 类型id
      */
     private Long consultationDetailsTypeId;
 
+    /**
+     * 图片
+     */
+    private String consultationDetailsImg;
     /**
      * 发布人名称
      */
     private String userName;
 
-    private Integer status;
 
     public Long getConsultationDetailsId() {
         return consultationDetailsId;
@@ -92,6 +100,14 @@ public class ConsultationDetails extends ConsultationDetailsType{
         this.consultationDetailsTypeId = consultationDetailsTypeId;
     }
 
+    public String getConsultationDetailsImg() {
+        return consultationDetailsImg;
+    }
+
+    public void setConsultationDetailsImg(String consultationDetailsImg) {
+        this.consultationDetailsImg = consultationDetailsImg;
+    }
+
     public String getUserName() {
         return userName;
     }
@@ -100,26 +116,17 @@ public class ConsultationDetails extends ConsultationDetailsType{
         this.userName = userName;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public ConsultationDetails() {
     }
 
-    public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String userName, Integer status) {
+    public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String consultationDetailsImg, String userName) {
         this.consultationDetailsId = consultationDetailsId;
         this.consultationDetailsTitle = consultationDetailsTitle;
         this.userId = userId;
         this.releaseTime = releaseTime;
         this.consultationDetailsContent = consultationDetailsContent;
         this.consultationDetailsTypeId = consultationDetailsTypeId;
+        this.consultationDetailsImg = consultationDetailsImg;
         this.userName = userName;
-        this.status = status;
     }
-
 }

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

@@ -1,5 +1,7 @@
 package com.four.common.duck.interrogation;
 
+import java.util.List;
+
 /**
  * @author: tongCheng
  * @Package: four-common-duck
@@ -8,10 +10,19 @@ package com.four.common.duck.interrogation;
  **/
 public class ConsultationDetailsType {
 
+    /**
+     * 健康资讯分类主键
+     */
     private Long consultationDetailsTypeId;
 
+    /**
+     * 健康资讯分类名称
+     */
+
     private String consultationDetailsTypeName;
 
+    private List<ConsultationDetails> consultationDetailsList;
+
 
     public Long getConsultationDetailsTypeId() {
         return consultationDetailsTypeId;
@@ -29,11 +40,20 @@ public class ConsultationDetailsType {
         this.consultationDetailsTypeName = consultationDetailsTypeName;
     }
 
+    public List<ConsultationDetails> getConsultationDetailsList() {
+        return consultationDetailsList;
+    }
+
+    public void setConsultationDetailsList(List<ConsultationDetails> consultationDetailsList) {
+        this.consultationDetailsList = consultationDetailsList;
+    }
+
     public ConsultationDetailsType() {
     }
 
-    public ConsultationDetailsType(Long consultationDetailsTypeId, String consultationDetailsTypeName) {
+    public ConsultationDetailsType(Long consultationDetailsTypeId, String consultationDetailsTypeName, List<ConsultationDetails> consultationDetailsList) {
         this.consultationDetailsTypeId = consultationDetailsTypeId;
         this.consultationDetailsTypeName = consultationDetailsTypeName;
+        this.consultationDetailsList = consultationDetailsList;
     }
 }

src/main/java/com/four/common/duck/request/UserRequest.java

@@ -0,0 +1,51 @@
+package com.four.common.duck.request;
+
+public class UserRequest {
+    /**
+     *  用户名称
+     */
+    private String username;
+
+    /**
+     *用户密码
+     */
+    private String password;
+
+    /**
+     * 发送内容
+     */
+    private String msg;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public UserRequest() {
+    }
+
+    public UserRequest(String username, String password, String msg) {
+        this.username = username;
+        this.password = password;
+        this.msg = msg;
+    }
+}