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/service/impl/TCoursePackageDiscountServiceImpl.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
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