update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -33,6 +34,17 @@ public class CourseListDto {
     @ApiModelProperty(value = "单节课时",required = true)
     private Integer singleClassMinutes;
 
+    @ApiModelProperty(value = "0待续费，1已续费",required = true)
+    private Integer renewStatus = 0;
+
+    public Integer getRenewStatus() {
+        return renewStatus;
+    }
+
+    public void setRenewStatus(Integer renewStatus) {
+        this.renewStatus = renewStatus;
+    }
+
     public Integer getSingleClassMinutes() {
         return singleClassMinutes;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import com.aliyun.oss.common.utils.DateUtil;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
@@ -14,8 +13,8 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.common.utils.DateUtils;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -338,19 +337,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 e.setStudentNames(classGroupDao.findVipStuNames(e.getMusicGroupId()));
             }else {
                 //获取学员乐团课的续费状态
-
-                //获取当前乐团缴费周期
-                List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(e.getMusicGroupId());
-                //获取下次缴费时间
                 MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId,e.getMusicGroupId());
                 if(musicGroupStudentFee != null){
-                    
+                    int i = DateUtil.daysBetween(new Date(),musicGroupStudentFee.getNextPaymentDate());
+                    e.setRenewStatus(i < 8?0:1);
                 }
             }
         });
         return classGroupDao.queryCoursePage(userId);
     }
 
+
     @Override
     public List<ImGroupModel> queryUserGroups(Integer userId) {
         return classGroupDao.queryUserGroups(userId);

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -31,7 +31,7 @@ public class CourseController extends BaseController {
         return succeed(classGroupService.queryCoursePage(sysUser.getId()));
     }
 
-    @ApiOperation("获取学员所有群组")
+    @ApiOperation("获取学员所有聊天群组")
     @GetMapping(value = "/queryUserGroups")
     public Object queryUserGroups(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();