From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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 44e1514..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
@@ -15,6 +15,7 @@
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;
@@ -23,10 +24,7 @@
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;
/**
@@ -174,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();
+// }
}
@@ -216,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>()
@@ -224,7 +236,26 @@
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>()
@@ -233,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