xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java
@@ -152,7 +152,7 @@ * @return */ @PostMapping("/inner/app-user/appleLogin") R<AppLoginUser> appleLogin(@RequestParam("appleId") String appleId,@RequestParam("appleId") String device, R<AppLoginUser> appleLogin(@RequestParam("appleId") String appleId,@RequestParam("device") String device, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -374,22 +374,20 @@ } List<CourseChapter> list = courseChapterService.lambdaQuery() .eq(CourseChapter::getCourseId, uid).list(); int temp = 0; int temp1 = 0; int a = 0; int b = 0; for (CourseChapter courseChapter : list) { int size = courseLearningRecordService.lambdaQuery() .eq(CourseLearningRecord::getChapterId, courseChapter.getId()) .list().size(); courseChapter.setRealLearnedNum(size+courseChapter.getVirtualLearnedNum()); temp+=courseChapter.getVirtualLearnedNum(); temp1+=size; a+= courseChapter.getVirtualLearnedNum(); Long data1 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData(); b+=data1; } int size1 = courseLearningRecordService.lambdaQuery() .eq(CourseLearningRecord::getCourseId, uid).groupBy(CourseLearningRecord::getAppUserId) .list().size(); byId.setVirtualLearnedNum(temp); byId.setRealLearnedNum(size1); byId.setCount(temp+size1); byId.setVirtualLearnedNum(a); byId.setRealLearnedNum(b); byId.setCount(a+b); byId.setList(list); int size = courseUserFavoriteService.lambdaQuery() .eq(CourseUserFavorite::getCourseId, uid).list().size(); xinquan-modules/xinquan-meditation/src/main/resources/mapper/meditation/MeditationMapper.xml
@@ -62,7 +62,9 @@ </foreach> </if> and m.del_flag = 0 and m.listing_status = 1 </where> group by mt.meditation_id ORDER BY sort_num DESC </select> xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
@@ -309,6 +309,7 @@ appUser.setLevelSettingId(TreeLevelEnum.SEED.getCode()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String format = simpleDateFormat.format(new Date()); appLoginUser.setBindStatus(DisabledEnum.YES.getCode()); // 生成四位随机数字 String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000)); appUser.setCode("YH" + format + randomCode);
