玩湃门店数据权限修改 收入管理增加世界杯记录

无关风月

2024-07-24 8889371c686cb0b202370f0786968ae03c4210cf

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java

@@ -50,6 +50,8 @@

    @Resource
    private ICoursePackagePaymentConfigService icppconfigService;
    @Autowired
    private ICoursePackageOrderService coursePackageOrderService;


    @Autowired
@@ -72,8 +74,15 @@
            if (courseIds.size() == 0) {
                return new ArrayList<>();
            } else {
                List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds))
                List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>()
                                .in("coursePackageId", courseIds)
                                .eq("payStatus",2))
                        .stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
                List<Integer> collect = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
                        .in("coursePackageId", courseIds)
                        .eq("payStatus", 2)
                ).stream().map(CoursePackageOrder::getAppUserId).collect(Collectors.toList());
                userIds.addAll(collect);
                return userIds;
            }

@@ -242,8 +251,6 @@
                StoreOfCourseVo courseVo = new StoreOfCourseVo();
                courseVo.setCourseId(coursePackage.getId());
                courseVo.setName(coursePackage.getName() + "(" + store.getName() + ")");


                String classStartTime = coursePackage.getClassStartTime();
                String classEndTime = coursePackage.getClassEndTime();
                ArrayList<String> classTime = new ArrayList<>();
@@ -255,11 +262,8 @@
                        classTime.add(s);
                    }
                }

//                coursePackageInfo.setTimes(classTime);
                String classTimeAsString = String.join("|", classTime);


                courseVo.setClassStartTime(classTimeAsString);
                courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
                courseVo.setApplicantsNumber(count);