From 7693272d85e41ad3ea843ca2011311c8cf75ce9b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 11 九月 2025 09:03:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java
index 4b9c45c..0c373bf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java
@@ -24,6 +24,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.List;
@@ -129,6 +131,10 @@
// 订单信息
List<TSysOrderVO> sysOrders = sysOrderService.queryListByAppUserId(id);
sysAppUserVO.setSysOrders(sysOrders);
+ if(sysAppUserVO.getBirthTime() != null){
+ long age = ChronoUnit.YEARS.between(sysAppUserVO.getBirthTime(), LocalDateTime.now());
+ sysAppUserVO.setAge(age);
+ }
return R.ok(sysAppUserVO);
}
@@ -146,7 +152,7 @@
/**
* 查看用户管理详情
*/
- @ApiOperation(value = "查看用户管理详情")
+ @ApiOperation(value = "查看用户购药详情")
@GetMapping(value = "/getOrderByAppUserId")
public R<List<TSysOrderVO>> getOrderByAppUserId(@RequestParam String appUserId) {
List<TSysOrderVO> sysOrders = sysOrderService.queryListByAppUserId(appUserId);
@@ -174,7 +180,7 @@
}
/**
- * 批量删除用户管理
+ * 分公司管理解冻冻结
*/
@Log(title = "用户管理信息-分公司管理解冻冻结", businessType = BusinessType.UPDATE)
@ApiOperation(value = "分公司管理解冻冻结",notes = "状态 1=使用中 2=冻结")
--
Gitblit v1.7.1