xuhy
2026-02-09 0b1ab182e629317016f93f6be8d61b0f39bdc500
Merge remote-tracking branch 'origin/master'
3个文件已修改
42 ■■■■■ 已修改文件
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/resources/application-test.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java
@@ -96,8 +96,8 @@
        Page<TCourseOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TCourseOrder> courseOrderPage = courseOrderService.page(page, Wrappers.<TCourseOrder>lambdaQuery()
                .eq(TCourseOrder::getAppUserId, userId)
                .ne(TCourseOrder::getPayStatus, 4)
                .eq(Objects.nonNull(query.getPayStatus()),TCourseOrder::getPayStatus, query.getPayStatus())
                .ne(TCourseOrder::getPayStatus, 4)
                .orderByDesc(TCourseOrder::getCreateTime));
        List<TCourseOrder> records = courseOrderPage.getRecords();
        if(!records.isEmpty()){
@@ -186,10 +186,17 @@
        TCourse course = courseService.getById(courseOrder.getCourseId());
        LocalDate endTime = course.getEndTime();
        TOtherConfig config = otherConfigService.getById(1);
        if(config.getIsOpenInsurance()==1){
            long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
            if(count1<=0){
                return R.fail("请先缴纳保险费");
            }
        long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
        if(count1<=0){
            return R.fail("请先缴纳保险费");
        }
        if(course.getIsOpenCourse()==0){
            return R.fail("课程未开启缴费");
        }
        if(endTime.isBefore(LocalDate.now())){
@@ -228,14 +235,19 @@
    @ApiOperation(value = "课程模块--支付订单")
    public R<Map<String, Object>> payOrder(@RequestBody TCourseOrder courseOrder) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
        TCourse course = courseService.getById(courseOrder1.getCourseId());
        TCourse course = courseService.getById(courseOrder.getCourseId());
        long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
        if(count1<=0){
            return R.fail("请先缴纳保险费");
        TOtherConfig config = otherConfigService.getById(1);
        if(config.getIsOpenInsurance()==1){
            long count1 = insuranceOrderService.count(new LambdaQueryWrapper<TInsuranceOrder>().eq(TInsuranceOrder::getType,course.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2));
            if(count1<=0){
                return R.fail("请先缴纳保险费");
            }
        }
        TAppUser appUser = appUserService.getById(userId);
        TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
//        if(!userId.equals(courseOrder1.getAppUserId())){
//            return R.fail("无权限操作");
//        }
ruoyi-applet/src/main/resources/application-test.yml
@@ -17,7 +17,7 @@
# 开发环境配置
server:
  # 服务器的HTTP端口,默认为8080
  port: 9100
  port: 9110
  servlet:
    # 应用的访问路径
    context-path: /
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -121,7 +121,15 @@
                        "/index/**",
                        "/employment/**",
                        "/partyBuilding/**",
                        "/convenience/**",
                        "/convenience/getServiceGuide",
                        "/convenience/getServiceGuideFile",
                        "/convenience/getConvenientInformationList",
                        "/convenience/getConvenientInformationDetail/**",
                        "/convenience/getMicroWishList",
                        "/convenience/getCommunityActivityList",
                        "/convenience/getCommunityActivityDetail/**",
                        "/convenience/getDeliberationVoteList",
                        "/convenience/getDeliberationVoteDetail/**",
                        "/merchant/**",
                        "/openIdByJsCode",
                        "/t-appeal-services/pageListLarge","/t-large-dept/list",