From 10ad2e710d2bd52aac31d5d63a7bb6beae76b6a8 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 07 Nov 2023 14:35:32 +0800 Subject: [PATCH] 用户列表增加搜索条件 --- src/main/java/cc/mrbird/febs/mall/controller/ViewChatController.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 109 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewChatController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewChatController.java index cebaa2f..cdf3998 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewChatController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewChatController.java @@ -2,11 +2,18 @@ import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsConstant; +import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.utils.FebsUtil; +import cc.mrbird.febs.mall.dto.AdminBasicSettingDto; +import cc.mrbird.febs.mall.dto.CashOutSettingDto; +import cc.mrbird.febs.mall.entity.DataDictionary; +import cc.mrbird.febs.mall.entity.DataDictionaryCustom; +import cc.mrbird.febs.mall.entity.MallNewsInfo; import cc.mrbird.febs.mall.mapper.ChatUserMapper; +import cc.mrbird.febs.mall.mapper.DataDictionaryMapper; import cc.mrbird.febs.mall.service.IAdminMallMemberService; -import cc.mrbird.febs.mall.vo.AdminChatWalletVo; -import cc.mrbird.febs.mall.vo.MallMemberVo; +import cc.mrbird.febs.mall.vo.*; +import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; @@ -25,6 +32,9 @@ @Resource private ChatUserMapper chatUserMapper; + @Resource + private DataDictionaryMapper dataDictionaryMapper; + /** * 用户列表 * @return @@ -36,10 +46,31 @@ } /** - * 用户列表-系统拨付 - * @param userId + * 用户收益列表 + * @return + */ + @GetMapping("userPerkList") + @RequiresPermissions("userPerkList:view") + public String userPerkList() { + return FebsUtil.view("modules/chat/userPerkList"); + } + + /** + * 用户列表-新增会员 * @param model * @return + */ + @GetMapping("mallRegisterMember/{inviteId}") + @RequiresPermissions("mallRegisterMember:update") + public String mallRegisterMember(@PathVariable String inviteId, Model model) { + AdminRegisterMemberVo data = new AdminRegisterMemberVo(); + data.setInviteId(inviteId); + model.addAttribute("mallRegisterMember", data); + return FebsUtil.view("modules/chat/mallRegisterMember"); + } + + /** + * 用户列表-系统拨付 */ @GetMapping("mallSystemPay/{userId}") @RequiresPermissions("mallSystemPay:update") @@ -78,4 +109,78 @@ public String chatWithDrawList() { return FebsUtil.view("modules/chat/chatWithDrawList"); } + + /** + * 基础设置 + * @param model + * @return + */ + @GetMapping("basicSetting") + @RequiresPermissions("basicSetting:update") + public String cashOutSetting(Model model) { + AdminBasicSettingDto adminBasicSettingDto = new AdminBasicSettingDto(); + + DataDictionary modelTypeDic = chatUserMapper.selectDicDataByTypeAndCode( + DataDictionaryEnum.MODEL_TYPE.getType(), + DataDictionaryEnum.MODEL_TYPE.getCode()); + if (modelTypeDic != null) { + adminBasicSettingDto.setModelType(modelTypeDic.getValue()); + } + model.addAttribute("basicSet", adminBasicSettingDto); + return FebsUtil.view("modules/chat/basicSetting"); + } + + /** + * 群组管理 + * @return + */ + @GetMapping("groupList") + @RequiresPermissions("groupList:view") + public String groupList() { + return FebsUtil.view("modules/chat/groupList"); + } + + /** + * 版本管理 + * @return + */ + @GetMapping("versionList") + @RequiresPermissions("versionList:view") + public String versionList() { + return FebsUtil.view("modules/chat/versionList"); + } + + /** + * 群组管理-详情 + * @return + */ + @GetMapping("groupInfo/{id}") + @RequiresPermissions("editGroup:info") + public String groupInfo(@PathVariable long id, Model model) { + AdminGroupInfoVo data = chatUserMapper.getGroupInfoById(id); + model.addAttribute("groupInfo", data); + return FebsUtil.view("modules/chat/groupEdit"); + } + + /** + * 群组管理-详情 + * @return + */ + @GetMapping("versionInfo/{id}") + @RequiresPermissions("versionInfo:info") + public String versionInfo(@PathVariable long id, Model model) { + AdminVersionVo data = chatUserMapper.getVersionInfoById(id); + model.addAttribute("versionInfo", data); + return FebsUtil.view("modules/chat/versionEdit"); + } + + /** + * 红包列表 + * @return + */ + @GetMapping("redBagList") + @RequiresPermissions("redBagList:view") + public String redBagList() { + return FebsUtil.view("modules/chat/redBagList"); + } } -- Gitblit v1.9.1