From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
index 83e29fd..44e1514 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.CoursePackagePaymentConfig;
-import com.dsh.course.entity.TCoursePackage;
-import com.dsh.course.entity.TCoursePackagePayment;
-import com.dsh.course.entity.TCoursePackageType;
+import com.dsh.course.entity.*;
import com.dsh.course.feignclient.model.StoreOfCourseVo;
import com.dsh.course.feignclient.other.StoreClient;
import com.dsh.course.feignclient.other.model.Store;
@@ -14,10 +11,7 @@
import com.dsh.course.model.QueryExamineCoursePackageLists;
import com.dsh.course.model.vo.response.Details;
import com.dsh.course.model.vo.response.ExchangeCoursePackageResponse;
-import com.dsh.course.service.ICoursePackagePaymentConfigService;
-import com.dsh.course.service.TCoursePackageDiscountService;
-import com.dsh.course.service.TCoursePackagePaymentService;
-import com.dsh.course.service.TCoursePackageService;
+import com.dsh.course.service.*;
import com.dsh.course.util.PageFactory;
import com.dsh.course.util.ResultUtil;
import com.dsh.course.util.TokenUtil;
@@ -75,10 +69,14 @@
// 获取当前课包的ids
List<Integer> courseIds = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", storeIds))
.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if (courseIds.size() == 0){
+ return new ArrayList<>();
+ }else{
+ List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds))
+ .stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
+ return userIds;
+ }
- List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds))
- .stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
- return userIds;
}catch (Exception e){
e.printStackTrace();
return null;
@@ -124,6 +122,27 @@
return packagePaymentService.listStoreId(code);
+ }
+
+@Autowired
+private CoursePackageStudentService coursePackageStudentService;
+
+ @Autowired
+ private UserVideoDetailsService userVideoDetailsService;
+
+
+ @ResponseBody
+ @PostMapping("/base/coursePackage/counts")
+ public Integer counts(@RequestBody Integer stuId){
+ return coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("signInOrNot",1).eq("studentId",stuId));
+
+ }
+
+ @ResponseBody
+ @PostMapping("/base/coursePackage/counts1")
+ public Integer counts1(@RequestBody Integer stuId){
+ return userVideoDetailsService.count(new QueryWrapper<UserVideoDetails>().eq("appUserId",stuId)) ;
+
}
/**
* 根据id获取课包
@@ -181,11 +200,11 @@
@ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
})
public ResultUtil<ExchangeCoursePackageResponse> discountCourseDatas(Integer coursePackageDiscountId,String lon,String lat){
- try {
+// try {
return ResultUtil.success(tcpdService.getWeekFreeCourseDetails(coursePackageDiscountId,lat,lon));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
@@ -206,6 +225,7 @@
courseVo.setCourseId(coursePackage.getId());
courseVo.setName(coursePackage.getName()+"(" + store.getName() + ")");
courseVo.setClassStartTime(coursePackage.getClassStartTime() +"-"+ coursePackage.getClassEndTime());
+ courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
courseVo.setApplicantsNumber(count);
List<CoursePackagePaymentConfig> list1 = icppconfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
.eq("coursePackageId",coursePackage.getId()));
--
Gitblit v1.7.1