From cc9ce86cc24c413c9cbd303b8bb4fd9f5ec5a30f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 10:04:53 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java | 11 +++++++++--
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 36 ++++++++++++++++++------------------
2 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java b/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java
index 36d7474..c773cc1 100644
--- a/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java
+++ b/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java
@@ -129,8 +129,10 @@
log.info("取消关注事件：toUserName{}、fromUserName{}", toUserName, fromUserName);
//取消关注则退出商城
MallMember mallMember = mallMemberMapper.selectMemberByOpenId(fromUserName);
- redisUtils.del(AppContants.XCX_LOGIN_PREFIX + mallMember.getId());
- redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + mallMember.getId());
+ if(ObjectUtil.isNotEmpty(mallMember)){
+ redisUtils.del(AppContants.XCX_LOGIN_PREFIX + mallMember.getId());
+ redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + mallMember.getId());
+ }
}else if ("SCAN".equals(eventType)) {
log.info("扫码关注事件：toUserName{}、fromUserName{}", toUserName, fromUserName);
if(map.containsKey("EventKey")){
@@ -147,6 +149,11 @@
agentProducer.sendMemberSubScanMsg(stringBuffer.toString());
}
}
+ }else if ("VIEW".equals(eventType)) {
+ /**
+ * 普通关注事件
+ */
+ agentProducer.sendMemberSubMsg(fromUserName);
}
}
return result;
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 668ab7c..775c27e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -100,17 +100,17 @@
background-color: #5FB878 !important;
}
</style>
-<!--<script type="text/html" id="toolbar">-->
-<!-- <div class="layui-btn-container">-->
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>-->
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>-->
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>-->
-<!-- </div>-->
-<!--</script>-->
+ </div>
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -254,20 +254,20 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
- // toolbar:"#toolbar",
+ toolbar:"#toolbar",
defaultToolbar:[],
cols: [[
- // {type: 'checkbox'},
+ {type: 'checkbox'},
{field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
{field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left'},
- // {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
+ {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
// {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
- // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
+ {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- {field: 'salesmansName', title: '推销员', minWidth: 100,align:'left'},
+ // {field: 'salesmansName', title: '推销员', minWidth: 100,align:'left'},
// {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
// {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
// {field: 'accountType', title: '账号类型',
@@ -294,13 +294,13 @@
// }, minWidth: 100,align:'center'},
// {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
- {title: '操作',
- templet: function (d) {
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentSelect" shiro:hasPermission="user:update">推销员设置</button>'
- // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
- // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
-
- },minWidth: 200,align:'center', fixed:"right"}
+ // {title: '操作',
+ // templet: function (d) {
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentSelect" shiro:hasPermission="user:update">推销员设置</button>'
+ // // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+ // // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
+ //
+ // },minWidth: 200,align:'center', fixed:"right"}
]]
});
}
--
Gitblit v1.9.1