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/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 5b7cc2b..8a6e953 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,28 @@
private TServicePayService servicePayService;
@Resource
private SiteClient siteClient;
+ // 查询服务费缴纳情况
+ @GetMapping("/getServiceStatus/{userId}")
+ public R<String> getServiceStatus(@PathVariable("userId") Integer userId) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ 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) {
--
Gitblit v1.7.1