From c678894e37d15cca116d962eba5c107c99176945 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 20 七月 2023 17:39:05 +0800
Subject: [PATCH] 开始上课的主页中课包列表展示；bmi工具类匹配对应的身体状态
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 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 ad053e0..8fb6b20 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,8 @@
package com.dsh.course.controller;
import com.dsh.course.entity.TCoursePackage;
+import com.dsh.course.model.vo.response.Details;
import com.dsh.course.model.vo.response.ExchangeCoursePackageResponse;
-import com.dsh.course.model.vo.response.WeekLimitedResponse;
import com.dsh.course.service.TCoursePackageDiscountService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.ResultUtil;
@@ -12,6 +12,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -61,7 +63,7 @@
@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){
@@ -89,31 +91,6 @@
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("/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();
}
--
Gitblit v1.7.1