xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/constant/Constants.java
@@ -52,6 +52,7 @@ */ public static final Integer SUCCESS = 200; public static final Integer TOKEN_ERROR = 501; public static final Integer GIVE_ERROR = 503; public static final Integer VALUE_ERROR = 502; /** xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/domain/R.java
@@ -19,6 +19,7 @@ * token失效 */ public static final int TOKEN_ERROR = Constants.TOKEN_ERROR; public static final int GIVE_ERROR = Constants.GIVE_ERROR; public static final int VALUE_ERROR = Constants.VALUE_ERROR; /** 失败 */ @@ -42,6 +43,10 @@ { return restResult(null, TOKEN_ERROR, msg); } public static <T> R<T> giveError(String msg) { return restResult(null, GIVE_ERROR, msg); } public static <T> R<T> energyValueError(String msg) { return restResult(null, VALUE_ERROR, msg); xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -507,16 +507,15 @@ orderCourseVO.setGeneralPrice(record.getGeneralPrice()); orderCourseVO.setIosPrice(record.getIosPrice()); orderCourseVO.setCoverUrl(record.getCoverUrl()); List<AppUser> data1 = remoteAppUserService.getUserByCourseId(record.getId()).getData(); List<CourseChapter> list = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, record.getId()).list(); int temp = 0 ; int temp1 = 0 ; for (CourseChapter courseChapter : list) { temp+= courseChapter.getVirtualLearnedNum(); Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData(); temp1+=data2; } int size = courseLearningRecordService.lambdaQuery().eq(CourseLearningRecord::getCourseId, record.getId()) .groupBy(CourseLearningRecord::getAppUserId).list().size(); orderCourseVO.setCount(temp+size); orderCourseVO.setCount(temp+temp1); orderCourseVOS.add(orderCourseVO); } break; @@ -726,6 +725,7 @@ // 查询推荐课程 List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId()) .eq(Course::getCourseType,1) .ne(Course::getId,id) .eq(Course::getRecommend, 1).list(); List<Course> courses = new ArrayList<>(); // 随机获取两个课程 @@ -734,10 +734,10 @@ int index = (int) (Math.random() * size); if (size >= 2){ for (int i = 0; i < 2; i++) { courses.add(list.get(index)); courses.add(list.get(i)); } }else{ courses.add(list.get(index)); courses.addAll(list); } } for (Course cours : courses) { xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationController.java
@@ -123,16 +123,16 @@ Long userId = loginUser.getUserid(); Meditation byId = meditationService.getById(meditationId); List<Meditation> list = meditationService.lambdaQuery().eq(Meditation::getCateId, byId.getCateId()) .ne(Meditation::getId,meditationId) .list(); List<Meditation> courses = new ArrayList<>(); // 如果list集合数据大于2 随机获取两个返回 // 如果list集合数据大于4 随机获取两个返回 if (CollUtils.isNotEmpty(list) && list.size() > 4) { int size = list.size(); int index = (int) (Math.random() * size); for (int i = 0; i < 4; i++) { courses.add(list.get(index)); courses.add(list.get(i)); } return R.ok(courses); }else { xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
@@ -16,8 +16,12 @@ import java.util.List; import java.util.Optional; import com.xinquan.user.api.feign.RemoteAppUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** * <p> @@ -33,6 +37,8 @@ private final MeditationMapper meditationMapper; private final MeditationMusicMapper meditationMusicMapper; @Resource private RemoteAppUserService remoteAppUserService; /** @@ -75,6 +81,9 @@ vo = BeanUtils.copyBean(meditationEveryday, ClientMeditationEverydayVO.class); clientMeditationVO.setBackgroundUrl(meditationOpt.get().getBackgroundUrl()); // 查询冥想实际学习人数 Long data = remoteAppUserService.getMeditationHistoryCount(meditationId).getData(); clientMeditationVO.setRealLearnedNum(Integer.valueOf(data+"")); vo.setClientMeditationVO(clientMeditationVO); if (meditation!=null){ List<MeditationMusic> meditationId1 = meditationMusicMapper.selectList(new QueryWrapper<MeditationMusic>() xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -1199,7 +1199,7 @@ page.sort((o1, o2) -> o2.getMoney().compareTo(o1.getMoney())); List<AppUser> testing = testing(page.size(), pageCurr, pageSize, page); objectPage.setTotal(testing.size()); objectPage.setTotal(page.size()); objectPage.setRecords(testing); return R.ok(PageDTO.of(objectPage, InviteRankListVO.class)); } @@ -1596,7 +1596,7 @@ .ne(AppUser::getUserStatus,3).one(); if (one!=null){ if (one.getId().equals(loginUser.getUserid())){ return R.fail("不可赠送给自己"); return R.giveError("不能赠送给自己"); } AppUserDetailVO appUserDetailVO = new AppUserDetailVO(); appUserDetailVO.setId(one.getId()); xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserViewingHistoryController.java
@@ -106,6 +106,7 @@ List<AppUserViewingHistory> list = appUserViewingHistoryService.lambdaQuery() .eq(AppUserViewingHistory::getBizId, id) .eq(AppUserViewingHistory::getViewingType, 1) .groupBy(AppUserViewingHistory::getAppUserId) .list(); return R.ok(Long.valueOf(list.size())); }
