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 | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 ebb3217..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) {
@@ -381,6 +381,8 @@
for (int i = 0; i < tCoursePackageDiscounts.size(); i++) {
if(tCoursePackageDiscounts.get(i).getType()==1){
type += "会员折扣、";
+ }else if(tCoursePackageDiscounts.get(i).getType()==2){
+ type += "续课优惠、";
}else if(tCoursePackageDiscounts.get(i).getType()==3){
type += "限时折扣、";
}else if(tCoursePackageDiscounts.get(i).getType()==4){
@@ -404,18 +406,20 @@
}
List<DiscountList> discountLists = this.baseMapper.queryDiscountList(discountListPage, queryDiscountList.getPCode(), queryDiscountList.getCCode(), queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
for (DiscountList discountList : discountLists) {
- List<TCoursePackageDiscount> tCoursePackageDiscounts = this.baseMapper.selectList(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, discountList.getCourseId()).eq(TCoursePackageDiscount::getAuditStatus,2).orderByAsc(TCoursePackageDiscount::getType));
- long count = tCoursePackageDiscounts.stream().filter(e -> e.getStatus().equals(2)).count();
- if(count>0){
- discountList.setStatus(2);
- }else {
- discountList.setStatus(1);
- }
+ List<TCoursePackageDiscount> tCoursePackageDiscounts = this.baseMapper.selectList
+ (new LambdaQueryWrapper<TCoursePackageDiscount>()
+ .eq(TCoursePackageDiscount::getCoursePackageId,
+ discountList.getCourseId())
+ .orderByAsc(TCoursePackageDiscount::getType));
+
String type="";
for (int i = 0; i < tCoursePackageDiscounts.size(); i++) {
if(tCoursePackageDiscounts.get(i).getType()==1){
type += "会员折扣、";
- }else if(tCoursePackageDiscounts.get(i).getType()==3){
+ }else if(tCoursePackageDiscounts.get(i).getType()==2){
+ type += "续课优惠、";
+ }
+ else if(tCoursePackageDiscounts.get(i).getType()==3){
type += "限时折扣、";
}else if(tCoursePackageDiscounts.get(i).getType()==4){
type += "赠送课时、";
--
Gitblit v1.7.1