Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-14 c81d766cd91be3b3a24c8db94dcd93c071a66c62

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

@@ -53,14 +53,6 @@
    @Autowired
    private TCoursePackageDiscountService tcpdService;

    @Autowired
    private PostCourseVideoService pcvService;

    @Autowired
    private CoursePackageStudentService cpsService;

    @Autowired
    private CancelledClassesService cacService;

    @Autowired
    private ICoursePackagePaymentConfigService icppcService;
@@ -334,6 +326,15 @@
        return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
                .eq("appUserId",appUserId)
                .eq("payType",3)
                .eq("payStatus",2)
                .eq("state",1));
    }

    @PostMapping("/base/coursePack/allAmountPayRecordOfUser")
    public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody Integer appUserId){
        return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
                .eq("appUserId",appUserId)
                .notIn("payType",3)
                .eq("payStatus",2)
                .eq("state",1));
    }
@@ -680,4 +681,23 @@
        return packagePaymentService.save(packagePayment);
    }


    @PostMapping("/base/coursePack/obtainStudentClassDetails")
    public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody Integer stuId){
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            return packagePaymentService.obtainStuClassDetails(stuId,appUserId);
        }catch (Exception e){
            e.printStackTrace();
            throw new RuntimeException();
        }
    }


    @PostMapping("/base/coursePack/getCoursePackageConfig")
    public List<CoursePackagePaymentConfig> getCourseConfigList(@RequestBody Integer coursePackageId){
        return icppcService.list(new QueryWrapper<CoursePackagePaymentConfig>()
                .eq("coursePackageId",coursePackageId));
    }

}