Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

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

@@ -62,6 +62,9 @@
    @Autowired
    private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;

    @Autowired
    private ICoursePackageOrderService coursePackageOrderService;

    /**
     * 上/下架 1为上架 2为下架 3为删除
     *
@@ -290,7 +293,6 @@
        }
    }


    /**
     * 根据id获取课程数据
     *
@@ -497,14 +499,12 @@

    @PostMapping("/course/auditDiscount")
    public Boolean auditDiscount(@RequestBody AuditDiscount auditDiscount) {

        List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>()
                .eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId()));
        for (TCoursePackageDiscount tCoursePackageDiscount : list) {
            tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
            tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
        }

        return discountService.updateBatchById(list);
    }

@@ -522,8 +522,6 @@
            selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
            integerList.add(selectDto);
        }


        return integerList;
    }

@@ -534,25 +532,32 @@
        List<Integer> ids = queryDataFee.getIds();
        if (ids.size() == 0) {
            ids.add(-1);
        }else{
            List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", ids)
                    .ne("status", 4).eq("auditStatus", 2).eq("state", 1));
            ids = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
            if(ids.size() == 0){
                ids.add(-1);
            }
        }

        LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<CoursePackageOrder> wrapper = new LambdaQueryWrapper<>();
        if (ToolUtil.isNotEmpty(data)) {
            String stime = data.split(" - ")[0] + " 00:00:00";
            String etime = data.split(" - ")[1] + " 23:59:59";
            wrapper.between(TCoursePackagePayment::getInsertTime, stime, etime);
            wrapper.between(CoursePackageOrder::getInsertTime, stime, etime);
        }
        wrapper.in(TCoursePackagePayment::getAppUserId, ids);
        wrapper.eq(TCoursePackagePayment::getPayStatus, 2);
        wrapper.in(CoursePackageOrder::getCoursePackageId, ids);
        wrapper.eq(CoursePackageOrder::getPayStatus, 2);
        ArrayList<Integer> objects = new ArrayList<>();
        objects.add(1);
        objects.add(2);
        objects.add(5);
        objects.add(6);
        wrapper.in(TCoursePackagePayment::getPayType, objects);
        List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper);
        double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
        List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
        wrapper.in(CoursePackageOrder::getPayType, objects);
        List<CoursePackageOrder> list = coursePackageOrderService.list(wrapper);
        double v = list.stream().map(CoursePackageOrder::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
        List<Integer> collect = list.stream().map(CoursePackageOrder::getCoursePackageId).collect(Collectors.toList());
        if (collect.size() == 0) {
            collect.add(-1);
        }
@@ -561,7 +566,7 @@
        // 课类型
        List<TCoursePackageType> list1 = coursePackageTypeService.list();

        for (TCoursePackagePayment tCoursePackagePayment : list) {
        for (CoursePackageOrder tCoursePackagePayment : list) {
            for (TCoursePackage tCoursePackage : list2) {
                if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) {
                    tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
@@ -575,7 +580,7 @@
            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
            objectObjectHashMap.put("name", tCoursePackageType.getName());
            double a = 0;
            for (TCoursePackagePayment tCoursePackagePayment : list) {
            for (CoursePackageOrder tCoursePackagePayment : list) {
                if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) {
                    a += tCoursePackagePayment.getCashPayment().doubleValue();
                }