From 4b42548bdeee0035497839403941d32fe13210c0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Oct 2023 11:10:56 +0800
Subject: [PATCH] 提现
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminChatServiceImpl.java | 1
src/main/java/cc/mrbird/febs/mall/vo/AdminRedBagVo.java | 5 ++
src/main/resources/templates/febs/views/modules/chat/chatWithDrawList.html | 1
src/main/java/cc/mrbird/febs/mall/vo/AdminChatWithDrawVo.java | 2 +
src/main/resources/templates/febs/views/modules/chat/redBagList.html | 24 ++++++++++++
src/main/resources/templates/febs/views/modules/chat/userPerkList.html | 22 +++++-----
src/main/resources/mapper/modules/ChatUserMapper.xml | 9 ++++
7 files changed, 53 insertions(+), 11 deletions(-)
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 514d840..38f2c51 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
@@ -315,6 +315,7 @@
@Override
public IPage<AdminRedBagVo> getRedBagList(ChatUser chatUser, QueryRequest request) {
Page<AdminRedBagVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ log.info("{}",chatUser.getIsRobot());
return this.baseMapper.selectRedBagListInPage(page, chatUser);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminChatWithDrawVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminChatWithDrawVo.java
index bb1864a..ca7f587 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminChatWithDrawVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminChatWithDrawVo.java
@@ -34,4 +34,6 @@
* 1:成功 2：失败 3：进行中
*/
private Integer state;
+
+ private String addressType;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminRedBagVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminRedBagVo.java
index fa77d3b..d58d0a3 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminRedBagVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminRedBagVo.java
@@ -50,4 +50,9 @@
private String msgType;
private String groupName;
+
+ /**
+ * 是否是机器人 0：否 1：是
+ */
+ private Integer isRobot;
}
diff --git a/src/main/resources/mapper/modules/ChatUserMapper.xml b/src/main/resources/mapper/modules/ChatUserMapper.xml
index 411497c..db8bda4 100644
--- a/src/main/resources/mapper/modules/ChatUserMapper.xml
+++ b/src/main/resources/mapper/modules/ChatUserMapper.xml
@@ -66,6 +66,7 @@
from chat_user a
left join chat_wallet b on b.user_id = a.user_id and b.type = 'USDT'
<where>
+ a.is_robot = 0
<if test="record.phone != null and record.phone != ''">
and a.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
</if>
@@ -184,6 +185,7 @@
(a.amount - a.fee) amount,
a.type type,
a.address address,
+ a.address_type addressType,
a.state state
from member_coin_withdraw a
left join chat_user b on b.user_id = a.user_id
@@ -312,6 +314,7 @@
select
a.*,
b.nick_name nickName,
+ b.is_robot isRobot,
c.name groupName
from chat_red_bag a
left join chat_user b on b.user_id = a.from_user_id
@@ -322,6 +325,12 @@
<if test="record.name != null and record.name != ''">
and c.name like CONCAT('%', CONCAT(#{record.name}, '%'))
</if>
+ <if test="record.nickName != null and record.nickName != ''">
+ and b.nick_name like CONCAT('%', CONCAT(#{record.nickName}, '%'))
+ </if>
+ <if test="record.isRobot != null">
+ and b.is_robot = #{record.isRobot}
+ </if>
</if>
</where>
order by a.create_time desc
diff --git a/src/main/resources/templates/febs/views/modules/chat/chatWithDrawList.html b/src/main/resources/templates/febs/views/modules/chat/chatWithDrawList.html
index c553ab7..7991778 100644
--- a/src/main/resources/templates/febs/views/modules/chat/chatWithDrawList.html
+++ b/src/main/resources/templates/febs/views/modules/chat/chatWithDrawList.html
@@ -161,6 +161,7 @@
{field: 'id', title: '', minWidth: 150,align:'center', totalRowText: '合计：',align:'center'},
{field: 'phone', title: '电话号码', minWidth: 150,align:'center'},
{field: 'nickName', title: '昵称', minWidth: 150,align:'center'},
+ {field: 'addressType', title: '公链', minWidth: 150,align:'center'},
{field: 'amount', title: '金额', minWidth: 100,align:'center',align:'center',totalRow: '{{= parseInt(d.amount) }}'},
{field: 'type', title: '类型',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/chat/redBagList.html b/src/main/resources/templates/febs/views/modules/chat/redBagList.html
index f1bee52..2f3f1de 100644
--- a/src/main/resources/templates/febs/views/modules/chat/redBagList.html
+++ b/src/main/resources/templates/febs/views/modules/chat/redBagList.html
@@ -12,6 +12,20 @@
<div class="layui-input-inline">
<input type="text" placeholder="群组名称" name="name" autocomplete="off" class="layui-input">
</div>
+
+ <label class="layui-form-label">发送方：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="发送方" name="nickName" autocomplete="off" class="layui-input">
+ </div>
+
+ <label class="layui-form-label">用户类型：</label>
+ <div class="layui-input-inline">
+ <select name="isRobot">
+ <option value="">请选择</option>
+ <option value="0">用户</option>
+ <option value="1">机器人</option>
+ </select>
+ </div>
</div>
</div>
</div>
@@ -61,6 +75,13 @@
<span>个人</span>
{{# } else { }}
<span>群聊</span>
+ {{# } }}
+</script>
+<script type="text/html" id="isRobot-type">
+ {{# if(d.isRobot == 1) { }}
+ <span class="layui-badge febs-bg-green">机器人</span>
+ {{# } else { }}
+ <span class="layui-badge febs-bg-blue">用户</span>
{{# } }}
</script>
<style>
@@ -121,6 +142,8 @@
function getQueryParams() {
return {
name: $searchForm.find('input[name="name"]').val().trim(),
+ nickName: $searchForm.find('input[name="nickName"]').val().trim(),
+ isRobot: $searchForm.find("select[name='isRobot']").val()
};
}
@@ -132,6 +155,7 @@
cols: [[
{field: 'id', title: '编号', minWidth: 100,align:'center'},
{field: 'nickName', title: '发送方', minWidth: 100,align:'center'},
+ {title: '用户类型', minWidth: 100,templet: '#isRobot-type',align:'center'},
{templet:"#isMsgType", title: '类型', minWidth: 100,align:'center'},
{field: 'groupName', title: '接收方', minWidth: 200,align:'center'},
{field: 'totalCnt', title: '红包总个数', minWidth: 100,align:'center'},
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 eeac505..26add41 100644
--- a/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
+++ b/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
@@ -25,16 +25,16 @@
<input type="text" placeholder="邀请码（获取团队下的所有成员）" name="inviteId" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">用户类型：</label>
- <div class="layui-input-inline">
- <select name="isRobot">
- <option value="">请选择</option>
- <option value="0">用户</option>
- <option value="1">机器人</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">用户类型：</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="isRobot">-->
+<!-- <option value="">请选择</option>-->
+<!-- <option value="0">用户</option>-->
+<!-- <option value="1">机器人</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -128,7 +128,7 @@
phone: $searchForm.find('input[name="phone"]').val().trim(),
// nickName: $searchForm.find('input[name="nickName"]').val().trim(),
inviteId: $searchForm.find('input[name="inviteId"]').val().trim(),
- isRobot: $searchForm.find("select[name='isRobot']").val()
+ // isRobot: $searchForm.find("select[name='isRobot']").val()
};
}
--
Gitblit v1.9.1