消息通知功能完善
This commit is contained in:
@@ -22,3 +22,11 @@ insert into sys_message values
|
|||||||
(4,341,'云链助手','该施肥了','春天已经至,已到施肥时间。。',now(),now(),0,1);
|
(4,341,'云链助手','该施肥了','春天已经至,已到施肥时间。。',now(),now(),0,1);
|
||||||
|
|
||||||
SELECT id,user_id,code,params,content,ctime,utime,status FROM sys_message WHERE user_id = 341 ORDER BY ctime desc
|
SELECT id,user_id,code,params,content,ctime,utime,status FROM sys_message WHERE user_id = 341 ORDER BY ctime desc
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE mallplus1.sys_message MODIFY COLUMN id int(10) unsigned auto_increment NOT NULL;
|
||||||
|
ALTER TABLE mallplus1.sys_message MODIFY COLUMN status tinyint(3) unsigned DEFAULT 0 NOT NULL COMMENT '0未查看,1已查看';
|
||||||
|
ALTER TABLE mallplus1.sys_message MODIFY COLUMN utime bigint(20) unsigned NULL COMMENT '查看时间';
|
||||||
|
ALTER TABLE mallplus1.sys_message MODIFY COLUMN content text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容';
|
||||||
|
ALTER TABLE mallplus1.sys_message MODIFY COLUMN params varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数';
|
||||||
|
ALTER TABLE mallplus1.sys_message MODIFY COLUMN code varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息编码';
|
||||||
|
|||||||
BIN
docs/images/icon物流.png
Normal file
BIN
docs/images/icon物流.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
@@ -1,7 +1,18 @@
|
|||||||
package com.zscat.mallplus.ums.controller;
|
package com.zscat.mallplus.ums.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import com.zscat.mallplus.annotation.SysLog;
|
||||||
|
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||||
|
import com.zscat.mallplus.ums.entity.UmsMember;
|
||||||
import com.zscat.mallplus.ums.service.ISysMessageService;
|
import com.zscat.mallplus.ums.service.ISysMessageService;
|
||||||
|
import com.zscat.mallplus.ums.vo.SysMessageSendSelectVo;
|
||||||
|
import com.zscat.mallplus.utils.CommonResult;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@@ -19,8 +30,49 @@ import javax.annotation.Resource;
|
|||||||
@RequestMapping("/ums/sysMessage")
|
@RequestMapping("/ums/sysMessage")
|
||||||
public class SysMessageController {
|
public class SysMessageController {
|
||||||
|
|
||||||
|
private static final Logger log = LoggerFactory.getLogger(SysMessageController.class);
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private ISysMessageService messageService;
|
private ISysMessageService messageService;
|
||||||
|
|
||||||
|
@PostMapping(value = "/sendToOne")
|
||||||
|
public Object sendToOne(@RequestBody SysMessage entity) {
|
||||||
|
try {
|
||||||
|
if (messageService.sendToOne(entity)) {
|
||||||
|
return new CommonResult().success();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("向指定会员 {} 发信息失败:{}", entity.getUserId(), e.getMessage());
|
||||||
|
return new CommonResult().failed();
|
||||||
|
}
|
||||||
|
return new CommonResult().failed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping(value = "/sendToAll")
|
||||||
|
public Object sendToAll(@RequestBody SysMessage entity) {
|
||||||
|
try {
|
||||||
|
if (messageService.sendToAll(entity)) {
|
||||||
|
return new CommonResult().success();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("向所有会员发信息失败:{}", e.getMessage());
|
||||||
|
return new CommonResult().failed();
|
||||||
|
}
|
||||||
|
return new CommonResult().failed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping(value = "/sendToSelect")
|
||||||
|
public Object sendToSelect(@RequestBody SysMessageSendSelectVo vo) {
|
||||||
|
try {
|
||||||
|
if (messageService.sendToSelect(vo)) {
|
||||||
|
return new CommonResult().success();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("向所选会员发信息失败:{}", e.getMessage());
|
||||||
|
return new CommonResult().failed();
|
||||||
|
}
|
||||||
|
return new CommonResult().failed();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ public class UmsMemberController {
|
|||||||
@SysLog(MODULE = "ums", REMARK = "删除会员表")
|
@SysLog(MODULE = "ums", REMARK = "删除会员表")
|
||||||
@ApiOperation("删除会员表")
|
@ApiOperation("删除会员表")
|
||||||
@GetMapping(value = "/delete/{id}")
|
@GetMapping(value = "/delete/{id}")
|
||||||
@PreAuthorize("hasAuthority('ums:UmsMember:delete')")
|
// @PreAuthorize("hasAuthority('ums:UmsMember:delete')")
|
||||||
public Object deleteUmsMember(@ApiParam("会员表id") @PathVariable Long id) {
|
public Object deleteUmsMember(@ApiParam("会员表id") @PathVariable Long id) {
|
||||||
try {
|
try {
|
||||||
if (ValidatorUtils.empty(id)) {
|
if (ValidatorUtils.empty(id)) {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.zscat.mallplus.ums.service;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.zscat.mallplus.ums.entity.SysMessage;
|
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||||
|
import com.zscat.mallplus.ums.vo.SysMessageSendSelectVo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
@@ -13,4 +14,11 @@ import com.zscat.mallplus.ums.entity.SysMessage;
|
|||||||
*/
|
*/
|
||||||
public interface ISysMessageService extends IService<SysMessage> {
|
public interface ISysMessageService extends IService<SysMessage> {
|
||||||
|
|
||||||
|
boolean sendToOne(SysMessage entity);
|
||||||
|
|
||||||
|
boolean sendToAll(SysMessage entity);
|
||||||
|
|
||||||
|
boolean sendToSelect(SysMessageSendSelectVo vo);
|
||||||
|
|
||||||
|
boolean sendOrderDeliver(String orderNo,Integer userId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
import com.zscat.mallplus.ums.entity.UmsMember;
|
import com.zscat.mallplus.ums.entity.UmsMember;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -19,4 +20,6 @@ public interface IUmsMemberService extends IService<UmsMember> {
|
|||||||
void updataMemberOrderInfo();
|
void updataMemberOrderInfo();
|
||||||
|
|
||||||
Map memberMonthStatic( String date);
|
Map memberMonthStatic( String date);
|
||||||
|
|
||||||
|
List<UmsMember> listAll();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,17 @@ package com.zscat.mallplus.ums.service.impl;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.zscat.mallplus.ums.entity.SysMessage;
|
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||||
|
import com.zscat.mallplus.ums.entity.UmsMember;
|
||||||
import com.zscat.mallplus.ums.mapper.SysMessageMapper;
|
import com.zscat.mallplus.ums.mapper.SysMessageMapper;
|
||||||
import com.zscat.mallplus.ums.service.ISysMessageService;
|
import com.zscat.mallplus.ums.service.ISysMessageService;
|
||||||
|
import com.zscat.mallplus.ums.service.IUmsMemberService;
|
||||||
|
import com.zscat.mallplus.ums.vo.SysMessageSendSelectVo;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 站内信 服务实现类
|
* 站内信 服务实现类
|
||||||
@@ -17,4 +24,51 @@ import org.springframework.stereotype.Service;
|
|||||||
@Service
|
@Service
|
||||||
public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
|
public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IUmsMemberService memberService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean sendToOne(SysMessage entity) {
|
||||||
|
entity.setId(null);
|
||||||
|
return this.save(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean sendToAll(SysMessage entity) {
|
||||||
|
List<UmsMember> memberList = memberService.listAll();
|
||||||
|
// List<SysMessage> messList = new ArrayList<>();
|
||||||
|
for (UmsMember member : memberList) {
|
||||||
|
// SysMessage
|
||||||
|
entity.setId(null);
|
||||||
|
Integer id = Math.toIntExact(member.getId());
|
||||||
|
entity.setUserId(id);
|
||||||
|
// messList.add(en)
|
||||||
|
this.save(entity);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean sendToSelect(SysMessageSendSelectVo vo) {
|
||||||
|
SysMessage entity = vo.getSysMessage();
|
||||||
|
List<Integer> userIdList = vo.getUserIdList();
|
||||||
|
for (Integer memberId : userIdList) {
|
||||||
|
entity.setId(null);
|
||||||
|
entity.setUserId(memberId);
|
||||||
|
this.save(entity);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean sendOrderDeliver(String orderNo, Integer userId) {
|
||||||
|
SysMessage entity = new SysMessage();
|
||||||
|
entity.setId(null);
|
||||||
|
entity.setCode("交易物流");
|
||||||
|
entity.setParams("货物已发出");
|
||||||
|
entity.setContent("你的订单号码为:"+orderNo+" 的货物已经发出,请您留意物流信息!");
|
||||||
|
entity.setUserId(userId);
|
||||||
|
this.save(entity);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,4 +58,9 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
|
|||||||
public Map memberMonthStatic(@Param("date") String date){
|
public Map memberMonthStatic(@Param("date") String date){
|
||||||
return memberMapper.memberMonthStatic(date);
|
return memberMapper.memberMonthStatic(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<UmsMember> listAll() {
|
||||||
|
return baseMapper.selectList(new QueryWrapper<UmsMember>());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package com.zscat.mallplus.ums.vo;
|
||||||
|
|
||||||
|
import com.zscat.mallplus.ums.entity.SysMessage;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class SysMessageSendSelectVo {
|
||||||
|
|
||||||
|
private List<Integer> userIdList = new ArrayList<>();
|
||||||
|
|
||||||
|
private SysMessage sysMessage;
|
||||||
|
|
||||||
|
public List<Integer> getUserIdList() {
|
||||||
|
return userIdList;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserIdList(List<Integer> userIdList) {
|
||||||
|
this.userIdList = userIdList;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SysMessage getSysMessage() {
|
||||||
|
return sysMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSysMessage(SysMessage sysMessage) {
|
||||||
|
this.sysMessage = sysMessage;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@ spring.redis.host=127.0.0.1
|
|||||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
|
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
|
||||||
spring.redis.port=6379
|
spring.redis.port=6379
|
||||||
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
|
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
|
||||||
spring.redis.password=123456
|
spring.redis.password=
|
||||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||||
spring.redis.pool.max-active=8
|
spring.redis.pool.max-active=8
|
||||||
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public class SysMessage implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
private Long ctime;
|
private Long ctime = System.currentTimeMillis();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查看时间
|
* 查看时间
|
||||||
@@ -62,7 +62,7 @@ public class SysMessage implements Serializable {
|
|||||||
private Boolean status = false;
|
private Boolean status = false;
|
||||||
|
|
||||||
public String getCdate() {
|
public String getCdate() {
|
||||||
cdate = "";
|
String cdate = "";
|
||||||
if (ctime != null && ctime > 0) {
|
if (ctime != null && ctime > 0) {
|
||||||
cdate = DateUtil.format(new Date(ctime), "yyyy-MM-dd");
|
cdate = DateUtil.format(new Date(ctime), "yyyy-MM-dd");
|
||||||
}
|
}
|
||||||
@@ -70,17 +70,17 @@ public class SysMessage implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getUdate() {
|
public String getUdate() {
|
||||||
udate = "";
|
String udate = "";
|
||||||
if (utime != null && utime > 0) {
|
if (utime != null && utime > 0) {
|
||||||
udate = DateUtil.format(new Date(utime), "yyyy-MM-dd");
|
udate = DateUtil.format(new Date(utime), "yyyy-MM-dd");
|
||||||
}
|
}
|
||||||
return udate;
|
return udate;
|
||||||
}
|
}
|
||||||
|
|
||||||
@TableField(exist = false)
|
// @TableField(exist = false)
|
||||||
private String cdate;
|
// private String cdate;
|
||||||
@TableField(exist = false)
|
// @TableField(exist = false)
|
||||||
private String udate;
|
// private String udate;
|
||||||
|
|
||||||
|
|
||||||
public Integer getId() {
|
public Integer getId() {
|
||||||
|
|||||||
@@ -4,6 +4,6 @@ const prodEnv = require('./prod.env')
|
|||||||
|
|
||||||
module.exports = merge(prodEnv, {
|
module.exports = merge(prodEnv, {
|
||||||
NODE_ENV: '"development"',
|
NODE_ENV: '"development"',
|
||||||
BASE_API: '"http://mall.yyundong.com/adminapi"',
|
// BASE_API: '"http://mall.yyundong.com/adminapi"',
|
||||||
// BASE_API: '"http://127.0.0.1:8085"'
|
BASE_API: '"http://127.0.0.1:8085"'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,80 +1,22 @@
|
|||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
export function fetchList(params) {
|
|
||||||
|
export function sendToOne(data) {
|
||||||
return request({
|
return request({
|
||||||
url:'/ums/UmsMember/list',
|
url:'/ums/sysMessage/sendToOne',
|
||||||
method:'get',
|
|
||||||
params:params
|
|
||||||
})
|
|
||||||
}
|
|
||||||
export function createMember(data) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/create',
|
|
||||||
method:'post',
|
method:'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
export function updateShowStatus(data) {
|
export function sendToAll(data) {
|
||||||
return request({
|
return request({
|
||||||
url:'/ums/UmsMember/update/showStatus',
|
url:'/ums/sysMessage/sendToAll',
|
||||||
method:'post',
|
method:'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
export function sendToSelect(data) {
|
||||||
export function updateFactoryStatus(data) {
|
|
||||||
return request({
|
return request({
|
||||||
url:'/ums/UmsMember/update/factoryStatus',
|
url:'/ums/sysMessage/sendToSelect',
|
||||||
method:'post',
|
|
||||||
data:data
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function deleteMember(id) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/delete/'+id,
|
|
||||||
method:'get',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getMember(id) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/'+id,
|
|
||||||
method:'get',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function updateMember(data) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/update',
|
|
||||||
method:'post',
|
|
||||||
data:data
|
|
||||||
})
|
|
||||||
}
|
|
||||||
export function updateMemberOrderInfo() {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/updateMemberOrderInfo',
|
|
||||||
method:'post'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function fetchBlanceList(id) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/fetchBlanceList/'+id,
|
|
||||||
method:'get',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function handleEditBlance(data) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/handleEditBlance',
|
|
||||||
method:'post',
|
|
||||||
data:data
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function handleEditIntegration(data) {
|
|
||||||
return request({
|
|
||||||
url:'/ums/UmsMember/handleEditIntegration',
|
|
||||||
method:'post',
|
method:'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ a:hover {
|
|||||||
|
|
||||||
.operate-container .btn-add {
|
.operate-container .btn-add {
|
||||||
float: right;
|
float: right;
|
||||||
|
margin-left: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
//表格栏样式
|
//表格栏样式
|
||||||
|
|||||||
@@ -16,18 +16,20 @@
|
|||||||
<el-card class="operate-container" shadow="never">
|
<el-card class="operate-container" shadow="never">
|
||||||
<i class="el-icon-tickets"></i>
|
<i class="el-icon-tickets"></i>
|
||||||
<span>数据列表</span>
|
<span>数据列表</span>
|
||||||
<!-- <el-button
|
<el-button
|
||||||
|
type="primary"
|
||||||
class="btn-add"
|
class="btn-add"
|
||||||
@click="addSubject()"
|
@click="sendMessageToAll()"
|
||||||
size="mini">
|
size="mini">
|
||||||
发送全员信息
|
发送全员信息
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
|
type="primary"
|
||||||
class="btn-add"
|
class="btn-add"
|
||||||
@click="addSubject()"
|
@click="sendMessageToSelect()"
|
||||||
size="mini">
|
size="mini">
|
||||||
向选择全员发送信息
|
向选择会员发送信息
|
||||||
</el-button> -->
|
</el-button>
|
||||||
</el-card>
|
</el-card>
|
||||||
<div class="table-container">
|
<div class="table-container">
|
||||||
<el-table ref="brandTable" :data="list" style="width: 100%" @selection-change="handleSelectionChange" v-loading="listLoading" border>
|
<el-table ref="brandTable" :data="list" style="width: 100%" @selection-change="handleSelectionChange" v-loading="listLoading" border>
|
||||||
@@ -91,7 +93,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="250" align="center">
|
<el-table-column label="操作" width="250" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button size="mini" type="danger" @click="sendMessageToOne(scope.$index, scope.row)">发送信息</el-button>
|
<el-button size="mini" type="primary" @click="sendMessageToOne(scope.$index, scope.row)">发送信息</el-button>
|
||||||
<el-button size="mini" type="danger" @click="addBlacne(scope.$index, scope.row)">余额充值</el-button>
|
<el-button size="mini" type="danger" @click="addBlacne(scope.$index, scope.row)">余额充值</el-button>
|
||||||
<!-- <el-button size="mini" type="danger" @click="addIntegration(scope.$index, scope.row)">积分充值</el-button> -->
|
<!-- <el-button size="mini" type="danger" @click="addIntegration(scope.$index, scope.row)">积分充值</el-button> -->
|
||||||
<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
|
<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
|
||||||
@@ -203,17 +205,55 @@
|
|||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog title="向指定会员发送信息" :visible.sync="dialogVisibleMessOne" width="40%">
|
<el-dialog title="向指定会员发送信息" :visible.sync="dialogVisibleMessOne" width="40%">
|
||||||
<el-form :model="msgOne" ref="msgOneFrom" label-width="150px">
|
<el-form :model="msgOne" :rules="msgOneRules" ref="msgOneFrom" label-width="150px" >
|
||||||
<el-form-item label="消息类型:" prop="code">
|
<el-form-item label="会员:">向账号为 {{msgOne.membername}} 的会员发送信息</el-form-item>
|
||||||
|
<el-form-item label="信息类型:" prop="code">
|
||||||
<el-select v-model="msgOne.code" placeholder="请选择">
|
<el-select v-model="msgOne.code" placeholder="请选择">
|
||||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
<el-option v-for="item in messageCodeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="充值积分:" prop="detail"><el-input v-model="integration.integration"></el-input></el-form-item>
|
<el-form-item label="标题:" prop="params"><el-input v-model="msgOne.params"></el-input></el-form-item>
|
||||||
|
<el-form-item label="信息内容:" prop="content"><el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input></el-form-item>
|
||||||
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button @click="integration.dialogVisible = false">取 消</el-button>
|
<el-button @click="sendMessageToOneReset">取 消</el-button>
|
||||||
<el-button type="primary" @click="handleEditIntegration">确 定</el-button>
|
<el-button type="primary" @click="sendMessageToOneSubmit">确 定</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-dialog title="向选择会员发送信息" :visible.sync="dialogVisibleMessSelect" width="40%">
|
||||||
|
<el-form :model="msgOne" :rules="msgOneRules" ref="msgSelectFrom" label-width="150px" >
|
||||||
|
<el-form-item label=""> 向所选择的会员发送信息!</el-form-item>
|
||||||
|
<el-form-item label="信息类型:" prop="code">
|
||||||
|
<el-select v-model="msgOne.code" placeholder="请选择">
|
||||||
|
<el-option v-for="item in messageCodeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标题:" prop="params"><el-input v-model="msgOne.params"></el-input></el-form-item>
|
||||||
|
<el-form-item label="信息内容:" prop="content"><el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input></el-form-item>
|
||||||
|
|
||||||
|
<el-form-item>
|
||||||
|
<el-button @click="sendMessageToSelectReset">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="sendMessageToSelectSubmit">确 定</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-dialog title="向所有会员发送信息" :visible.sync="dialogVisibleMessAll" width="40%">
|
||||||
|
<el-form :model="msgOne" :rules="msgOneRules" ref="msgAllFrom" label-width="150px" >
|
||||||
|
<el-form-item label=""> 向所有的会员发送信息!</el-form-item>
|
||||||
|
<el-form-item label="信息类型:" prop="code">
|
||||||
|
<el-select v-model="msgOne.code" placeholder="请选择">
|
||||||
|
<el-option v-for="item in messageCodeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标题:" prop="params"><el-input v-model="msgOne.params"></el-input></el-form-item>
|
||||||
|
<el-form-item label="信息内容:" prop="content"><el-input type="textarea" :rows="3" v-model="msgOne.content"></el-input></el-form-item>
|
||||||
|
|
||||||
|
<el-form-item>
|
||||||
|
<el-button @click="sendMessageToAllReset">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="sendMessageToAllSubmit">确 定</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@@ -224,6 +264,7 @@ import { formatDate } from '@/utils/date'
|
|||||||
import { fetchList, updateShowStatus, updateFactoryStatus, deleteMember, updateMemberOrderInfo, handleEditIntegration, handleEditBlance } from '@/api/ums/member'
|
import { fetchList, updateShowStatus, updateFactoryStatus, deleteMember, updateMemberOrderInfo, handleEditIntegration, handleEditBlance } from '@/api/ums/member'
|
||||||
import { fetchList as fetchBlanceList } from '@/api/ums/memberBlanceLog'
|
import { fetchList as fetchBlanceList } from '@/api/ums/memberBlanceLog'
|
||||||
import { fetchList as fetchIntegrationList } from '@/api/ums/memberIntegration'
|
import { fetchList as fetchIntegrationList } from '@/api/ums/memberIntegration'
|
||||||
|
import { sendToOne, sendToAll, sendToSelect } from '@/api/ums/sysMessage'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'memberList',
|
name: 'memberList',
|
||||||
@@ -241,9 +282,23 @@ export default {
|
|||||||
userId:null,
|
userId:null,
|
||||||
code:'',
|
code:'',
|
||||||
params:'',
|
params:'',
|
||||||
content:''
|
content:'',
|
||||||
|
membername:''
|
||||||
|
},
|
||||||
|
msgOneRules: {
|
||||||
|
code: [{required: true, message: '请选择信息类型', trigger: 'blur'}],
|
||||||
|
params: [ {required: true, message: '请输入信息标题', trigger: 'blur'} ],
|
||||||
|
content: [ {required: true, message: '信息内容不能为空', trigger: 'blur'}]
|
||||||
},
|
},
|
||||||
dialogVisibleMessSelect: false,
|
dialogVisibleMessSelect: false,
|
||||||
|
msgSelect:{
|
||||||
|
userIdList:[],
|
||||||
|
sysMessage:{
|
||||||
|
code:'',
|
||||||
|
params:'',
|
||||||
|
content:''
|
||||||
|
}
|
||||||
|
},
|
||||||
dialogVisibleMessAll: false,
|
dialogVisibleMessAll: false,
|
||||||
dialogVisible: false,
|
dialogVisible: false,
|
||||||
dialogVisible1: false,
|
dialogVisible1: false,
|
||||||
@@ -342,7 +397,138 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
sendMessageToOne(index,row){
|
sendMessageToOne(index,row){
|
||||||
|
this.msgOne.userId=row.id
|
||||||
|
this.msgOne.code='云链助手'
|
||||||
|
this.msgOne.params=''
|
||||||
|
this.msgOne.content=''
|
||||||
|
this.msgOne.membername=row.username
|
||||||
|
this.dialogVisibleMessOne = true
|
||||||
|
},
|
||||||
|
sendMessageToOneSubmit(index,row){
|
||||||
|
let _this = this
|
||||||
|
this.$refs['msgOneFrom'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
sendToOne(_this.msgOne).then(response => {
|
||||||
|
this.$message({
|
||||||
|
message: '信息发送成功',
|
||||||
|
type: 'success',
|
||||||
|
duration:1000
|
||||||
|
});
|
||||||
|
_this.sendMessageToOneReset()
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
_this.$message({
|
||||||
|
message: '请输入正确的数据',
|
||||||
|
type: 'error',
|
||||||
|
duration:1000
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
sendMessageToOneReset(){
|
||||||
|
this.$refs['msgOneFrom'].resetFields();
|
||||||
|
this.msgOne.userId=null
|
||||||
|
this.msgOne.code='云链助手'
|
||||||
|
this.msgOne.params=''
|
||||||
|
this.msgOne.content=''
|
||||||
|
this.msgOne.membername=''
|
||||||
|
this.dialogVisibleMessOne = false
|
||||||
|
},
|
||||||
|
sendMessageToSelect(){
|
||||||
|
if (this.multipleSelection < 1) {
|
||||||
|
this.$message({
|
||||||
|
message: '请选择至少一条会员信息',
|
||||||
|
type: 'warning',
|
||||||
|
duration: 1000
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.msgOne.userId=null
|
||||||
|
this.msgOne.code='云链助手'
|
||||||
|
this.msgOne.params=''
|
||||||
|
this.msgOne.content=''
|
||||||
|
this.msgOne.membername=''
|
||||||
|
this.dialogVisibleMessSelect = true
|
||||||
|
},
|
||||||
|
sendMessageToSelectSubmit(){
|
||||||
|
let _this = this
|
||||||
|
this.$refs['msgSelectFrom'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
let idList = []
|
||||||
|
for(var i in _this.multipleSelection){
|
||||||
|
idList.push(_this.multipleSelection[i].id)
|
||||||
|
}
|
||||||
|
let param = {
|
||||||
|
userIdList: idList,
|
||||||
|
sysMessage: _this.msgOne
|
||||||
|
}
|
||||||
|
console.log('kkk',param)
|
||||||
|
sendToSelect(param).then(response => {
|
||||||
|
this.$message({
|
||||||
|
message: '信息发送成功',
|
||||||
|
type: 'success',
|
||||||
|
duration:1000
|
||||||
|
});
|
||||||
|
_this.sendMessageToSelectReset()
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
_this.$message({
|
||||||
|
message: '请输入正确的数据',
|
||||||
|
type: 'error',
|
||||||
|
duration:1000
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
sendMessageToSelectReset(){
|
||||||
|
this.$refs['msgSelectFrom'].resetFields();
|
||||||
|
this.msgOne.userId=null
|
||||||
|
this.msgOne.code='云链助手'
|
||||||
|
this.msgOne.params=''
|
||||||
|
this.msgOne.content=''
|
||||||
|
this.msgOne.membername=''
|
||||||
|
this.dialogVisibleMessSelect = false
|
||||||
|
},
|
||||||
|
sendMessageToAll(){
|
||||||
|
this.msgOne.userId=null
|
||||||
|
this.msgOne.code='云链助手'
|
||||||
|
this.msgOne.params=''
|
||||||
|
this.msgOne.content=''
|
||||||
|
this.msgOne.membername=''
|
||||||
|
this.dialogVisibleMessAll = true
|
||||||
|
},
|
||||||
|
sendMessageToAllSubmit(){
|
||||||
|
let _this = this
|
||||||
|
this.$refs['msgAllFrom'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
sendToAll(_this.msgOne).then(response => {
|
||||||
|
this.$message({
|
||||||
|
message: '信息发送成功',
|
||||||
|
type: 'success',
|
||||||
|
duration:1000
|
||||||
|
});
|
||||||
|
_this.sendMessageToAllReset()
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
_this.$message({
|
||||||
|
message: '请输入正确的数据',
|
||||||
|
type: 'error',
|
||||||
|
duration:1000
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
sendMessageToAllReset(){
|
||||||
|
this.$refs['msgAllFrom'].resetFields();
|
||||||
|
this.msgOne.userId=null
|
||||||
|
this.msgOne.code='云链助手'
|
||||||
|
this.msgOne.params=''
|
||||||
|
this.msgOne.content=''
|
||||||
|
this.msgOne.membername=''
|
||||||
|
this.dialogVisibleMessAll = false
|
||||||
},
|
},
|
||||||
addBlacne(index, row) {
|
addBlacne(index, row) {
|
||||||
this.blance.dialogVisible = true
|
this.blance.dialogVisible = true
|
||||||
|
|||||||
BIN
mallplusui-web-admin/static/tx.png
Normal file
BIN
mallplusui-web-admin/static/tx.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
BIN
mallplusui-web-admin/static/wl.png
Normal file
BIN
mallplusui-web-admin/static/wl.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
Reference in New Issue
Block a user