缴费修改

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

@@ -692,7 +692,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 	@Override
 	public Map<String, Object> getDetail(Long id) {
-		Map<String, Object> result = new HashMap<>(9);
+		Map<String, Object> result = new HashMap<>(10);
 		//获取缴费项目详情
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(id);
 		//统计预计缴费人数

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

@@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @RequestMapping("musicGroupPaymentCalender")
 @Api(tags = "乐团缴费项目服务")
@@ -44,14 +46,6 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
     @Autowired
     private MusicGroupPaymentCalenderStudentDetailDao musicGroupPaymentCalenderStudentDetailDao;
-    @Autowired
-    private MusicGroupPaymentStudentCourseDetailDao musicGroupPaymentStudentCourseDetailDao;
-    @Autowired
-    private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
-    @Autowired
-    private MusicGroupPaymentCalenderMemberService musicGroupPaymentCalenderMemberService;
-    @Autowired
-    private MusicGroupPaymentCalenderRepairService musicGroupPaymentCalenderRepairService;
 	@Autowired
 	private MemberRankPrivilegesService memberRankPrivilegesService;
 
@@ -79,17 +73,14 @@ public class MusicGroupPaymentCalenderController extends BaseController {
             if (studentRegistration == null) {
                 return failed("乐团报名信息不存在");
             }
-            ModelMap model = new ModelMap(10);
             //课程相关信息
+            Map model = new HashMap<>(10);
             model.put("musicGroupPaymentCalenderStudentDetails",musicGroupPaymentCalenderStudentDetailDao.findByBatchNoAndUserId(calender.getBatchNo(),userId));
-            model.put("calenderCourseSettings", musicGroupPaymentStudentCourseDetailDao.findByCalenderAndUserId(calenderId,userId));
-            model.put("activity",musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId));
             model.put("musicGroup",musicGroupDao.get(musicGroupId));
             model.put("balance",studentRegistration.getBalance());
-            model.put("member",musicGroupPaymentCalenderMemberService.findByCalenderId(calenderId));
-            model.put("repair",musicGroupPaymentCalenderRepairService.findByCalenderId(calenderId));
             model.put("calender",calender);
             model.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calender.getMemberRankSettingId()));
+            musicGroupPaymentCalenderService.getCalenderDetail(model,calenderId);
             return succeed(model);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
             throw new BizException("缴费已截止,如有问题请联系指导老师");