|
|
@@ -12,15 +12,18 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
|
|
|
import com.ym.mec.biz.dal.entity.StudentRegistration;
|
|
|
+import com.ym.mec.biz.service.MemberRankPrivilegesService;
|
|
|
import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
|
|
|
import com.ym.mec.biz.service.StudentRegistrationService;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
+
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
@@ -28,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+
|
|
|
import java.util.List;
|
|
|
|
|
|
@RequestMapping("musicGroupPaymentCalender")
|
|
|
@@ -50,6 +54,9 @@ public class MusicGroupPaymentCalenderController extends BaseController {
|
|
|
@Autowired
|
|
|
private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private MemberRankPrivilegesService memberRankPrivilegesService;
|
|
|
+
|
|
|
|
|
|
@ApiOperation(value = "查询学员缴费详情")
|
|
|
@GetMapping("/getCalenderInfo")
|
|
|
@@ -87,6 +94,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
|
|
|
model.put("calenderCourseSettings", calenderCourseSettings);
|
|
|
model.put("balance",studentRegistration.getBalance());
|
|
|
model.put("calender",calender);
|
|
|
+ model.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calender.getMemberRankSettingId()));
|
|
|
return succeed(model);
|
|
|
}else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
|
|
|
throw new BizException("缴费已截止,如有问题请联系指导老师");
|
zouxuan