|
@@ -3,6 +3,8 @@ package com.yonge.cooleshow.biz.dal.service.impl;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.CourseScheduleDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.HomeDao;
|
|
|
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
|
|
|
+import com.yonge.cooleshow.biz.dal.dao.UserAccountRecordDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.SubjectHomeSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.req.TotalReq;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
|
|
@@ -13,6 +15,7 @@ import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.HomeService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
|
|
|
import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.CourseHomeVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.SubjectHomeVo;
|
|
@@ -47,6 +50,11 @@ public class HomeServiceImpl implements HomeService {
|
|
|
|
|
|
@Autowired
|
|
|
private MusicSheetService musicSheetService;
|
|
|
+ @Autowired
|
|
|
+ private MusicSheetDao musicSheetDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private UserAccountRecordDao userAccountRecordDao;
|
|
|
|
|
|
@Override
|
|
|
public HomeUserToDoNum getUserToDoNum() {
|
|
@@ -352,15 +360,25 @@ public class HomeServiceImpl implements HomeService {
|
|
|
|
|
|
收益:售卖曲目累计收益金额
|
|
|
*/
|
|
|
- TeacherHomeWrapper.MusicSheetTotal musicSheetTotal = new TeacherHomeWrapper.MusicSheetTotal();
|
|
|
-// musicSheetService.lambdaQuery()
|
|
|
-// .eq(MusicSheet::getUserId, teacherId)
|
|
|
-// .eq(MusicSheet::getDelFlag,0)
|
|
|
-// .eq(MusicSheet::getAuditStatus, AuthStatusEnum.PASS)
|
|
|
-// .eq(MusicSheet::getState,1)
|
|
|
+ TeacherHomeWrapper.MusicSheetTotal musicSheetTotal = musicSheetDao.musicSheetTotal(teacherId);
|
|
|
+ if (musicSheetTotal == null) {
|
|
|
+ musicSheetTotal = new TeacherHomeWrapper.MusicSheetTotal();
|
|
|
+ }
|
|
|
+ // 收益
|
|
|
+ TeacherHomeWrapper.MusicSheetTotal musicSheetTotal1 = userAccountRecordDao.musicSheetTotal(teacherId);
|
|
|
+ if (musicSheetTotal1 != null) {
|
|
|
+ musicSheetTotal.setMusicSheetIncome(musicSheetTotal1.getMusicSheetIncome());
|
|
|
+ musicSheetTotal.setMusicSheetPayNum(musicSheetTotal1.getMusicSheetPayNum());
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
return musicSheetTotal;
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<TeacherHomeWrapper.MusicSheetTotal> musicSheetPage(TeacherHomeWrapper.MusicSheetQuery query) {
|
|
|
+ return musicSheetDao.musicSheetPage(query);
|
|
|
+ }
|
|
|
+
|
|
|
}
|