From fc5fcf753994834a72564944c117d5ec850f268c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 19:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 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 e3ebf20..9f060b1 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,9 +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.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;
@@ -13,6 +21,9 @@
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;
/**
@@ -30,6 +41,15 @@
@Autowired
private TCoursePackageDiscountService tcpdService;
+ @Resource
+ private StoreClient storeClient;
+
+ @Resource
+ private TCoursePackagePaymentService tcppmenService;
+
+ @Resource
+ private ICoursePackagePaymentConfigService icppconfigService;
+
@Autowired
private TokenUtil tokenUtil;
@@ -40,7 +60,7 @@
* @return
*/
@ResponseBody
- @PostMapping("/coursePackage/queryCoursePackageById")
+ @PostMapping("/base/coursePackage/queryCoursePackageById")
public TCoursePackage queryCoursePackageById(@RequestBody Integer id){
try {
TCoursePackage coursePackage = coursePackageService.getById(id);
@@ -97,28 +117,50 @@
}
+ @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;
+ }
+
/**
- * 折扣课包支付
+ * 根据id获取课包
+ * @param coursePackConfigId
+ * @return
*/
@ResponseBody
- @PostMapping("/api/useBenefit/paymentOfDiscountCoursePack")
- @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 paymentWeeksFreeCourse(Integer coursePackageDiscountId){
- try {
- Integer appuserId = tokenUtil.getUserIdFormRedis();
- if(null == appuserId){
- return ResultUtil.tokenErr();
- }
- return tcpdService.paymentDiscountCoursePack(coursePackageDiscountId,appuserId);
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+ @PostMapping("/base/coursePackage/queryConfigCoursePackData")
+ public CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId){
+ return icppconfigService.getById(coursePackConfigId);
}
}
--
Gitblit v1.7.1