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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -135,7 +135,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     private TenantGroupAlbumMapper tenantGroupAlbumMapper;
     @Override
     public StudentVo detail(Long userId) {
-        return baseMapper.detail(userId);
+        StudentVo detail = baseMapper.detail(userId);
+        detail.setUserVip(vipCardRecordService.UserVipInfo(userId, ClientEnum.STUDENT));
+        return detail;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -1040,7 +1040,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
             teacherInfo.setStudentNums(studentNumsMap.getOrDefault(teacherId, 0));
         }
-
+        teacherInfo.setUserVip(vipCardRecordService.UserVipInfo(teacherId, ClientEnum.TEACHER));
         return teacherInfo;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardRecordServiceImpl.java

@@ -490,7 +490,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                 deductedStartTime = maxEndTime.minusMonths(addVipCardRecord.getTimes());
                 break;
             case QUARTERLY:
-                deductedStartTime = maxEndTime.minusMonths(addVipCardRecord.getTimes() * 4);
+                deductedStartTime = maxEndTime.minusMonths(addVipCardRecord.getTimes() * 3);
                 break;
             case YEAR_HALF:
                 deductedStartTime = maxEndTime.minusMonths(addVipCardRecord.getTimes() * 6);
@@ -616,7 +616,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                 end = start.minusMonths(times);
                 break;
             case QUARTERLY:
-                end = start.minusMonths(times * 4);
+                end = start.minusMonths(times * 3);
                 break;
             case YEAR_HALF:
                 end = start.minusMonths(times * 6);

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -79,6 +80,9 @@ public class StudentVo extends Student {
 
     private String imUserId;
 
+    @ApiModelProperty(value = "会员信息")
+    private VipCardRecordWrapper.UserVip userVip;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }

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.GenderEnum;
+import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
 import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.cooleshow.common.enums.UserStatusEnum;
@@ -102,6 +103,9 @@ public class TeacherVo extends Teacher {
     @ApiModelProperty("机构小组名称")
     private String tenantGroupName;
 
+    @ApiModelProperty(value = "会员信息")
+    private VipCardRecordWrapper.UserVip userVip;
+
 
     public YesOrNoEnum getDelFlag() {
         return delFlag;