From 0ef46975993c06e780ec4981d7535167673aa51d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 25 八月 2025 10:39:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
index d3a7922..ffcfde3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java
@@ -121,15 +121,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")
--
Gitblit v1.7.1