From 738f93e8f8226518e5b0e202b1f7afd19c01656e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 25 七月 2023 09:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 90 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 4 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 1cc67b4..f8fe08d 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,8 +1,17 @@
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.model.vo.response.WeekLimitedResponse;
+import com.dsh.course.entity.TCoursePackagePayment;
+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.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.util.ResultUtil;
import com.dsh.course.util.TokenUtil;
@@ -11,6 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
/**
* @author zhibing.pu
@@ -26,6 +40,15 @@
@Autowired
private TCoursePackageDiscountService tcpdService;
+
+ @Resource
+ private StoreClient storeClient;
+
+ @Resource
+ private TCoursePackagePaymentService tcppmenService;
+
+ @Resource
+ private ICoursePackagePaymentConfigService icppconfigService;
@Autowired
@@ -53,12 +76,14 @@
*/
@ResponseBody
@PostMapping("/api/useBenefit/weekLimitedBenefit")
- @ApiOperation(value = "使用福利-本周福利限时折扣列表", tags = {"APP-开始上课"})
+ @ApiOperation(value = "本周福利-限时折扣列表", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(name = "discountType",value = "默认显示 限时折扣 (1限时折扣 2赠送课时)")
+ @ApiImplicitParam(name = "discountType",value = "默认显示 限时折扣 (1限时折扣 2赠送课时)",dataType = "int"),
+ @ApiImplicitParam(name = "lon",value = "经度",dataType = "String"),
+ @ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
})
- public ResultUtil<WeekLimitedResponse> thisWeeksBenefitList(Integer discountType,String lon,String lat){
+ public ResultUtil<List<Details>> thisWeeksBenefitList(Integer discountType, String lon, String lat){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -70,4 +95,61 @@
}
}
+
+ /**
+ * 折扣课包详情
+ */
+ @ResponseBody
+ @PostMapping("/api/useBenefit/discountCourseDatas")
+ @ApiOperation(value = "本周福利-折扣课包详情", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(name = "coursePackageDiscountId",value = "限时折扣配置id/赠送课时配置id",dataType = "int"),
+ @ApiImplicitParam(name = "lon",value = "经度",dataType = "String"),
+ @ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
+ })
+ public ResultUtil<ExchangeCoursePackageResponse> discountCourseDatas(Integer coursePackageDiscountId,String lon,String lat){
+ try {
+ return ResultUtil.success(tcpdService.getWeekFreeCourseDetails(coursePackageDiscountId,lat,lon));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/base/coursePack/courseList")
+ public List<StoreOfCourseVo> getStoreOfCourseList(@RequestBody Integer storeId){
+ List<StoreOfCourseVo> courseVoList = new ArrayList<>();
+ Store store = storeClient.queryStoreById(storeId);
+ List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>()
+ .eq("storeId", storeId)
+ .eq("auditStatus",2)
+ .eq("state",1));
+ if (list.size() > 0){
+ for (TCoursePackage coursePackage : list) {
+ int count = tcppmenService.count(new QueryWrapper<TCoursePackagePayment>()
+ .eq("coursePackageId",coursePackage.getId()));
+ StoreOfCourseVo courseVo = new StoreOfCourseVo();
+ courseVo.setCourseId(coursePackage.getId());
+ courseVo.setName(coursePackage.getName()+"(" + store.getName() + ")");
+ courseVo.setClassStartTime(coursePackage.getClassStartTime() +"-"+ coursePackage.getClassEndTime());
+ courseVo.setApplicantsNumber(count);
+ List<CoursePackagePaymentConfig> list1 = icppconfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId",coursePackage.getId()));
+// 取价格最低的课时
+ CoursePackagePaymentConfig minConfig = list1.stream()
+ .min(Comparator.comparingDouble(CoursePackagePaymentConfig::getCashPayment))
+ .orElse(null);
+ if (minConfig != null){
+ courseVo.setClassHours(minConfig.getClassHours());
+ courseVo.setOriginalPrice(minConfig.getCashPayment());
+ }
+
+ courseVoList.add(courseVo);
+ }
+ }
+ return courseVoList;
+ }
+
}
--
Gitblit v1.7.1