From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 156 insertions(+), 11 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 9f060b1..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
@@ -1,23 +1,24 @@
package com.dsh.course.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.entity.CoursePackagePaymentConfig;
-import com.dsh.course.entity.TCoursePackage;
-import com.dsh.course.entity.TCoursePackagePayment;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
+import com.dsh.course.model.BaseVo;
+import com.dsh.course.model.QueryCoursePackageLists;
+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;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.bouncycastle.math.Primes;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -54,6 +57,33 @@
@Autowired
private TokenUtil tokenUtil;
+
+
+ /**
+ * 根据门店ids获取课包ids 根据课包ids 获取购课记录的用户ids
+ */
+ @ResponseBody
+ @PostMapping("/base/coursePackage/getCoursePackageByStoreIds")
+ public List<Integer> getCoursePackageByStoreIds(@RequestBody List<Integer> storeIds){
+ try {
+ // 获取当前课包的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;
+ }
+
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
/**
* 根据id获取课包
* @param id
@@ -71,6 +101,67 @@
}
}
+ @ResponseBody
+ @PostMapping("/base/coursePackage/queryByStoreId")
+ public List<TCoursePackage> queryByStoreId(@RequestBody Integer shopId){
+ try {
+ List<TCoursePackage> shopId1 = coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("storeId", shopId));
+ return shopId1;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ @Autowired
+ private TCoursePackagePaymentService packagePaymentService;
+
+ @ResponseBody
+ @PostMapping("/base/coursePackage/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+
+ 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获取课包
+ */
+ @ResponseBody
+ @PostMapping("/base/coursePackage/getCoursePackageByStoreId")
+ public List<TCoursePackage> getCoursePackageByStoreId(@RequestBody Integer storeId){
+
+ return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("storeId", storeId));
+ }
+ /**
+ * 根据课包类型获取课包
+ */
+ @ResponseBody
+ @PostMapping("/base/coursePackage/getCoursePackageByType/{typeId}/{storeId}")
+ public List<TCoursePackage> getCoursePackageByType(@PathVariable("typeId") Integer typeId,@PathVariable("storeId")Integer storeId){
+
+ return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("coursePackageTypeId", typeId).eq("storeId",storeId));
+ }
/**
* 本周福利列表
*/
@@ -109,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();
+// }
}
@@ -134,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()));
@@ -163,4 +255,57 @@
return icppconfigService.getById(coursePackConfigId);
}
+
+ /**
+ * 获取课包管理列表数据
+ * @param queryCoursePackageLists
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackage/queryCoursePackageLists")
+ public Page<Map<String, Object>> queryCoursePackageLists(@RequestBody QueryCoursePackageLists queryCoursePackageLists){
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryCoursePackageLists.getLimit(), queryCoursePackageLists.getOffset(), queryCoursePackageLists.getSort(), queryCoursePackageLists.getOrder());
+ Page<Map<String, Object>> mapPage = page.setRecords(coursePackageService.queryCoursePackageLists(page, queryCoursePackageLists));
+ return mapPage;
+ }
+
+
+ /**
+ * 添加数据
+ * @param coursePackage
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackage/addCoursePackage")
+ public Integer addCoursePackage(@RequestBody TCoursePackage coursePackage){
+ coursePackage.setNeedNum(coursePackage.getCodeTime());
+ return coursePackageService.addCoursePackage(coursePackage);
+ }
+
+
+ /**
+ * 修改数据
+ * @param coursePackage
+ */
+ @ResponseBody
+ @PostMapping("/coursePackage/updateCoursePackageById")
+ public void updateCoursePackageById(@RequestBody TCoursePackage coursePackage){
+ coursePackageService.updateCoursePackageById(coursePackage);
+ }
+
+
+
+ /**
+ * 获取课包审核列表
+ * @param queryExamineCoursePackageLists
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/coursePackage/queryExamineCoursePackageLists")
+ public Page<Map<String, Object>> queryExamineCoursePackageLists(@RequestBody QueryExamineCoursePackageLists queryExamineCoursePackageLists){
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryExamineCoursePackageLists.getLimit(), queryExamineCoursePackageLists.getOffset(),
+ queryExamineCoursePackageLists.getSort(), queryExamineCoursePackageLists.getOrder());
+ Page<Map<String, Object>> mapPage = page.setRecords(coursePackageService.queryExamineCoursePackageLists(page, queryExamineCoursePackageLists));
+ return mapPage;
+ }
}
--
Gitblit v1.7.1