修复bug

4 years ago · ebca710888
parent dc632fe369
commit ebca710888
4 changed files with 398 additions and 4 deletions
--- a/src/main/java/com/yipin/liuwanr/controller/OrderController.java
+++ b/src/main/java/com/yipin/liuwanr/controller/OrderController.java
@ -1,6 +1,5 @@
 package com.yipin.liuwanr.controller;

-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yipin.liuwanr.entity.ContractInformation;
 import com.yipin.liuwanr.entity.CoursePermissions;
 import com.yipin.liuwanr.entity.Order;
-import com.yipin.liuwanr.entity.OrderVo;
+import com.yipin.liuwanr.vo.OrderVo;
 import com.yipin.liuwanr.entity.Response;
 import com.yipin.liuwanr.helper.RedisHelper;
 import com.yipin.liuwanr.service.OrderService;
--- a/src/main/java/com/yipin/liuwanr/entity/UserInfo.java
+++ b/src/main/java/com/yipin/liuwanr/entity/UserInfo.java
@ -0,0 +1,391 @@
+package com.yipin.liuwanr.entity;
+
+import java.util.List;
+
+/**
+ * 用户信息实体
+ *
+ * @author Ning
+ */
+public class UserInfo {
+    //用户id
+    private Integer userId;
+    //用户姓名
+    private String userName;
+    //用户账号
+    private String account;
+    //用户密码
+    private String password;
+    //国家
+    private String countries;
+    //绑定省份id
+    private Integer provinceId;
+    //绑定城市id
+    private Integer cityId;
+    //创建时间
+    private String creationTime;
+    //登陆次数
+    private Integer logInNumber;
+    //上次登陆时间
+    private String lastTimeOfLanding;
+    //性别
+    private Integer sex;
+    //证件类型(1、身份证)
+    private Integer documentType;
+    //身份证
+    private String IDNumber;
+    //教育程度(1、研究数及以上)
+    private Integer educationDegree;
+    //电话
+    private String phone;
+    //微信账号
+    private String WeChatID;
+    //出生日期
+    private String dateBirth;
+    //邮箱
+    private String email;
+    //学校id
+    private Integer schoolId;
+    //唯一标示性账号
+    private String uniqueIdentificationAccount;
+    //搜索内容
+    private String searchContent;
+    private List<UserInfo> user;
+    //用户头像路径
+    private String userAvatars;
+    //------------------------------------------------
+    //学校名称
+    private String schoolName;
+    //省份名称
+    private String provinceName;
+    //城市名称
+    private String cityName;
+    //条件查询月
+    private Integer month;
+    //条件查询结束时间
+    private String endTime;
+    //专业类ID
+    private Integer professionalClassId;
+    //专业类名称
+    private String professionalClassName;
+    //学科ID
+    private Integer disciplineId;
+    //学科名称
+    private String disciplineName;
+    //专业id
+    private Integer professionalId;
+    //专业名称
+    private String professionalName;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getCountries() {
+        return countries;
+    }
+
+    public void setCountries(String countries) {
+        this.countries = countries;
+    }
+
+    public Integer getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Integer provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public Integer getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Integer cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Integer getLogInNumber() {
+        return logInNumber;
+    }
+
+    public void setLogInNumber(Integer logInNumber) {
+        this.logInNumber = logInNumber;
+    }
+
+    public String getLastTimeOfLanding() {
+        return lastTimeOfLanding;
+    }
+
+    public void setLastTimeOfLanding(String lastTimeOfLanding) {
+        this.lastTimeOfLanding = lastTimeOfLanding;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public Integer getDocumentType() {
+        return documentType;
+    }
+
+    public void setDocumentType(Integer documentType) {
+        this.documentType = documentType;
+    }
+
+    public String getIDNumber() {
+        return IDNumber;
+    }
+
+    public void setIDNumber(String IDNumber) {
+        this.IDNumber = IDNumber;
+    }
+
+    public Integer getEducationDegree() {
+        return educationDegree;
+    }
+
+    public void setEducationDegree(Integer educationDegree) {
+        this.educationDegree = educationDegree;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getWeChatID() {
+        return WeChatID;
+    }
+
+    public void setWeChatID(String weChatID) {
+        WeChatID = weChatID;
+    }
+
+    public String getDateBirth() {
+        return dateBirth;
+    }
+
+    public void setDateBirth(String dateBirth) {
+        this.dateBirth = dateBirth;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getUniqueIdentificationAccount() {
+        return uniqueIdentificationAccount;
+    }
+
+    public void setUniqueIdentificationAccount(String uniqueIdentificationAccount) {
+        this.uniqueIdentificationAccount = uniqueIdentificationAccount;
+    }
+
+    public String getSearchContent() {
+        return searchContent;
+    }
+
+    public void setSearchContent(String searchContent) {
+        this.searchContent = searchContent;
+    }
+
+    public List<UserInfo> getUser() {
+        return user;
+    }
+
+    public void setUser(List<UserInfo> user) {
+        this.user = user;
+    }
+
+    public String getUserAvatars() {
+        return userAvatars;
+    }
+
+    public void setUserAvatars(String userAvatars) {
+        this.userAvatars = userAvatars;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getProfessionalClassId() {
+        return professionalClassId;
+    }
+
+    public void setProfessionalClassId(Integer professionalClassId) {
+        this.professionalClassId = professionalClassId;
+    }
+
+    public String getProfessionalClassName() {
+        return professionalClassName;
+    }
+
+    public void setProfessionalClassName(String professionalClassName) {
+        this.professionalClassName = professionalClassName;
+    }
+
+    public Integer getDisciplineId() {
+        return disciplineId;
+    }
+
+    public void setDisciplineId(Integer disciplineId) {
+        this.disciplineId = disciplineId;
+    }
+
+    public String getDisciplineName() {
+        return disciplineName;
+    }
+
+    public void setDisciplineName(String disciplineName) {
+        this.disciplineName = disciplineName;
+    }
+
+    public Integer getProfessionalId() {
+        return professionalId;
+    }
+
+    public void setProfessionalId(Integer professionalId) {
+        this.professionalId = professionalId;
+    }
+
+    public String getProfessionalName() {
+        return professionalName;
+    }
+
+    public void setProfessionalName(String professionalName) {
+        this.professionalName = professionalName;
+    }
+
+    @Override
+    public String toString() {
+        return "UserInfo{" +
+                "userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", account='" + account + '\'' +
+                ", password='" + password + '\'' +
+                ", countries='" + countries + '\'' +
+                ", provinceId=" + provinceId +
+                ", cityId=" + cityId +
+                ", creationTime='" + creationTime + '\'' +
+                ", logInNumber=" + logInNumber +
+                ", lastTimeOfLanding='" + lastTimeOfLanding + '\'' +
+                ", sex=" + sex +
+                ", documentType=" + documentType +
+                ", IDNumber='" + IDNumber + '\'' +
+                ", educationDegree=" + educationDegree +
+                ", phone='" + phone + '\'' +
+                ", WeChatID='" + WeChatID + '\'' +
+                ", dateBirth='" + dateBirth + '\'' +
+                ", email='" + email + '\'' +
+                ", schoolId=" + schoolId +
+                ", uniqueIdentificationAccount='" + uniqueIdentificationAccount + '\'' +
+                ", searchContent='" + searchContent + '\'' +
+                ", user=" + user +
+                ", userAvatars='" + userAvatars + '\'' +
+                ", schoolName='" + schoolName + '\'' +
+                ", provinceName='" + provinceName + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", month=" + month +
+                ", endTime='" + endTime + '\'' +
+                ", professionalClassId=" + professionalClassId +
+                ", professionalClassName='" + professionalClassName + '\'' +
+                ", disciplineId=" + disciplineId +
+                ", disciplineName='" + disciplineName + '\'' +
+                ", professionalId=" + professionalId +
+                ", professionalName='" + professionalName + '\'' +
+                '}';
+    }
+}
--- a/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/OrderMapper.java
@ -10,7 +10,7 @@ import com.yipin.liuwanr.entity.Course;
 import com.yipin.liuwanr.entity.CoursePermissions;
 import com.yipin.liuwanr.entity.Customer;
 import com.yipin.liuwanr.entity.Order;
-import com.yipin.liuwanr.entity.OrderVo;
+import com.yipin.liuwanr.vo.OrderVo;

 public interface OrderMapper {
 	
--- a/src/main/java/com/yipin/liuwanr/entity/OrderVo.java
+++ b/src/main/java/com/yipin/liuwanr/entity/OrderVo.java
@ -1,4 +1,8 @@
-package com.yipin.liuwanr.entity;
+package com.yipin.liuwanr.vo;
+
+import com.yipin.liuwanr.entity.ContractInformation;
+import com.yipin.liuwanr.entity.CoursePermissions;
+import com.yipin.liuwanr.entity.Order;

 import java.util.ArrayList;
 import java.util.List;