Merge remote-tracking branch 'origin/master'

xuhy

2026-03-02 70fab9b9607f18df92fc2c7c0efced0dcd55d5fc

 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()){
@@ -187,9 +187,16 @@
        LocalDate endTime = course.getEndTime();

        TOtherConfig config = otherConfigService.getById(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("请先缴纳保险费");
        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("请先缴纳保险费");
            }

        }

        if(course.getIsOpenCourse()==0){
            return R.fail("课程未开启缴费");
        }

        if(endTime.isBefore(LocalDate.now())){
@@ -230,9 +237,14 @@
        String userId = tokenService.getLoginUserApplet().getUserId();
        TCourseOrder courseOrder1 = courseOrderService.getById(courseOrder.getId());
        TCourse course = courseService.getById(courseOrder1.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);

@@ -284,6 +296,9 @@
        }else {
            String outRefundNo = OrderNos.getDid();
            courseOrder1.setRefundNumber(outRefundNo);
            courseOrder1.setBankCardNumber(courseOrder.getBankCardNumber());
            courseOrder1.setCardholderName(courseOrder.getCardholderName());
            courseOrder1.setBankName(courseOrder.getBankName());
            courseOrderService.updateById(courseOrder1);
//            WxPaymentRefundModel refundModel = new WxPaymentRefundModel();
////            refundModel.setSub_mchid(weixinPayProperties.getMchId());