Merge branch 'feature/0712_vip' of http://git.dayaedu.com/yonge/cooleshow into feature/0712_vip

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/StudentController.java

@@ -253,7 +253,7 @@ public class StudentController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学生编号", "学生姓名", "真实姓名", "性别", "出生日期",
                     "年龄", "专业", "手机号码", "会员类型", "会员结束时间", "注册时间", "用户状态", "学生来源","小组"}, new String[]{
                     "userId", "username", "realName", "gender.msg", "birthdate", "age", "subjectName", "phone",
-                    "vipType.name", "membershipEndTime", "createTime", "userStatus.msg", "tenantName", "tenantGroupName"}, rows);
+                    "vipType.name", "membershipEndTimeStr", "createTime", "userStatus.msg", "tenantName", "tenantGroupName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=学生列表-" + DateUtil.getDate(new Date()) + ".xls");

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -220,7 +220,7 @@ public class TeacherController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"老师编号", "昵称", "姓名", "手机号", "老师类型",
                     "注册时间", "认证时间", "状态", "会员类型", "会员结束时间", "徽章", "机构", "小组"}, new String[]{
                     "userId", "username", "realName", "phone", "entryFlag.code == 1 ? '达人' : '游客'", "createTime",
-                    "entryAuthDate","userStatus.msg", "vipType.name", "membershipEndTime", "tag", "tenantName",
+                    "entryAuthDate","userStatus.msg", "vipType.name", "membershipEndTimeStr", "tag", "tenantName",
                     "tenantGroupName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentVo.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yonge.cooleshow.biz.dal.enums.EUserVipType;
 import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
+import com.yonge.toolset.utils.date.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -96,6 +97,9 @@ public class StudentVo extends Student {
     @ApiModelProperty("svip结束时间")
     private Date perSvipEndTime;
 
+    @ApiModelProperty(value = "会员结束时间字符传")
+    private String membershipEndTimeStr;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }
@@ -224,4 +228,14 @@ public class StudentVo extends Student {
 	public void setUserStatus(UserStatusEnum userStatus) {
 		this.userStatus = userStatus;
 	}
+
+    public String getMembershipEndTimeStr() {
+        if (EUserVipType.SVIP.equals(vipType) && getMembershipEndTime() == null) {
+            return "永久";
+        }
+        if (getMembershipEndTime() != null) {
+            return DateUtil.format(getMembershipEndTime(), "yyyy-MM-dd");
+        }
+        return "";
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.EUserVipType;
+import com.yonge.cooleshow.biz.dal.enums.EVipType;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
 import com.yonge.cooleshow.common.enums.ESettlementFrom;
@@ -11,12 +12,14 @@ import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.cooleshow.common.enums.UserStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
+import com.yonge.toolset.utils.date.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -122,6 +125,9 @@ public class TeacherVo extends Teacher {
     @ApiModelProperty("是否客服")
     private Boolean customerService;
 
+    @ApiModelProperty(value = "会员结束时间字符传")
+    private String membershipEndTimeStr;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }
@@ -383,4 +389,14 @@ public class TeacherVo extends Teacher {
         this.studentNums = studentNums;
         return this;
     }
+
+    public String getMembershipEndTimeStr() {
+        if (EUserVipType.SVIP.equals(vipType) && getMembershipEndTime() == null) {
+            return "永久";
+        }
+        if (getMembershipEndTime() != null) {
+            return DateUtil.format(getMembershipEndTime(), "yyyy-MM-dd");
+        }
+        return "";
+    }
 }