会员拆分

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentMemberTimeDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ym.mec.biz.dal.entity.StudentMemberTime;
+
+public interface StudentMemberTimeDao extends BaseMapper<StudentMemberTime> {
+
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentMemberTime.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ApiModel(value = "student_member_time")
+@Data
+public class StudentMemberTime implements Serializable {
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户编号")
+    @TableField("student_id_")
+    private Integer studentId;
+
+    @ApiModelProperty(value = "会员编号")
+    @TableField("member_rank_id_")
+    private Integer memberRankId;
+
+    @TableField("end_time_")
+    @ApiModelProperty(value = "截止时间")
+    private Date endTime;
+}
+

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherOrderService.java

@@ -128,7 +128,4 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
 
     //获取用户生效中的云教练详情列表
     List<CloudTeacherOrderWrapper.StudentMemberDetail> getEffectiveCloudTeacherOrder(List<Integer> userIds);
-
-    //获取会员全名称
-    Map<Integer,String> queryMemberName(List<Integer> memberRankIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MemberRankSettingService.java

@@ -11,6 +11,7 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 public interface MemberRankSettingService extends BaseService<Integer, MemberRankSetting> {
 
@@ -61,4 +62,11 @@ public interface MemberRankSettingService extends BaseService<Integer, MemberRan
     List<MemberRankSetting> listByIds(List<Integer> ids);
 
     List<MemberRankSettingWrapper.MemberRankSetting> queryTree(String musicGroupId, Integer organId, Integer studentId);
+
+
+    //获取会员全名称
+    Map<Integer,String> queryMemberName(List<Integer> memberRankIds);
+
+    //获取单个会员名称
+    String queryMemberName(Integer memberRankId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentMemberTimeService.java

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.entity.StudentMemberTime;
+
+public interface StudentMemberTimeService extends IService<StudentMemberTime> {
+
+}
+
+

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

@@ -2,11 +2,13 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dao.CloudCoachPaymentProgramDao;
+import com.ym.mec.biz.dal.dao.StudentCloudCoachPaymentDetailsDao;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.CloudCoachPaymentProgram;
 import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
-import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.CloudCoachPaymentProgramQueryInfo;
 import com.ym.mec.biz.service.*;
@@ -37,7 +39,7 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 	@Autowired
 	private MemberFeeSettingService memberFeeSettingService;
 	@Autowired
-	private MemberRankSettingDao memberRankSettingDao;
+	private MemberRankSettingService memberRankSettingService;
 	@Autowired
 	private TenantConfigService tenantConfigService;
 	@Autowired
@@ -61,19 +63,18 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 		PageInfo<CloudCoachPaymentProgram> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
-
 		List<CloudCoachPaymentProgram> dataList = null;
 		int count = this.findCount(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = this.getDAO().queryPage(params);
-			Set<Integer> userIds = dataList.stream().map(e -> e.getOperator()).filter(e -> e != null).collect(Collectors.toSet());
-			userIds.addAll(dataList.stream().map(e -> e.getAudit()).filter(e -> e != null).collect(Collectors.toSet()));
+			Set<Integer> userIds = dataList.stream().map(CloudCoachPaymentProgram::getOperator).filter(Objects::nonNull).collect(Collectors.toSet());
+			userIds.addAll(dataList.stream().map(CloudCoachPaymentProgram::getAudit).filter(Objects::nonNull).collect(Collectors.toSet()));
 			List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(userIds));
-			Map<Integer, SimpleUserDto> userDtoMap = usersSimpleInfo.stream().collect(Collectors.groupingBy(e -> e.getUserId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+			Map<Integer, SimpleUserDto> userDtoMap = usersSimpleInfo.stream().collect(Collectors.groupingBy(SimpleUserDto::getUserId, Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
 
-			List<Long> programIds = dataList.stream().map(e -> e.getId()).collect(Collectors.toList());
+			List<Long> programIds = dataList.stream().map(CloudCoachPaymentProgram::getId).collect(Collectors.toList());
 			Map<Long,String> userNameMap = studentCloudCoachPaymentDetailsDao.queryStudentName(programIds).stream().collect(Collectors.toMap(e -> Long.parseLong(e.get("key").toString()), e -> e.get("value") == null ? "" : e.get("value").toString()));
 			for (CloudCoachPaymentProgram program : dataList) {
 				SimpleUserDto userDto = userDtoMap.get(program.getOperator());
@@ -110,8 +111,7 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 				MemberFeeSettingServiceImpl::getOriginalFee);
 		cloudCoachPaymentProgram.setOriginalAmount(originalFee);
 		//获取会员名称
-		MemberRankSetting memberRankSetting = memberRankSettingDao.get(cloudCoachPaymentProgram.getMemberRankSettingId());
-		cloudCoachPaymentProgram.setName(memberRankSetting.getName());
+		cloudCoachPaymentProgram.setName(memberRankSettingService.queryMemberName(cloudCoachPaymentProgram.getMemberRankSettingId()));
 		cloudCoachPaymentProgram.setUserNum(userIds.size());
 		cloudCoachPaymentProgram.setTenantId(tenantId);
 		//获取缴费状态

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

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
 import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
@@ -68,9 +71,11 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     @Resource
     private TenantInfoService tenantInfoService;
     @Resource
-    private MemberRankSettingDao memberRankSettingDao;
+    private MemberRankSettingService memberRankSettingService;
     @Resource
     private StudentDao studentDao;
+    @Resource
+    private StudentMemberTimeService studentMemberTimeService;
     @Override
     public BaseDAO<Long, CloudTeacherOrder> getDAO() {
         return cloudTeacherOrderDao;
@@ -89,7 +94,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             params.put("offset", pageInfo.getOffset());
             dataList = cloudTeacherOrderDao.queryRecord(params);
             List<Integer> memberRankIds = dataList.stream().map(CloudTeacherStudent::getMemberRankId).distinct().collect(Collectors.toList());
-            Map<Integer, String> memberNameMap = queryMemberName(memberRankIds);
+            Map<Integer, String> memberNameMap = memberRankSettingService.queryMemberName(memberRankIds);
             dataList.forEach(e -> e.setMemberName(memberNameMap.get(e.getMemberRankId())));
         }
         if (count == 0) {
@@ -138,22 +143,10 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         }
         //获取会员名称
         List<Integer> memberRankIds = dataList.stream().map(CloudTeacherStudent::getMemberRankId).collect(Collectors.toList());
-        List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIds(memberRankIds);
-        List<Integer> parentRankIds = memberRankSettings.stream().map(MemberRankSetting::getParentId).filter(parentId -> parentId != 0).collect(Collectors.toList());
-        List<MemberRankSetting> parentMemberRankSettings = memberRankSettingDao.selectBatchIds(parentRankIds);
-        Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-        Map<Integer, MemberRankSetting> parentMemberRankSettingMap = parentMemberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
+        Map<Integer, String> memberNameMap = memberRankSettingService.queryMemberName(memberRankIds);
         //获取
         for (CloudTeacherStudent cst : dataList) {
-            MemberRankSetting rankSetting = memberRankSettingMap.get(cst.getMemberRankId());
-            if (rankSetting != null) {
-                MemberRankSetting parentRank = parentMemberRankSettingMap.get(rankSetting.getParentId());
-                if (parentRank != null) {
-                    cst.setMemberName(parentRank.getName() + "-" + rankSetting.getName());
-                } else {
-                    cst.setMemberName(rankSetting.getName());
-                }
-            }
+            cst.setMemberName(memberNameMap.get(cst.getMemberRankId()));
             cst.setOrganName(organNameMap.get(cst.getOrganId()));
             if (cst.getOperator() != null) {
                 cst.setOperatorName(empMapById.getOrDefault(cst.getOperator(), new SimpleUserDto()).getUserName());
@@ -213,23 +206,10 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         }
         //获取会员名称
         List<Integer> memberRankIds = dataList.stream().map(CloudTeacherStudent::getMemberRankId).collect(Collectors.toList());
-        List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIds(memberRankIds);
-        List<Integer> parentRankIds = memberRankSettings.stream().map(MemberRankSetting::getParentId).filter(parentId -> parentId != 0).collect(Collectors.toList());
-        List<MemberRankSetting> parentMemberRankSettings = memberRankSettingDao.selectBatchIds(parentRankIds);
-        Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-        Map<Integer, MemberRankSetting> parentMemberRankSettingMap = parentMemberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-
+        Map<Integer, String> memberNameMap = memberRankSettingService.queryMemberName(memberRankIds);
         TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", queryInfo.getTenantId()));
         for (CloudTeacherStudent cst : dataList) {
-            MemberRankSetting rankSetting = memberRankSettingMap.get(cst.getMemberRankId());
-            if (rankSetting != null) {
-                MemberRankSetting parentRank = parentMemberRankSettingMap.get(rankSetting.getParentId());
-                if (parentRank != null) {
-                    cst.setMemberName(parentRank.getName() + "-" + rankSetting.getName());
-                } else {
-                    cst.setMemberName(rankSetting.getName());
-                }
-            }
+            cst.setMemberName(memberNameMap.get(cst.getMemberRankId()));
             cst.setOrganName(organNameMap.get(cst.getOrganId()));
             if (cst.getOperator() != null) {
                 cst.setOperatorName(empMapById.getOrDefault(cst.getOperator(), new SimpleUserDto()).getUserName());
@@ -425,6 +405,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
 //        if(student.getMembershipEndTime() != null && student.getMembershipEndTime().compareTo(now) > 0){
 //            now = student.getMembershipEndTime();
 //        }
+//        StudentMemberTimeService
         //获取已激活的云教练最大时间
         Date maxTime = cloudTeacherOrderDao.getActivationMaxTime(cloudTeacherOrder.getStudentId(),cloudTeacherOrder.getLevel());
         if (maxTime != null && maxTime.compareTo(now) > 0) {
@@ -521,12 +502,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         if (CollectionUtils.isNotEmpty(activeCloudTeachers)) {
             //获取所有的会员列表
             List<Integer> memberRankIds = activeCloudTeachers.stream().map(CloudTeacherOrder::getLevel).distinct().collect(Collectors.toList());
-            List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIds(memberRankIds);
-            //获取所有父级会员
-            List<Integer> parentRankIds = memberRankSettings.stream().map(MemberRankSetting::getParentId).filter(parentId -> parentId != 0).collect(Collectors.toList());
-            List<MemberRankSetting> parentMemberRankSettings = memberRankSettingDao.selectBatchIds(parentRankIds);
-            Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-            Map<Integer, MemberRankSetting> parentMemberRankSettingMap = parentMemberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
+            Map<Integer, String> memberNameMap = memberRankSettingService.queryMemberName(memberRankIds);
             //按学员分组
             Map<Integer, List<CloudTeacherOrder>> cloudTeacherOrderMap = activeCloudTeachers.stream().collect(Collectors.groupingBy(CloudTeacherOrder::getStudentId));
             cloudTeacherOrderMap.forEach((k, v) -> {
@@ -535,16 +511,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
                 memberRankMap.forEach((key, value) -> {
                     CloudTeacherOrderWrapper.StudentMemberDetail studentMemberDetail = new CloudTeacherOrderWrapper.StudentMemberDetail();
                     studentMemberDetail.setStudentId(k);
-                    //拼接会员名称
-                    MemberRankSetting rankSetting = memberRankSettingMap.get(key);
-                    if (rankSetting != null) {
-                        MemberRankSetting parentRank = parentMemberRankSettingMap.get(rankSetting.getParentId());
-                        if (parentRank != null) {
-                            studentMemberDetail.setMemberRankName(parentRank.getName() + "-" + rankSetting.getName());
-                        } else {
-                            studentMemberDetail.setMemberRankName(rankSetting.getName());
-                        }
-                    }
+                    //会员名称
+                    studentMemberDetail.setMemberRankName(memberNameMap.get(key));
                     //获取最大的截止时间
                     Date maxTime = value.stream().map(CloudTeacherOrder::getEndTime).max(Date::compareTo).get();
                     studentMemberDetail.setEndTime(maxTime);
@@ -557,26 +525,4 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         }
         return studentMemberDetails;
     }
-
-    @Override
-    public Map<Integer, String> queryMemberName(List<Integer> memberRankIds) {
-        List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIds(memberRankIds);
-        if (CollectionUtils.isEmpty(memberRankSettings)) {
-            return new HashMap<>();
-        }
-        List<Integer> parentRankIds = memberRankSettings.stream().map(MemberRankSetting::getParentId).filter(parentId -> parentId != 0).collect(Collectors.toList());
-        List<MemberRankSetting> parentMemberRankSettings = memberRankSettingDao.selectBatchIds(parentRankIds);
-        Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-        Map<Integer, MemberRankSetting> parentMemberRankSettingMap = parentMemberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
-        Map<Integer, String> memberNameMap = new HashMap<>();
-        memberRankSettingMap.forEach((k, v) -> {
-            MemberRankSetting parentRank = parentMemberRankSettingMap.get(v.getParentId());
-            if (parentRank != null) {
-                memberNameMap.put(k, parentRank.getName() + "-" + v.getName());
-            } else {
-                memberNameMap.put(k, v.getName());
-            }
-        });
-        return memberNameMap;
-    }
 }

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

@@ -1251,4 +1251,43 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         queryInfo.setHasChildren(true);
         return this.queryPage2(queryInfo);
     }
+
+
+    @Override
+    public Map<Integer, String> queryMemberName(List<Integer> memberRankIds) {
+        List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIds(memberRankIds);
+        if (CollectionUtils.isEmpty(memberRankSettings)) {
+            return new HashMap<>();
+        }
+        List<Integer> parentRankIds = memberRankSettings.stream().map(MemberRankSetting::getParentId).filter(parentId -> parentId != 0).collect(Collectors.toList());
+        List<MemberRankSetting> parentMemberRankSettings = memberRankSettingDao.selectBatchIds(parentRankIds);
+        Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
+        Map<Integer, MemberRankSetting> parentMemberRankSettingMap = parentMemberRankSettings.stream().collect(Collectors.toMap(MemberRankSetting::getId, memberRankSetting -> memberRankSetting));
+        Map<Integer, String> memberNameMap = new HashMap<>();
+        memberRankSettingMap.forEach((k, v) -> {
+            MemberRankSetting parentRank = parentMemberRankSettingMap.get(v.getParentId());
+            if (parentRank != null) {
+                memberNameMap.put(k, parentRank.getName() + "-" + v.getName());
+            } else {
+                memberNameMap.put(k, v.getName());
+            }
+        });
+        return memberNameMap;
+    }
+
+    @Override
+    public String queryMemberName(Integer memberRankId) {
+        MemberRankSetting memberRankSetting = memberRankSettingDao.get(memberRankId);
+        if(memberRankSetting == null){
+            return "";
+        }
+        String name = memberRankSetting.getName();
+        if(memberRankSetting.getParentId() != 0){
+            MemberRankSetting rankSetting = memberRankSettingDao.get(memberRankSetting.getParentId());
+            if(rankSetting != null){
+                name = rankSetting.getName() + "-" + name;
+            }
+        }
+        return name;
+    }
 }

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

@@ -1,16 +1,15 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.MemberRankSettingDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderMemberDao;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.CalenderBaseServiceEnum;
 import com.ym.mec.biz.dal.enums.PeriodEnum;
 import com.ym.mec.biz.service.MemberFeeSettingService;
+import com.ym.mec.biz.service.MemberRankSettingService;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderBaseService;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderMemberService;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -35,7 +34,7 @@ public class MusicGroupPaymentCalenderMemberServiceImpl extends BaseServiceImpl<
     @Resource
     private MemberFeeSettingService memberFeeSettingService;
     @Resource
-    private MemberRankSettingDao memberRankSettingDao;
+    private MemberRankSettingService memberRankSettingService;
 
     @Override
     public BaseDAO<Long, MusicGroupPaymentCalenderMember> getDAO() {
@@ -84,18 +83,7 @@ public class MusicGroupPaymentCalenderMemberServiceImpl extends BaseServiceImpl<
     public <E> E initBean(E bean) {
         if(bean != null){
             MusicGroupPaymentCalenderMember calenderMember = (MusicGroupPaymentCalenderMember)bean;
-            MemberRankSetting memberRankSetting = memberRankSettingDao.get(calenderMember.getMemberRankSettingId());
-            if(memberRankSetting == null){
-                throw new BizException("会员信息不存在");
-            }
-            String name = memberRankSetting.getName();
-            if(memberRankSetting.getParentId() != 0){
-                MemberRankSetting rankSetting = memberRankSettingDao.get(memberRankSetting.getParentId());
-                if(rankSetting != null){
-                    name = rankSetting.getName() + "-" + name;
-                }
-            }
-            calenderMember.setName(name);
+            calenderMember.setName(memberRankSettingService.queryMemberName(calenderMember.getMemberRankSettingId()));
         }
         return bean;
     }
@@ -133,7 +121,7 @@ public class MusicGroupPaymentCalenderMemberServiceImpl extends BaseServiceImpl<
         List<MusicGroupPaymentCalenderMember> calenderMembers = musicGroupPaymentCalenderMemberDao.findByCalenderId(calenderId);
         if(CollectionUtils.isNotEmpty(calenderMembers)){
             List<Integer> memberIds = calenderMembers.stream().map(MusicGroupPaymentCalenderMember::getMemberRankSettingId).collect(Collectors.toList());
-            List<MemberRankSetting> memberRankSettingList = memberRankSettingDao.selectBatchIds(memberIds);
+            List<MemberRankSetting> memberRankSettingList = memberRankSettingService.listByIds(memberIds);
             Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettingList.stream().collect(Collectors.toMap(MemberRankSetting::getId, e -> e));
             calenderMembers.forEach(e -> {
                 MemberRankSetting memberRankSetting = memberRankSettingMap.get(e.getMemberRankSettingId());
@@ -162,7 +150,7 @@ public class MusicGroupPaymentCalenderMemberServiceImpl extends BaseServiceImpl<
         List<MusicGroupPaymentCalenderMember> calenderMembers = musicGroupPaymentCalenderMemberDao.findByIds(calenderMemberIds);
         if(CollectionUtils.isNotEmpty(calenderMembers)){
             List<Integer> memberIds = calenderMembers.stream().map(MusicGroupPaymentCalenderMember::getMemberRankSettingId).collect(Collectors.toList());
-            List<MemberRankSetting> memberRankSettingList = memberRankSettingDao.selectBatchIds(memberIds);
+            List<MemberRankSetting> memberRankSettingList = memberRankSettingService.listByIds(memberIds);
             Map<Integer, MemberRankSetting> memberRankSettingMap = memberRankSettingList.stream().collect(Collectors.toMap(MemberRankSetting::getId, e -> e));
             calenderMembers.forEach(e -> {
                 MemberRankSetting memberRankSetting = memberRankSettingMap.get(e.getMemberRankSettingId());

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

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.StudentMemberTimeDao;
+import com.ym.mec.biz.dal.entity.StudentMemberTime;
+import com.ym.mec.biz.service.StudentMemberTimeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service("studentMemberTimeService")
+public class StudentMemberTimeServiceImpl extends ServiceImpl<StudentMemberTimeDao, StudentMemberTime> implements StudentMemberTimeService {
+
+    private final static Logger log = LoggerFactory.getLogger(StudentMemberTimeServiceImpl.class);
+
+
+
+}
+

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

@@ -148,6 +148,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     private TempDirectorTrainingCampDetailService tempDirectorTrainingCampDetailService;
     @Resource
     private MusicGroupPaymentCalenderAddressService musicGroupPaymentCalenderAddressService;
+    @Resource
+    private MusicGroupPaymentCalenderMemberService musicGroupPaymentCalenderMemberService;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
@@ -820,6 +822,13 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
             BigDecimal organShareProfit = BigDecimal.ZERO;
             for (StudentPaymentOrderDetail studentPaymentOrderDetail : order.getOrderDetailList()) {
+                if(studentPaymentOrderDetail.getType() == OrderDetailTypeEnum.CLOUD_TEACHER){
+                    //获取名称
+                    MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.get(studentPaymentOrderDetail.getStudentInstrumentId());
+                    if(calenderMember != null){
+                        studentPaymentOrderDetail.setName(calenderMember.getName());
+                    }
+                }
                 if (studentPaymentOrderDetail.getGoodsList() == null) {
                     continue;
                 }

mec-biz/src/main/resources/config/mybatis/StudentMemberTimeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ym.mec.biz.dal.dao.TempDirectorTrainingCampDetailDao">
+
+</mapper>

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1098,6 +1098,7 @@
             <result column="detail_type_" property="type"/>
             <result column="detail_price_" property="price"/>
             <result column="detail_kit_group_purchase_type_" property="kitGroupPurchaseType"/>
+            <result column="studentInstrumentId" property="studentInstrumentId"/>
             <collection property="goodsList" ofType="com.ym.mec.biz.dal.entity.Goods">
                 <result column="goods_id" property="id"/>
                 <result column="goods_name" property="name"/>
@@ -1108,7 +1109,8 @@
     <select id="getUserApplyOrders" resultMap="applyOrderAndDetail" parameterType="map">
         SELECT spo.*,spod.id_ detail_id_,spod.type_ detail_type_,spod.price_
         detail_price_,spod.kit_group_purchase_type_ detail_kit_group_purchase_type_,
-        g.id_ goods_id, g.name_ goods_name,g.complement_goods_id_list_ complementGoodsIdList
+        g.id_ goods_id, g.name_ goods_name,g.complement_goods_id_list_ complementGoodsIdList,
+        spod.student_instrument_id_ studentInstrumentId
         FROM student_payment_order spo
         LEFT JOIN student_payment_order_detail spod on spo.id_ = spod.payment_order_id_
         LEFT JOIN goods g on FIND_IN_SET(g.id_,spod.goods_id_list_)