From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 150 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 122 insertions(+), 28 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 3cfdac8..c366d3e 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,13 +11,11 @@
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 com.dsh.course.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -29,10 +24,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -62,6 +55,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
@@ -79,6 +99,18 @@
}
}
+ @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;
@@ -88,6 +120,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获取课包
@@ -102,9 +155,10 @@
* 根据课包类型获取课包
*/
@ResponseBody
- @PostMapping("/base/coursePackage/getCoursePackageByType")
- public List<TCoursePackage> getCoursePackageByType(@RequestBody Integer typeId){
- return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("coursePackageTypeId", typeId));
+ @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));
}
/**
* 本周福利列表
@@ -118,16 +172,30 @@
@ApiImplicitParam(name = "lon",value = "经度",dataType = "String"),
@ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
})
- public ResultUtil<List<Details>> thisWeeksBenefitList(Integer discountType, String lon, String lat){
- try {
+ public ResultUtil<List<Details>> thisWeeksBenefitList(Integer discountType, String lon, String lat) throws Exception {
+// try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(tcpdService.getWeeksBenefitCourse(appUserId,discountType,lon,lat));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+ String [] strings = {"今日","明日","周一","周二","周三","周四","周五","周六","周日"};
+ List<String> stringList = new ArrayList<>(Arrays.asList(strings));
+
+ List<Details> weeksBenefitCourse = tcpdService.getWeeksBenefitCourse(appUserId, discountType, lon, lat);
+
+ weeksBenefitCourse.sort(new Comparator<Details>() {
+ @Override
+ public int compare(Details o1, Details o2) {
+ return stringList.indexOf(o1.getDataTime()) - stringList.indexOf(o2.getDataTime());
+ }
+ });
+
+
+// return ResultUtil.success(tcpdService.getWeeksBenefitCourse(appUserId,discountType,lon,lat));
+ return ResultUtil.success(weeksBenefitCourse);
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
@@ -144,11 +212,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();
+// }
}
@@ -160,7 +228,7 @@
List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>()
.eq("storeId", storeId)
.eq("auditStatus",2)
- .eq("state",1));
+ .eq("state",1).orderByDesc("insertTime"));
if (list.size() > 0){
for (TCoursePackage coursePackage : list) {
int count = tcppmenService.count(new QueryWrapper<TCoursePackagePayment>()
@@ -168,7 +236,27 @@
StoreOfCourseVo courseVo = new StoreOfCourseVo();
courseVo.setCourseId(coursePackage.getId());
courseVo.setName(coursePackage.getName()+"(" + store.getName() + ")");
- courseVo.setClassStartTime(coursePackage.getClassStartTime() +"-"+ coursePackage.getClassEndTime());
+
+
+ String classStartTime = coursePackage.getClassStartTime();
+ String classEndTime = coursePackage.getClassEndTime();
+ ArrayList<String> classTime = new ArrayList<>();
+ String[] split4 = classStartTime.split(",");
+ String[] split3 = classEndTime.split(",");
+ if(ToolUtil.isNotEmpty(classStartTime)){
+ for (int i = 0; i < split4.length; i++) {
+ String s = split4[i].substring(0,5) + "-" + split3[i].substring(0,5);
+ classTime.add(s);
+ }
+ }
+
+// coursePackageInfo.setTimes(classTime);
+ String classTimeAsString = String.join("|", classTime);
+
+
+
+ courseVo.setClassStartTime(classTimeAsString);
+ courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
courseVo.setApplicantsNumber(count);
List<CoursePackagePaymentConfig> list1 = icppconfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
.eq("coursePackageId",coursePackage.getId()));
@@ -176,9 +264,15 @@
CoursePackagePaymentConfig minConfig = list1.stream()
.min(Comparator.comparingDouble(CoursePackagePaymentConfig::getCashPayment))
.orElse(null);
+ List<Integer> classHours = new ArrayList<>();
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : list1) {
+ classHours.add(coursePackagePaymentConfig.getClassHours());
+ }
+
if (minConfig != null){
- courseVo.setClassHours(minConfig.getClassHours());
+ courseVo.setClassHours(classHours);
courseVo.setOriginalPrice(minConfig.getCashPayment());
+ courseVo.setCoin(minConfig.getPlayPaiCoin());
}
courseVoList.add(courseVo);
--
Gitblit v1.7.1