From f4e12a183070e9fc1db174dfb7f1c9a59f7763a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 四月 2025 09:08:23 +0800
Subject: [PATCH] 新增加功能
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
index e9b1647..11a9218 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -11,6 +11,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.IInviteService;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import org.apache.commons.lang.time.DateUtils;
@@ -45,6 +46,9 @@
@Autowired
private ITUserService tUserService;
+
+ @Autowired
+ private ITDriverService driverService;
/**
* 跳转到用户管理首页
@@ -109,7 +113,7 @@
String nickName,
String phone,
Integer isAuth,
- Integer state,String companyName) {
+ Integer state,String companyName, String inviteUser) {
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(insertTime)){
@@ -118,7 +122,8 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> userList = tUserService.getUserList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), isAuth, state, id, nickName, phone, companyName);
+ List<Map<String, Object>> userList = tUserService.getUserList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), isAuth,
+ state, id, nickName, phone, companyName, inviteUser);
for (Map<String, Object> stringObjectMap : userList) {
String string = stringObjectMap.get("id").toString();
int i = inviteService.selectCount(new EntityWrapper<Invite>()
@@ -126,6 +131,17 @@
.eq("userType",1)
);
stringObjectMap.put("inviteNumber", i);
+ Invite invite = inviteService.selectOne(new EntityWrapper<Invite>().eq("userId", string));
+ if(null != invite){
+ String inviteUser1 = "";
+ if(1 == invite.getUserType()){
+ inviteUser1 = tUserService.selectById(invite.getInviteUserId()).getPhone();
+ }else{
+ inviteUser1 = driverService.selectById(invite.getInviteUserId()).getPhone();
+ }
+ stringObjectMap.put("inviteUser", inviteUser1);
+ }
+
}
page.setRecords(userList);
return super.packForBT(page);
@@ -544,6 +560,7 @@
shellList.add("紧急联系人电话");
shellList.add("是否实名认证");
shellList.add("历史出行次数");
+ shellList.add("邀请人");
shellList.add("邀请次数");
shellList.add("历史消费");
shellList.add("积分");
@@ -595,6 +612,11 @@
}else{
shellList.add("-");
}
+ if(SinataUtil.isNotEmpty(object.get("inviteUser"))){
+ shellList.add(object.get("inviteUser").toString());
+ }else{
+ shellList.add("-");
+ }
if(SinataUtil.isNotEmpty(object.get("inviteNumber"))){
shellList.add(object.get("inviteNumber").toString());
}else{
--
Gitblit v1.7.1