From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java
index cf5a89f..a2420f0 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java
@@ -119,7 +119,22 @@
public R<ServeDetailVO> serveDetail(@RequestParam String serveId) {
LoginUserInfo loginUser = tokenService.getLoginUserByUser();
if (null == loginUser) {
- return R.loginExpire("登录失效！");
+ RecoveryServe recoveryServe = recoveryServeService.lambdaQuery().eq(RecoveryServe::getId, serveId)
+ .eq(RecoveryServe::getIsDelete, 0).one();
+ recoveryServe.setIsCollect(Boolean.FALSE);
+
+ // 获取服务分类
+ Integer classifyId = recoveryServe.getClassifyId();
+ RecoveryClassify classify = recoveryClassifyService.lambdaQuery()
+ .eq(RecoveryClassify::getId, classifyId).one();
+ if (classify.getSupClassify().equals(Constants.TRADE_IN)) {
+ recoveryServe.setType(Constants.ZERO);
+ } else {
+ recoveryServe.setType(Constants.ONE);
+ }
+
+
+ return R.ok(new ServeDetailVO(recoveryServe, null));
}
RecoveryServe recoveryServe = recoveryServeService.lambdaQuery().eq(RecoveryServe::getId, serveId)
.eq(RecoveryServe::getIsDelete, 0).one();
@@ -146,7 +161,9 @@
UserRecipient userRecipient = userRecipientService.lambdaQuery()
.eq(UserRecipient::getIsDefault, Constants.ONE)
.eq(UserRecipient::getUserId, loginUser.getUserid())
- .eq(UserRecipient::getIsDelete, Constants.ZERO).one();
+ .eq(UserRecipient::getIsDelete, Constants.ZERO)
+ .last("limit 1")
+ .one();
return R.ok(new ServeDetailVO(recoveryServe, userRecipient));
}
--
Gitblit v1.7.1