From c634075944e32cb920686bfc83f09423f8aaf0b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:12:51 +0800
Subject: [PATCH] PC跳转小程序支付

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java
index 395d58b..b31d1bb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TServiceController.java
@@ -75,6 +75,27 @@
     private TServicePayService servicePayService;
     @Resource
     private SiteClient siteClient;
+    // 查询服务费缴纳情况
+    @GetMapping("/getServiceStatus/{userId}")
+    public R<String> getServiceStatus(@PathVariable("userId") Integer userId) {
+        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){
+            return R.ok("1");
+        }
+        else if (servicePayBefore.getEndTime().isBefore(LocalDateTime.now())) {
+            return R.ok("2");
+        }
+        else{
+            return R.ok("3");
+        }
+
+    }
     @PostMapping("/servicePageList")
     @ApiOperation(tags = {"2.0-服务费"},value = "服务费管理")
     public R<ServiceVO> integralPageList(@RequestBody ServiceListQuery query) {
@@ -87,6 +108,7 @@
         ServicePay servicePayBefore = servicePayService.lambdaQuery()
                 .eq(ServicePay::getUserId, userid)
                 .eq(ServicePay::getPayStatus,2)
+                .eq(ServicePay::getDelFlag,0)
                 .orderByDesc(ServicePay::getCreateTime)
                 .last("limit 1")
                 .one();

--
Gitblit v1.7.1