合并代码

puzhibing

2024-12-17 bd02bce2ce2c492862787e7c6590fbd4d9e714e7

合并代码

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -116,12 +116,14 @@
     * 角色类型 1=平台 2=公司 3=门店 4=修理厂
     */
    @ApiModelProperty(value = "角色类型 1=平台 2=门店")
    @TableField("role_type")
    private Integer roleType;

    @Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
    private Date passWordUpdate;

    @ApiModelProperty(value = "对象ID")
    @TableField("objectId")
    private Integer objectId;

    @ApiModelProperty(value = "备注")

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -130,6 +130,9 @@
        if (loginUser == null) {
            throw new RuntimeException("令牌已过期，请重新登录！");
        }
        if(null == loginUser.getUserid()){
            loginUser.setUserid(loginUser.getSysUser().getUserId());
        }
        return loginUser;
    }
    

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java

@@ -149,6 +149,7 @@
    @ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
    @GetMapping("/manage/list")
    public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
        tokenService.getLoginUser();
        Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -269,12 +269,15 @@
        // 指定用户
        List<GoodsAppUser> goodsAppUserList = goodsAppUserService.list(new LambdaQueryWrapper<GoodsAppUser>()
                .eq(GoodsAppUser::getGoodsId, goodsId));
        List<Long> userIds = goodsAppUserList.stream().map(GoodsAppUser::getAppUserId).collect(Collectors.toList());
        List<AppUser> appUsers = appUserClient.listByIds(userIds);
        for (GoodsAppUser goodsAppUser : goodsAppUserList) {
            AppUser appUser = appUserClient.getAppUserById(goodsAppUser.getAppUserId());
            goodsAppUser.setUserName(appUser.getName());
            goodsAppUser.setPhone(appUser.getPhone());
            VipSetting vipSetting = vipSettingService.getById(appUser.getVipId());
            appUsers.stream().filter(u -> u.getId().equals(goodsAppUser.getAppUserId())).findFirst().ifPresent( u -> {
                goodsAppUser.setUserName(u.getName());
                goodsAppUser.setPhone(u.getPhone());
                VipSetting vipSetting = vipSettingService.getById(u.getVipId());
            goodsAppUser.setVipName(vipSetting.getVipName());
            });
        }

        goods.setGoodsAppUserList(goodsAppUserList);