From 529c840af92391b54e3547868e7cf1b65e90cef6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 15:49:19 +0800
Subject: [PATCH] 代码提交
---
xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java | 2 +-
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java | 1 +
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 20 +++++++++-----------
xinquan-modules/xinquan-meditation/src/main/resources/mapper/meditation/MeditationMapper.xml | 2 ++
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java
index d2155ea..bf80f88 100644
--- a/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/feign/RemoteAppUserService.java
+++ b/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);
/**
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
index 2925f85..8c48a63 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
+++ b/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();
diff --git a/xinquan-modules/xinquan-meditation/src/main/resources/mapper/meditation/MeditationMapper.xml b/xinquan-modules/xinquan-meditation/src/main/resources/mapper/meditation/MeditationMapper.xml
index 78e1629..a646dd0 100644
--- a/xinquan-modules/xinquan-meditation/src/main/resources/mapper/meditation/MeditationMapper.xml
+++ b/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>
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
index 68d25e1..e19abff 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
+++ b/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);
--
Gitblit v1.7.1