From 3caee5ce51a218f4bc1f3757a4d09b0ed18aa6df Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 06 十一月 2023 14:21:12 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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 a8a1c42..ebb3217 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
@@ -358,15 +358,25 @@
     @Override
     public List<DiscountList> queryDiscountListAudit(QueryDiscountList queryDiscountList) {
         Page<DiscountList> discountListPage = new Page<>(queryDiscountList.getOffset(), queryDiscountList.getLimit());
-        List<DiscountList> discountLists = this.baseMapper.queryDiscountListAudit(discountListPage, queryDiscountList.getPCode(), queryDiscountList.getCCode(), queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
+        List<DiscountList> discountLists = this.baseMapper.queryDiscountListAudit(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()).ne(TCoursePackageDiscount::getAuditStatus,2).orderByAsc(TCoursePackageDiscount::getType));
-            long count = tCoursePackageDiscounts.stream().filter(e -> e.getAuditStatus().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())
+                            .ne(TCoursePackageDiscount::getAuditStatus,2)
+                            .orderByAsc(TCoursePackageDiscount::getType));
+//            long count = tCoursePackageDiscounts.stream()
+//                    .filter(e -> e.getAuditStatus().equals(2)).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