From 34182c18b4bdd81ab7d59d4e8441cd9134477c15 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 13:40:21 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 5dc0c46..39e73d8 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -242,7 +242,7 @@
appUser.setTagName(byIdTag.getData().getName());
}
}
- if (appUser.getVipEndTime().isAfter(LocalDateTime.now())) {
+ if (appUser.getVipEndTime()!=null&&appUser.getVipEndTime().isAfter(LocalDateTime.now())) {
//匹配vipMap的值
appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
}
@@ -250,6 +250,12 @@
R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
appUser.setOrderCount(useOrderCount.getData());
appUser.setUid(appUser.getId().toString());
+ if (appUser.getCompanyId()!=null){
+ TCompany data = otherClient.unitDetail(appUser.getCompanyId()).getData();
+ if (data!=null){
+ appUser.setCompanyName(data.getName());
+ }
+ }
TAppUserCar one1 = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, appUser.getId()).orderByDesc(BasePojo::getCreateTime).last("limit 1").one();
if (one1!=null){
@@ -866,6 +872,10 @@
TAppUser byId = appUserService.getById(userId);
appUserCar.setAppUserId(userId);
+ //判断当前用户是否为vip
+
+
+
//如果是第一次添加车辆，增加积分
Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
--
Gitblit v1.7.1