无关风月
2025-08-25 48d3f1b77adea0609bb2453c7b4a660f2222871f
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
@@ -122,15 +122,27 @@
        ServicePay one = servicePayService.lambdaQuery().eq(ServicePay::getPayStatus, 2)
                .eq(ServicePay::getUserId, userid).orderByDesc(ServicePay::getCreateTime)
                .last("limit 1").one();
        if (one!=null){
        ServicePay servicePayBefore = servicePayService.lambdaQuery()
                .eq(ServicePay::getUserId, userid)
                .eq(ServicePay::getPayStatus,2)
                .eq(ServicePay::getDelFlag,0)
                .orderByDesc(ServicePay::getCreateTime)
                .last("limit 1")
                .one();
        if (servicePayBefore==null){
            workPlatformVO.setServiceStatus(1);
            workPlatformVO.setEndTime(one.getEndTime());
        } else if (servicePayBefore.getEndTime().isBefore(LocalDateTime.now())) {
            workPlatformVO.setServiceStatus(2);
            workPlatformVO.setEndTime(servicePayBefore.getEndTime());
        }else{
            workPlatformVO.setServiceStatus(0);
            workPlatformVO.setEndTime(null);
            workPlatformVO.setServiceStatus(3);
            workPlatformVO.setEndTime(servicePayBefore.getEndTime());
        }
        return R.ok(workPlatformVO);
    }
    @PostMapping("/integralPageList")