From 951f90b82993acc835cdf58a9f1f39aeecd86674 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 16:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 762f83f..60e6a68 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
@@ -69,7 +69,7 @@
List<Details> list = new ArrayList<>();
QueryWrapper<TCoursePackageDiscount> tCoursePackageDiscountQueryWrapper = new QueryWrapper<>();
- tCoursePackageDiscountQueryWrapper.eq("auditStatus", 2);
+ tCoursePackageDiscountQueryWrapper.eq("auditStatus", 2).eq("status",1);
List<TCoursePackageDiscount> tCoursePackageDiscounts = new ArrayList<>();
int weekStr = LocalDateTimeUtils.getWeekStr();
if (null == discountType || discountType == 1) {
@@ -411,12 +411,7 @@
.eq(TCoursePackageDiscount::getCoursePackageId,
discountList.getCourseId())
.orderByAsc(TCoursePackageDiscount::getType));
- long count = tCoursePackageDiscounts.stream().count();
- if(count>0){
- discountList.setStatus(2);
- }else {
- discountList.setStatus(1);
- }
+
String type="";
for (int i = 0; i < tCoursePackageDiscounts.size(); i++) {
if(tCoursePackageDiscounts.get(i).getType()==1){
--
Gitblit v1.7.1