From 0e7e1cfea951c7aee59a862c514e08a040523d9f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Oct 2023 16:12:29 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java | 2 +
src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java | 20 ++++++++++
src/main/java/cc/mrbird/febs/mall/vo/AdminChatUserPerkVo.java | 4 ++
src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java | 4 ++
src/main/java/cc/mrbird/febs/mall/entity/ChatUser.java | 4 ++
src/main/resources/templates/febs/views/modules/chat/userPerkList.html | 30 +++++++-------
src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java | 23 +++++++++++
src/main/resources/mapper/modules/ChatUserMapper.xml | 8 ++++
8 files changed, 80 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java
index 1463c85..fdea8f3 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminChatController.java
@@ -64,6 +64,29 @@
* @param userId
* @return
*/
+ @GetMapping("openSwitchGetBoom/{userId}")
+ @ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "操作失败")
+ public FebsResponse openSwitchGetBoom(@NotNull(message = "{required}") @PathVariable String userId) {
+ return iAdminChatService.openSwitchGetBoom(userId);
+ }
+ /**
+ * 用户列表---关闭
+ *
+ * @param userId
+ * @return
+ */
+ @GetMapping("closeSwitchGetBoom/{userId}")
+ @ControllerEndpoint(operation = "会员列表---关闭", exceptionMessage = "操作失败")
+ public FebsResponse closeSwitchGetBoom(@NotNull(message = "{required}") @PathVariable String userId) {
+ return iAdminChatService.closeSwitchGetBoom(userId);
+ }
+
+ /**
+ * 用户列表---开启
+ *
+ * @param userId
+ * @return
+ */
@GetMapping("openCreateGroup/{userId}")
@ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "操作失败")
public FebsResponse openCreateGroup(@NotNull(message = "{required}") @PathVariable String userId) {
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/ChatUser.java b/src/main/java/cc/mrbird/febs/mall/entity/ChatUser.java
index 29a2c33..43df6c4 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/ChatUser.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/ChatUser.java
@@ -132,6 +132,10 @@
* 是否允许创建群聊 1:可以 0:不可以
*/
private Integer createGroup;
+ /**
+ * 是否中雷 1:是 0:否
+ */
+ private Integer getBoom;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java
index 81a0749..7deec75 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/ChatUserMapper.java
@@ -78,4 +78,6 @@
void updateOverdueStatusById(@Param("overdueState")Integer overdueState, @Param("id")Long id);
void updatePortraitById(@Param("userId")Long userId, @Param("portrait")String portrait);
+
+ void updateGetBoomByUserId(@Param("userId")String userId, @Param("getBoom")int i);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java
index 3401bf7..e5a0249 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminChatService.java
@@ -65,4 +65,8 @@
FebsResponse openCreateGroup(String userId);
FebsResponse closeCreateGroup(String userId);
+
+ FebsResponse openSwitchGetBoom(String userId);
+
+ FebsResponse closeSwitchGetBoom(String userId);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
index 7a2eff1..67a2862 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java
@@ -329,4 +329,24 @@
this.baseMapper.updateCreateGroupByUserId(userId,0);
return new FebsResponse().success();
}
+
+ @Override
+ public FebsResponse openSwitchGetBoom(String userId) {
+ ChatUser chatUser = this.baseMapper.selectByUserId(userId);
+ if(ObjectUtil.isEmpty(chatUser)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ this.baseMapper.updateGetBoomByUserId(userId,1);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse closeSwitchGetBoom(String userId) {
+ ChatUser chatUser = this.baseMapper.selectByUserId(userId);
+ if(ObjectUtil.isEmpty(chatUser)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ this.baseMapper.updateGetBoomByUserId(userId,0);
+ return new FebsResponse().success();
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminChatUserPerkVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminChatUserPerkVo.java
index 055575c..b516b1c 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminChatUserPerkVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminChatUserPerkVo.java
@@ -43,6 +43,10 @@
* 是否是机器人 0:否 1:是
*/
private Integer isRobot;
+ /**
+ * 是否中雷 1:是 0:否
+ */
+ private Integer getBoom;
/**
* 发红包个数
diff --git a/src/main/resources/mapper/modules/ChatUserMapper.xml b/src/main/resources/mapper/modules/ChatUserMapper.xml
index 514c666..c7c4d86 100644
--- a/src/main/resources/mapper/modules/ChatUserMapper.xml
+++ b/src/main/resources/mapper/modules/ChatUserMapper.xml
@@ -43,6 +43,7 @@
a.user_id userId,
a.nick_name nickName,
a.chat_no chatNo,
+ a.get_boom getBoom,
a.phone phone,
a.invite_id inviteId,
a.is_robot isRobot,
@@ -400,5 +401,12 @@
where user_id = #{userId}
</update>
+ <update id="updateGetBoomByUserId">
+ update chat_user
+ set
+ get_boom = #{getBoom}
+ where user_id = #{userId}
+ </update>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/chat/userPerkList.html b/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
index c080d04..2f30f11 100644
--- a/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
+++ b/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
@@ -61,13 +61,13 @@
<a lay-event="edit" shiro:hasPermission="user:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
-<!--<script type="text/html" id="switchIsRobot">-->
-<!-- {{# if(d.isRobot === 1) { }}-->
-<!-- <input type="checkbox" value={{d.userId}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchIsRobot">-->
-<!-- {{# } else { }}-->
-<!-- <input type="checkbox" value={{d.userId}} lay-text="是|否" lay-skin="switch" lay-filter="switchIsRobot">-->
-<!-- {{# } }}-->
-<!--</script>-->
+<script type="text/html" id="switchGetBoom">
+ {{# if(d.getBoom === 1) { }}
+ <input type="checkbox" value={{d.userId}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchGetBoom">
+ {{# } else { }}
+ <input type="checkbox" value={{d.userId}} lay-text="是|否" lay-skin="switch" lay-filter="switchGetBoom">
+ {{# } }}
+</script>
<style>
.layui-form-onswitch {
background-color: #5FB878 !important;
@@ -145,7 +145,7 @@
{field: 'groupRedBagNum', title: '群红包数', minWidth: 80,align:'left'},
{field: 'redBagTotalAmount', title: '红包总额', minWidth: 80,align:'left'},
{field: 'redBagAvaAmount', title: '未领取', minWidth: 80,align:'left'},
- // {field: 'isRobot', title: '机器人', templet: '#switchIsRobot', minWidth: 80,align:'center'},
+ {field: 'getBoom', title: '中雷', templet: '#switchGetBoom', minWidth: 80,align:'center'},
{field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
]]
});
@@ -213,21 +213,21 @@
});
}
- form.on('switch(switchIsRobot)', function (data) {
+ form.on('switch(switchGetBoom)', function (data) {
if (data.elem.checked) {
- openSwitchIsRobot(data.value);
+ openSwitchGetBoom(data.value);
} else {
- closeSwitchIsRobot(data.value);
+ closeSwitchGetBoom(data.value);
}
})
- function openSwitchIsRobot(userId) {
- febs.get(ctx + 'admin/chat/openSwitchIsRobot/' + userId, null, function () {
+ function openSwitchGetBoom(userId) {
+ febs.get(ctx + 'admin/chat/openSwitchGetBoom/' + userId, null, function () {
febs.alert.success('操作成功');
$reset.click();
});
}
- function closeSwitchIsRobot(userId) {
- febs.get(ctx + 'admin/chat/closeSwitchIsRobot/' + userId, null, function () {
+ function closeSwitchGetBoom(userId) {
+ febs.get(ctx + 'admin/chat/closeSwitchGetBoom/' + userId, null, function () {
febs.alert.success('操作成功');
$reset.click();
});
--
Gitblit v1.9.1