From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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 6af20df..d87fd82 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,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.course.entity.TCoursePackageDiscount;
+import com.dsh.course.model.DiscountList;
+import com.dsh.course.model.QueryDiscountList;
import com.dsh.course.model.vo.response.Details;
import com.dsh.course.model.vo.response.ExchangeCoursePackageResponse;
-import com.dsh.course.util.ResultUtil;
import java.util.List;
@@ -21,8 +22,9 @@
List<Details> getWeeksBenefitCourse(Integer appUserId, Integer discountType, String lon, String lat);
- ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId,String lat,String lon);
+ ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId, String lat, String lon);
- ResultUtil paymentDiscountCoursePack(Integer coursePackageDiscountId, Integer appuserId);
+ List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList);
+ List<DiscountList> queryDiscountListAudit(QueryDiscountList queryDiscountList);
}
--
Gitblit v1.7.1