Merge remote-tracking branch 'origin/master'

xuhy

2025-12-31 ffef20d703aaa9b60c9234dd0b42f3d006426dc7

Merge remote-tracking branch 'origin/master'

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -87,7 +87,7 @@
        // 助需
        long helpNeedsCount = tHelpNeedsService.count();
        Map<String,Long> map = new HashMap<>();
        map.put("appealServicesCount",appealServicesCount);
        map.put("appealServicesCount",appealServicesCount+photoCount+appealCount+helpNeedsCount);
        map.put("warningCount",warningCount);
        map.put("photoCount",photoCount);
        map.put("appealCount",appealCount);

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java

@@ -142,6 +142,18 @@
        Integer type = order1.getType();


        String insuranceId = order1.getInsuranceId();

        TInsurance insurance = tInsuranceService.getById(insuranceId);
        if(insurance==null){
            return R.fail("保险已关闭，无法退款");
        }

        // 判断是否过期
        if(order1.getEndTime().before(new Date())){
            return R.fail("保险已过期，无法退款");
        }

        // 判断是否有当前的课程 待支付 和已完成
        int count = tCourseOrderService.countOrderNum( userId, type);
        if(count>0){