调整后台

2020-11-29 08:49:16 +08:00
parent a3a8fae363
commit b747473858
24 changed files with 2552 additions and 64 deletions
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysContract.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysContract.java
@@ -220,4 +220,138 @@ public class SysContract extends BaseEntity {

                .toString();
    }
+
+    /**
+     * 微信用户对象 sys_wx_user_info
+     *
+     * @author wonder
+     * @date 2020-11-28
+     */
+    public static class SysWxUserInfo extends BaseEntity
+    {
+        private static final long serialVersionUID = 1L;
+
+        /** 微信openid */
+        private String openid;
+
+        /** 昵称 */
+        @Excel(name = "昵称")
+        private String nickName;
+
+        /** 电话 */
+        @Excel(name = "电话")
+        private String phone;
+
+        /** 用户头像 */
+        @Excel(name = "用户头像")
+        private String avatarUrl;
+
+        /** 用户性别（0男 1女 2未知） */
+        @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+        private String sex;
+
+        /** 城市 */
+        @Excel(name = "城市")
+        private String city;
+
+        /** 省份 */
+        @Excel(name = "省份")
+        private String province;
+
+        /** 国家 */
+        @Excel(name = "国家")
+        private String country;
+
+        public void setOpenid(String openid)
+        {
+            this.openid = openid;
+        }
+
+        public String getOpenid()
+        {
+            return openid;
+        }
+        public void setNickName(String nickName)
+        {
+            this.nickName = nickName;
+        }
+
+        public String getNickName()
+        {
+            return nickName;
+        }
+        public void setPhone(String phone)
+        {
+            this.phone = phone;
+        }
+
+        public String getPhone()
+        {
+            return phone;
+        }
+        public void setAvatarUrl(String avatarUrl)
+        {
+            this.avatarUrl = avatarUrl;
+        }
+
+        public String getAvatarUrl()
+        {
+            return avatarUrl;
+        }
+        public void setSex(String sex)
+        {
+            this.sex = sex;
+        }
+
+        public String getSex()
+        {
+            return sex;
+        }
+        public void setCity(String city)
+        {
+            this.city = city;
+        }
+
+        public String getCity()
+        {
+            return city;
+        }
+        public void setProvince(String province)
+        {
+            this.province = province;
+        }
+
+        public String getProvince()
+        {
+            return province;
+        }
+        public void setCountry(String country)
+        {
+            this.country = country;
+        }
+
+        public String getCountry()
+        {
+            return country;
+        }
+
+        @Override
+        public String toString() {
+            return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("openid", getOpenid())
+                .append("nickName", getNickName())
+                .append("phone", getPhone())
+                .append("avatarUrl", getAvatarUrl())
+                .append("sex", getSex())
+                .append("city", getCity())
+                .append("province", getProvince())
+                .append("country", getCountry())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+        }
+    }
 }
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
@@ -42,6 +42,14 @@ public class SysOrder extends BaseEntity {
    @Excel(name = "金额")
    private BigDecimal amount;

+    private BigDecimal weight;
+
+    private String status;
+
+    private Date startTime;
+
+    private Date pauseTime;
+
    /**
     * 收款方式
     */
@@ -173,6 +181,40 @@ public class SysOrder extends BaseEntity {
    @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderTime;

+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public Date getPauseTime() {
+        return pauseTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public void setPauseTime(Date pauseTime) {
+        this.pauseTime = pauseTime;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
    public String getServeTime() {
        return serveTime;
    }
@@ -442,6 +484,10 @@ public class SysOrder extends BaseEntity {
                .append("serveTimeId", getServeTimeId())
                .append("serveTime", getServeTime())
                .append("reviewStatus", getReviewStatus())
+                .append("status", getStatus())
+                .append("startTime", getStartTime())
+                .append("pauseTime", getPauseTime())
+                .append("weight", getWeight())
                .toString();
    }
 }
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java
@@ -0,0 +1,154 @@
+package com.stdiet.custom.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 微信用户对象 sys_wx_user_info
+ *
+ * @author wonder
+ * @date 2020-11-28
+ */
+public class SysWxUserInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 微信openid */
+    private String openid;
+
+    /** 昵称 */
+    @Excel(name = "昵称")
+    private String nickName;
+
+    /** 微信appid */
+    @Excel(name = "微信appid")
+    private String appid;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 用户头像 */
+    @Excel(name = "用户头像")
+    private String avatarUrl;
+
+    /** 用户性别（0男 1女 2未知） */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 城市 */
+    @Excel(name = "城市")
+    private String city;
+
+    /** 省份 */
+    @Excel(name = "省份")
+    private String province;
+
+    /** 国家 */
+    @Excel(name = "国家")
+    private String country;
+
+    public void setOpenid(String openid)
+    {
+        this.openid = openid;
+    }
+
+    public String getOpenid()
+    {
+        return openid;
+    }
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName()
+    {
+        return nickName;
+    }
+    public void setAppid(String appid)
+    {
+        this.appid = appid;
+    }
+
+    public String getAppid()
+    {
+        return appid;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setAvatarUrl(String avatarUrl)
+    {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public String getAvatarUrl()
+    {
+        return avatarUrl;
+    }
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+    public void setCity(String city)
+    {
+        this.city = city;
+    }
+
+    public String getCity()
+    {
+        return city;
+    }
+    public void setProvince(String province)
+    {
+        this.province = province;
+    }
+
+    public String getProvince()
+    {
+        return province;
+    }
+    public void setCountry(String country)
+    {
+        this.country = country;
+    }
+
+    public String getCountry()
+    {
+        return country;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("openid", getOpenid())
+                .append("nickName", getNickName())
+                .append("appid", getAppid())
+                .append("phone", getPhone())
+                .append("avatarUrl", getAvatarUrl())
+                .append("sex", getSex())
+                .append("city", getCity())
+                .append("province", getProvince())
+                .append("country", getCountry())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
+}
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java
@@ -0,0 +1,201 @@
+package com.stdiet.custom.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 微信用户记录对象 sys_wx_user_log
+ *
+ * @author wonder
+ * @date 2020-11-28
+ */
+public class SysWxUserLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 微信openid */
+    private String openid;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private BigDecimal weight;
+
+    /** 微信appid */
+    @Excel(name = "微信appid")
+    private String appid;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 睡觉时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "睡觉时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date sleepTime;
+
+    /** 起床时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "起床时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date wakeupTime;
+
+    /** 运动情况 */
+    @Excel(name = "运动情况")
+    private Long sport;
+
+    /** 用户头像 */
+    @Excel(name = "用户头像")
+    private String avatarUrl;
+
+    /** 饮食情况 */
+    @Excel(name = "饮食情况")
+    private Long diet;
+
+    /** 熬夜失眠（Y是 N否） */
+    @Excel(name = "熬夜失眠", readConverterExp = "Y=是,N=否")
+    private String insomnia;
+
+    /** 排便情况 */
+    @Excel(name = "排便情况")
+    private Long defecation;
+
+    /** 饮水量 */
+    @Excel(name = "饮水量")
+    private Long water;
+
+    public void setOpenid(String openid)
+    {
+        this.openid = openid;
+    }
+
+    public String getOpenid()
+    {
+        return openid;
+    }
+    public void setWeight(BigDecimal weight)
+    {
+        this.weight = weight;
+    }
+
+    public BigDecimal getWeight()
+    {
+        return weight;
+    }
+    public void setAppid(String appid)
+    {
+        this.appid = appid;
+    }
+
+    public String getAppid()
+    {
+        return appid;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setSleepTime(Date sleepTime)
+    {
+        this.sleepTime = sleepTime;
+    }
+
+    public Date getSleepTime()
+    {
+        return sleepTime;
+    }
+    public void setWakeupTime(Date wakeupTime)
+    {
+        this.wakeupTime = wakeupTime;
+    }
+
+    public Date getWakeupTime()
+    {
+        return wakeupTime;
+    }
+    public void setSport(Long sport)
+    {
+        this.sport = sport;
+    }
+
+    public Long getSport()
+    {
+        return sport;
+    }
+    public void setAvatarUrl(String avatarUrl)
+    {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public String getAvatarUrl()
+    {
+        return avatarUrl;
+    }
+    public void setDiet(Long diet)
+    {
+        this.diet = diet;
+    }
+
+    public Long getDiet()
+    {
+        return diet;
+    }
+    public void setInsomnia(String insomnia)
+    {
+        this.insomnia = insomnia;
+    }
+
+    public String getInsomnia()
+    {
+        return insomnia;
+    }
+    public void setDefecation(Long defecation)
+    {
+        this.defecation = defecation;
+    }
+
+    public Long getDefecation()
+    {
+        return defecation;
+    }
+    public void setWater(Long water)
+    {
+        this.water = water;
+    }
+
+    public Long getWater()
+    {
+        return water;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("openid", getOpenid())
+                .append("weight", getWeight())
+                .append("appid", getAppid())
+                .append("phone", getPhone())
+                .append("sleepTime", getSleepTime())
+                .append("wakeupTime", getWakeupTime())
+                .append("sport", getSport())
+                .append("avatarUrl", getAvatarUrl())
+                .append("diet", getDiet())
+                .append("insomnia", getInsomnia())
+                .append("defecation", getDefecation())
+                .append("water", getWater())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
+}