新增加功能

Pu Zhibing

2025-04-17 f4e12a183070e9fc1db174dfb7f1c9a59f7763a1

 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,8 @@
        shellList.add("紧急联系人电话");
        shellList.add("是否实名认证");
        shellList.add("历史出行次数");
        shellList.add("邀请人");
        shellList.add("邀请次数");
        shellList.add("历史消费");
        shellList.add("积分");
        shellList.add("备注");
@@ -594,6 +612,16 @@
            }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{
                shellList.add("0");
            }
            if(SinataUtil.isNotEmpty(object.get("consumptionNum"))){
                shellList.add(object.get("consumptionNum").toString());
            }else{