From c143e52e5bcc512232e2b21626b0e649ad2176bb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/model/vo/response/ExchangeCoursePackageResponse.java | 2
/dev/null | 57 -------------------
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java | 6 +
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 6 +
cloud-server-course/src/main/java/com/dsh/course/model/vo/response/Details.java | 45 +++++++++++++++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 21 +++----
6 files changed, 63 insertions(+), 74 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..e3ebf20 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){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/Details.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/Details.java
new file mode 100644
index 0000000..a6c52bc
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/Details.java
@@ -0,0 +1,45 @@
+package com.dsh.course.model.vo.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Details {
+
+ @ApiModelProperty(value = "限时折扣配置id/赠送课时配置id")
+ private Integer coursePackageDiscountId;
+
+ @ApiModelProperty(value = "封面图")
+ private String image;
+
+ @ApiModelProperty(value = "课包名称")
+ private String coursePackageName;
+
+ @ApiModelProperty(value = "课包课时数")
+ private Integer courseHours;
+
+ @ApiModelProperty(value = "赠送课时数(赠送课时 取该字段)")
+ private Integer donateHours;
+
+ @ApiModelProperty(value = "今日/明日/周x")
+ private String dataTime;
+
+ @ApiModelProperty(value = "日期")
+ private Date date;
+
+ @ApiModelProperty(value = "原价")
+ private Double originalPrice;
+
+ @ApiModelProperty(value = "折后价")
+ private Double discountPrice;
+
+ @ApiModelProperty(value = "状态(1=查看详情 2=暂未开始)")
+ private Integer status;
+
+ @ApiModelProperty(value = "门店距离")
+ private long storeDistance;
+
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/ExchangeCoursePackageResponse.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/ExchangeCoursePackageResponse.java
index d07f170..3b115ef 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/ExchangeCoursePackageResponse.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/ExchangeCoursePackageResponse.java
@@ -7,7 +7,7 @@
@Data
public class ExchangeCoursePackageResponse {
- @ApiModelProperty(value = "限时折扣配置id/赠送课时配置id")
+ @ApiModelProperty(value = "课包id")
private Integer coursePackageDiscountId;
@ApiModelProperty(value = "课包封面图")
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/WeekLimitedResponse.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/WeekLimitedResponse.java
deleted file mode 100644
index 297caa6..0000000
--- a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/WeekLimitedResponse.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.dsh.course.model.vo.response;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class WeekLimitedResponse {
-
- @ApiModelProperty(value = "折扣类型 1限时折扣 2赠送课时")
- private Integer discountType;
-
- @ApiModelProperty(value = "数据列表")
- private List<Details> list;
-
- @Data
- public static class Details{
-
- @ApiModelProperty(value = "限时折扣配置id/赠送课时配置id")
- private Integer coursePackageDiscountId;
-
- @ApiModelProperty(value = "封面图")
- private String image;
-
- @ApiModelProperty(value = "课包名称")
- private String coursePackageName;
-
- @ApiModelProperty(value = "课包课时数")
- private Integer courseHours;
-
- @ApiModelProperty(value = "赠送课时数(赠送课时 取该字段)")
- private Integer donateHours;
-
- @ApiModelProperty(value = "今日/明日/周x")
- private String dataTime;
-
- @ApiModelProperty(value = "日期")
- private Date date;
-
- @ApiModelProperty(value = "原价")
- private Double originalPrice;
-
- @ApiModelProperty(value = "折后价")
- private Double discountPrice;
-
- @ApiModelProperty(value = "状态(1=查看详情 2=暂未开始)")
- private Integer status;
-
- @ApiModelProperty(value = "门店距离")
- private long storeDistance;
-
- }
-
-}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java
index c9ba179..6af20df 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.course.entity.TCoursePackageDiscount;
+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.util.ResultUtil;
+
+import java.util.List;
/**
@@ -17,7 +19,7 @@
*/
public interface TCoursePackageDiscountService extends IService<TCoursePackageDiscount> {
- WeekLimitedResponse getWeeksBenefitCourse(Integer appUserId,Integer discountType,String lon,String lat);
+ List<Details> getWeeksBenefitCourse(Integer appUserId, Integer discountType, String lon, String lat);
ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId,String lat,String lon);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
index aa8c8de..218bcba 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
@@ -16,8 +16,8 @@
import com.dsh.course.mapper.TCoursePackageDiscountMapper;
import com.dsh.course.mapper.TCoursePackageMapper;
import com.dsh.course.mapper.TCoursePackagePaymentMapper;
+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.util.DateTimeHelper;
import com.dsh.course.util.LocalDateTimeUtils;
@@ -59,12 +59,11 @@
@Override
- public WeekLimitedResponse getWeeksBenefitCourse(Integer appUserId, Integer discountType, String lon, String lat) {
+ public List<Details> getWeeksBenefitCourse(Integer appUserId, Integer discountType, String lon, String lat) {
Date localTime = DateTimeHelper.getWXTime();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- WeekLimitedResponse response = new WeekLimitedResponse();
- List<WeekLimitedResponse.Details> list = new ArrayList<>();
+ List<Details> list = new ArrayList<>();
QueryWrapper<TCoursePackageDiscount> tCoursePackageDiscountQueryWrapper = new QueryWrapper<>();
tCoursePackageDiscountQueryWrapper.eq("auditStatus", 2);
@@ -72,7 +71,6 @@
int weekStr = LocalDateTimeUtils.getWeekStr();
if (null == discountType || discountType == 1) {
tCoursePackageDiscountQueryWrapper.eq("type", 3);
- response.setDiscountType(1);
tCoursePackageDiscounts = this.baseMapper.selectList(tCoursePackageDiscountQueryWrapper);
if (tCoursePackageDiscounts.size() > 0) {
for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
@@ -126,7 +124,7 @@
if (isWithinRange) {
// 判断当前日期是否在开始时间和结束时间范围内
if (isDateWithinRange(localTime, parse1, parse2)) {
- WeekLimitedResponse.Details resde = new WeekLimitedResponse.Details();
+ Details resde = new Details();
resde.setCoursePackageDiscountId(tCoursePackageDiscount.getId());
resde.setImage(coursePackage.getCoverDrawing());
@@ -154,7 +152,7 @@
Date tempDate = tempCalendar.getTime();
int weekNumOfDate = DateTimeHelper.getWeekNumOfDate(tempDate);
if (isDateWithinRange(tempDate, parse1, parse2) && weeks.contains(weekNumOfDate)) {
- WeekLimitedResponse.Details resde = new WeekLimitedResponse.Details();
+ Details resde = new Details();
resde.setCoursePackageDiscountId(tCoursePackageDiscount.getId());
resde.setImage(coursePackage.getCoverDrawing());
@@ -188,7 +186,6 @@
}
} else {
tCoursePackageDiscountQueryWrapper.eq("type", 4);
- response.setDiscountType(2);
tCoursePackageDiscounts = this.baseMapper.selectList(tCoursePackageDiscountQueryWrapper);
if (tCoursePackageDiscounts.size() > 0) {
for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
@@ -241,7 +238,7 @@
if (isWithinRange) {
// 判断当前日期是否在开始时间和结束时间范围内
if (isDateWithinRange(localTime, parse1, parse2)) {
- WeekLimitedResponse.Details resde = new WeekLimitedResponse.Details();
+ Details resde = new Details();
resde.setCoursePackageDiscountId(tCoursePackageDiscount.getId());
resde.setImage(coursePackage.getCoverDrawing());
@@ -269,7 +266,7 @@
Date tempDate = tempCalendar.getTime();
int weekNumOfDate = DateTimeHelper.getWeekNumOfDate(tempDate);
if (isDateWithinRange(tempDate, parse1, parse2) && weeks.contains(weekNumOfDate)) {
- WeekLimitedResponse.Details resde = new WeekLimitedResponse.Details();
+ Details resde = new Details();
resde.setCoursePackageDiscountId(tCoursePackageDiscount.getId());
resde.setImage(coursePackage.getCoverDrawing());
@@ -304,14 +301,14 @@
}
}
}
- return response;
+ return list;
}
@Override
public ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId,String lat,String lon) {
ExchangeCoursePackageResponse packageResponse = new ExchangeCoursePackageResponse();
TCoursePackageDiscount coursePackageDiscount = this.baseMapper.selectById(coursePackageDiscountId);
- packageResponse.setCoursePackageDiscountId(coursePackageDiscount.getId());
+ packageResponse.setCoursePackageDiscountId(coursePackageDiscount.getCoursePackageId());
Integer coursePackageId = coursePackageDiscount.getCoursePackageId();
TCoursePackage coursePackage = tcpMapper.selectById(coursePackageId);
--
Gitblit v1.7.1