314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

Browse Source
master
elliott 2 years ago
parent 6dfcef0973 a4688c106a
commit fc742d97c0
17 changed files with 1169 additions and 207 deletions
Show Stats Download Patch File Download Diff File

10
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTemplate.java
Unescape Escape View File

@ -89,6 +89,8 @@ public class WxScriptTemplate extends BaseEntity
/** 子话术 */
private List<SysTag> children = new ArrayList<SysTag>();
private List<WxScriptTemplate> scriptTemplateChildren = new ArrayList<>();
private List<Long> tagIdArray = new ArrayList<Long>();
@ -259,6 +261,14 @@ public class WxScriptTemplate extends BaseEntity
this.tagIdArray = tagIdArray;
}
public List<WxScriptTemplate> getScriptTemplateChildren() {
return scriptTemplateChildren;
}
public void setScriptTemplateChildren(List<WxScriptTemplate> scriptTemplateChildren) {
this.scriptTemplateChildren = scriptTemplateChildren;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

32
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/AllChangIntegralOperateReq.java
Unescape Escape View File

@ -0,0 +1,32 @@
package com.flossom.common.core.domain.req;
public class AllChangIntegralOperateReq {
private WxUserIntegralVm wxUserIntegralVm;
private WxUserMemberVm wxUserMemberVm;
public AllChangIntegralOperateReq() {
}
public AllChangIntegralOperateReq(WxUserIntegralVm wxUserIntegralVm, WxUserMemberVm wxUserMemberVm) {
this.wxUserIntegralVm = wxUserIntegralVm;
this.wxUserMemberVm = wxUserMemberVm;
}
public WxUserIntegralVm getWxUserIntegralVm() {
return wxUserIntegralVm;
}
public void setWxUserIntegralVm(WxUserIntegralVm wxUserIntegralVm) {
this.wxUserIntegralVm = wxUserIntegralVm;
}
public WxUserMemberVm getWxUserMemberVm() {
return wxUserMemberVm;
}
public void setWxUserMemberVm(WxUserMemberVm wxUserMemberVm) {
this.wxUserMemberVm = wxUserMemberVm;
}
}

31
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/AllSendScriptOperateReq.java
Unescape Escape View File

@ -0,0 +1,31 @@
package com.flossom.common.core.domain.req;
public class AllSendScriptOperateReq {
private WxUserScriptReq wxUserScriptReq;
private WxUserMemberVm wxUserMemberVm;
public AllSendScriptOperateReq() {
}
public AllSendScriptOperateReq(WxUserScriptReq wxUserScriptReq, WxUserMemberVm wxUserMemberVm) {
this.wxUserScriptReq = wxUserScriptReq;
this.wxUserMemberVm = wxUserMemberVm;
}
public WxUserScriptReq getWxUserScriptReq() {
return wxUserScriptReq;
}
public void setWxUserScriptReq(WxUserScriptReq wxUserScriptReq) {
this.wxUserScriptReq = wxUserScriptReq;
}
public WxUserMemberVm getWxUserMemberVm() {
return wxUserMemberVm;
}
public void setWxUserMemberVm(WxUserMemberVm wxUserMemberVm) {
this.wxUserMemberVm = wxUserMemberVm;
}
}

15
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserScriptReq.java
Unescape Escape View File

@ -20,7 +20,6 @@ public class WxUserScriptReq {
/**
* 话术接收用户id
*/
@NotNull(message = "用户列表不能为空")
List<Long> userIdList;
/**
@ -58,8 +57,6 @@ public class WxUserScriptReq {
/**
* 跳转类型：0无跳转、1跳转内部链接、3跳转外部链接、4跳转小程序、5导向视频号、6导向视频号直播间
*/
@NotNull(message = "请选择跳转类型")
@Range(min = 0, max = 6)
private Integer type;
/**
@ -95,12 +92,12 @@ public class WxUserScriptReq {
/**
* 标签名字(xxx,xxx,xxx)
*/
private String tagNames;
private List<String> tagNames;
/**
* 标签ID(xxxx,xxxx,xxx)
*/
private String tagIds;
private List<String> tagIds;
public List<Long> getUserIdList() {
@ -215,19 +212,19 @@ public class WxUserScriptReq {
this.feedId = feedId;
}
public String getTagNames() {
public List<String> getTagNames() {
return tagNames;
}
public void setTagNames(String tagNames) {
public void setTagNames(List<String> tagNames) {
this.tagNames = tagNames;
}
public String getTagIds() {
public List<String> getTagIds() {
return tagIds;
}
public void setTagIds(String tagIds) {
public void setTagIds(List<String> tagIds) {
this.tagIds = tagIds;
}

21
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.flossom.common.core.domain.entity.SysDept;
import com.flossom.common.core.domain.entity.SysMenu;
import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxScriptTemplate;
import java.io.Serializable;
import java.util.List;
@ -27,6 +28,11 @@ public class TreeSelect implements Serializable {
*/
private String label;
/**
* 内容
*/
private String content;
/**
* 子节点
*/
@ -55,6 +61,13 @@ public class TreeSelect implements Serializable {
this.children = sysTag.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
public TreeSelect(WxScriptTemplate wxScriptTemplate) {
this.id = wxScriptTemplate.getId();
this.label = wxScriptTemplate.getTitile();
this.content = wxScriptTemplate.getContent();
this.children = wxScriptTemplate.getScriptTemplateChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
public Long getId() {
return id;
}
@ -78,4 +91,12 @@ public class TreeSelect implements Serializable {
public void setChildren(List<TreeSelect> children) {
this.children = children;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}

2
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java
Unescape Escape View File

@ -75,8 +75,6 @@ public class UserMemberController extends BaseController {
throw new ServiceException("上传头像失败");
}
userMemberUpdateVo.setHeadimg(result.getData().getUrl());
} else {
userMemberUpdateVo.setHeadimg(null);
}
return R.ok(wxUserMemberService.updateUser(userMemberUpdateVo));
}

10
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxScriptTemplateController.java
Unescape Escape View File

@ -4,7 +4,6 @@ import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxScriptTemplate;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.core.utils.poi.ExcelUtil;
@ -122,4 +121,13 @@ public class WxScriptTemplateController extends BaseController
// tags.removeIf(d -> d.getId().intValue() == id || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), id + ""));
// return success(tags);
// }
/**
* 获取标签树列表
*/
@GetMapping("/scriptTree")
public AjaxResult scriptTree(WxScriptTemplate wxScriptTemplate) {
return success(wxScriptTemplateService.scriptTree(wxScriptTemplate));
}
}

17
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.req.AllChangIntegralOperateReq;
import com.flossom.common.core.domain.req.WxUserIntegralVm;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import com.flossom.common.core.enums.IntegralChangeTypeEnum;
@ -111,7 +112,7 @@ public class WxUserMemberController extends BaseController {
*/
@PostMapping("/batchAddMiniProgramTag")
public R batchAddMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList,
@RequestParam(value = "userIdList") List<Integer> userIdList) {
@RequestParam("userIdList") List<Integer> userIdList) {
if (tagIdList == null || tagIdList.size() == 0) {
logger.error("参数有误");
throw new ServiceException("参数有误");
@ -124,7 +125,7 @@ public class WxUserMemberController extends BaseController {
* 全量添加小程序标签
*/
@PostMapping("/allAddMiniProgramTag")
public R allAddMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList, WxUserMemberVm wxUserMemberVm) {
public R allAddMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList, @RequestBody WxUserMemberVm wxUserMemberVm) {
if (tagIdList == null || tagIdList.size() == 0) {
logger.error("参数有误");
throw new ServiceException("参数有误");
@ -156,7 +157,7 @@ public class WxUserMemberController extends BaseController {
* 全量 删除小程序标签
*/
@PostMapping("/allDelMiniProgramTag")
public R allDelMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList, WxUserMemberVm wxUserMemberVm) {
public R allDelMiniProgramTag(@RequestParam("tagIdList") List<Integer> tagIdList, @RequestBody WxUserMemberVm wxUserMemberVm) {
if (tagIdList == null || tagIdList.size() == 0) {
logger.error("参数有误");
throw new ServiceException("参数有误");
@ -173,7 +174,7 @@ public class WxUserMemberController extends BaseController {
* 批量 操作积分
*/
@PostMapping("/batchChangIntegral")
public R batchChangIntegral(@Validated WxUserIntegralVm wxUserIntegralVm, @RequestParam(value = "userIdList") List<Long> userIdList) {
public R batchChangIntegral(@Validated @RequestBody WxUserIntegralVm wxUserIntegralVm, @RequestParam(value = "userIdList") List<Long> userIdList) {
if (userIdList == null || userIdList.size() == 0
|| !IntegralChangeTypeEnum.isIntegralChangType(wxUserIntegralVm.getSource())) {
logger.error("积分操作类型选择有误");
@ -187,15 +188,15 @@ public class WxUserMemberController extends BaseController {
* 全量 操作积分
*/
@PostMapping("/allChangIntegral")
public R allChangIntegral(@Validated WxUserIntegralVm wxUserIntegralVm, WxUserMemberVm wxUserMemberVm) {
if (IntegralChangeTypeEnum.isIntegralChangType(wxUserIntegralVm.getSource())) {
public R allChangIntegral(@Validated @RequestBody AllChangIntegralOperateReq operateReq) {
if (!IntegralChangeTypeEnum.isIntegralChangType(operateReq.getWxUserIntegralVm().getSource())) {
logger.error("积分操作类型选择有误");
throw new ServiceException("积分操作类型选择有误");
}
List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(operateReq.getWxUserMemberVm());
if (list != null && list.size() > 0) {
List<Long> collect = list.stream().map(wxUserMember -> wxUserMember.getId()).collect(Collectors.toList());
wxUserMemberService.batchChangIntegral(wxUserIntegralVm, collect);
wxUserMemberService.batchChangIntegral(operateReq.getWxUserIntegralVm(), collect);
}
return R.ok();
}

30
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserRemarkController.java
Unescape Escape View File

@ -2,14 +2,18 @@ package com.flossom.system.controller;
import java.util.List;
import java.io.IOException;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.entity.WxUserRemark;
import com.flossom.common.core.domain.req.WxUserIntegralVm;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import com.flossom.common.core.domain.req.WxUserRemarkReq;
import com.flossom.common.core.enums.IntegralChangeTypeEnum;
import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.core.utils.poi.ExcelUtil;
import com.flossom.common.core.web.controller.BaseController;
import com.flossom.common.core.web.domain.AjaxResult;
@ -17,6 +21,7 @@ import com.flossom.common.core.web.page.TableDataInfo;
import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.system.service.IWxUserMemberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -34,6 +39,9 @@ public class WxUserRemarkController extends BaseController {
@Autowired
private IWxUserRemarkService wxUserRemarkService;
@Autowired
private IWxUserMemberService wxUserMemberService;
/**
* 查询微信用户备注列列表
*/
@ -101,7 +109,29 @@ public class WxUserRemarkController extends BaseController {
*/
@PostMapping("/batchAddRemark")
public R batchAddRemark(@RequestBody @Validated WxUserRemarkReq wxUserRemarkReq) {
if(wxUserRemarkReq.getUserIdList() == null || wxUserRemarkReq.getUserIdList().size() == 0) {
return R.fail("请选择用户");
}
wxUserRemarkService.batchAddRemark(wxUserRemarkReq);
return R.ok();
}
/**
* 全量 添加备注
*/
@PostMapping("/allAddRemark")
public R allAddRemark(@RequestParam("content") String content, @RequestBody WxUserMemberVm wxUserMemberVm) {
if(StringUtils.isBlank(content)) {
throw new ServiceException("请输入备注内容");
}
WxUserRemarkReq wxUserRemarkReq = new WxUserRemarkReq();
wxUserRemarkReq.setContent(content);
List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
if (list != null && list.size() > 0) {
List<Long> collect = list.stream().map(wxUserMember -> wxUserMember.getId()).collect(Collectors.toList());
wxUserRemarkReq.setUserIdList(collect);
wxUserRemarkService.batchAddRemark(wxUserRemarkReq);
}
return R.ok();
}
}

93
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserScriptLogController.java
Unescape Escape View File

@ -3,7 +3,10 @@ package com.flossom.system.controller;
import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.entity.WxUserScriptLog;
import com.flossom.common.core.domain.req.AllSendScriptOperateReq;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import com.flossom.common.core.domain.req.WxUserScriptReq;
import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.utils.StringUtils;
@ -14,12 +17,14 @@ import com.flossom.common.core.web.page.TableDataInfo;
import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.system.service.IWxUserMemberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.flossom.system.service.IWxUserScriptLogService;
import java.util.List;
import java.util.stream.Collectors;
/**
* 发送话术记录Controller
@ -34,6 +39,9 @@ public class WxUserScriptLogController extends BaseController {
@Autowired
private IWxUserScriptLogService wxUserScriptLogService;
@Autowired
private IWxUserMemberService wxUserMemberService;
/**
* 查询发送话术记录列表
*/
@ -101,8 +109,11 @@ public class WxUserScriptLogController extends BaseController {
*
* @return
*/
@PostMapping("/sendScript")
public R sendScript(@RequestBody @Validated WxUserScriptReq wxUserScriptReq) {
@PostMapping("/batchSendScript")
public R batchSendScript(@RequestBody @Validated WxUserScriptReq wxUserScriptReq) {
if (wxUserScriptReq.getUserIdList() == null || wxUserScriptReq.getUserIdList().size() == 0) {
return R.fail("请选择话术接收人");
}
if (wxUserScriptReq.getIsCustom() == 0) {
// 模板话术
if (wxUserScriptReq.getScriptTemplateId() == null || wxUserScriptReq.getScriptTemplateId() == 0) {
@ -110,10 +121,10 @@ public class WxUserScriptLogController extends BaseController {
}
} else if (wxUserScriptReq.getIsCustom() == 1) {
// 自定义话术
if(StringUtils.isBlank(wxUserScriptReq.getTitile())){
if (StringUtils.isBlank(wxUserScriptReq.getTitile())) {
return R.fail("请输入话术标题");
}
if(StringUtils.isBlank(wxUserScriptReq.getContent())){
if (StringUtils.isBlank(wxUserScriptReq.getContent())) {
return R.fail("请输入话术内容");
}
// 跳转类型
@ -161,4 +172,78 @@ public class WxUserScriptLogController extends BaseController {
return R.ok();
}
/**
* 发送话术
*
* @return
*/
@PostMapping("/allSendScript")
public R allSendScript(@RequestBody @Validated AllSendScriptOperateReq allSendScriptOperateReq) {
WxUserScriptReq wxUserScriptReq = allSendScriptOperateReq.getWxUserScriptReq();
WxUserMemberVm wxUserMemberVm = allSendScriptOperateReq.getWxUserMemberVm();
if (wxUserScriptReq.getIsCustom() == 0) {
// 模板话术
if (wxUserScriptReq.getScriptTemplateId() == null || wxUserScriptReq.getScriptTemplateId() == 0) {
return R.fail("请选择话术模板");
}
} else if (wxUserScriptReq.getIsCustom() == 1) {
// 自定义话术
if (StringUtils.isBlank(wxUserScriptReq.getTitile())) {
return R.fail("请输入话术标题");
}
if (StringUtils.isBlank(wxUserScriptReq.getContent())) {
return R.fail("请输入话术内容");
}
// 跳转类型
if (wxUserScriptReq.getType() == 1) {
// 1跳转内部链接
if (StringUtils.isBlank(wxUserScriptReq.getLink())) {
return R.fail("请输入内部链接");
}
if (StringUtils.isBlank(wxUserScriptReq.getLinkParams())) {
return R.fail("请输入跳转参数");
}
}
if (wxUserScriptReq.getType() == 3) {
// 03跳转外部链接
if (StringUtils.isBlank(wxUserScriptReq.getLink())) {
return R.fail("请输入外部链接地址");
}
}
if (wxUserScriptReq.getType() == 4) {
// 4跳转小程序
if (StringUtils.isBlank(wxUserScriptReq.getRedirectAppid())) {
return R.fail("请输入小程序appid");
}
if (StringUtils.isBlank(wxUserScriptReq.getRedirectUrl())) {
return R.fail("请输入小程序页面地址");
}
}
if (wxUserScriptReq.getType() == 5) {
// 5导向视频号
if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) {
return R.fail("请输入视频号id");
}
if (StringUtils.isBlank(wxUserScriptReq.getFeedId())) {
return R.fail("请输入视频号feedid");
}
}
if (wxUserScriptReq.getType() == 6) {
// 6导向视频号直播间
if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) {
return R.fail("请输入视频号id");
}
}
}
List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
if (list != null && list.size() > 0) {
List<Long> collect = list.stream().map(wxUserMember -> wxUserMember.getId()).collect(Collectors.toList());
wxUserScriptReq.setUserIdList(collect);
wxUserScriptLogService.sendScript(wxUserScriptReq);
}
return R.ok();
}
}

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxScriptTemplateService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.service;
import java.util.List;
import com.flossom.common.core.domain.entity.WxScriptTemplate;
import com.flossom.common.core.domain.vo.TreeSelect;
/**
* 话术模板Service接口
@ -67,4 +68,6 @@ public interface IWxScriptTemplateService
* @return 结果
*/
public boolean hasChildByScriptId(Long id);
public List<TreeSelect> scriptTree(WxScriptTemplate wxScriptTemplate);
}

102
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxScriptTemplateServiceImpl.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.flossom.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@ -7,10 +9,12 @@ import java.util.stream.Collectors;
import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxScriptTag;
import com.flossom.common.core.domain.entity.WxScriptTemplate;
import com.flossom.common.core.domain.vo.TreeSelect;
import com.flossom.common.core.mapper.SysTagMapper;
import com.flossom.common.core.mapper.WxScriptTagMapper;
import com.flossom.common.core.mapper.WxScriptTemplateMapper;
import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.core.utils.SpringUtils;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.security.utils.SecurityUtils;
import org.apache.commons.compress.utils.Lists;
@ -26,14 +30,14 @@ import org.springframework.util.CollectionUtils;
* @date 2023-12-18
*/
@Service
public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
{
public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService {
@Autowired
private WxScriptTemplateMapper wxScriptTemplateMapper;
@Autowired
private WxScriptTagMapper wxScriptTagMapper;
@Autowired
private SysTagMapper sysTagMapper;
/**
* 查询话术模板
*
@ -41,8 +45,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
* @return 话术模板
*/
@Override
public WxScriptTemplate selectWxScriptTemplateById(Long id)
{
public WxScriptTemplate selectWxScriptTemplateById(Long id) {
return wxScriptTemplateMapper.selectWxScriptTemplateById(id);
}
@ -53,8 +56,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
* @return 话术模板
*/
@Override
public List<WxScriptTemplate> selectWxScriptTemplateList(WxScriptTemplate wxScriptTemplate)
{
public List<WxScriptTemplate> selectWxScriptTemplateList(WxScriptTemplate wxScriptTemplate) {
return wxScriptTemplateMapper.selectWxScriptTemplateList(wxScriptTemplate);
}
@ -65,15 +67,14 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
* @return 结果
*/
@Override
public int insertWxScriptTemplate(WxScriptTemplate wxScriptTemplate)
{
public int insertWxScriptTemplate(WxScriptTemplate wxScriptTemplate) {
wxScriptTemplate.setCreateTime(DateUtils.getNowDate());
wxScriptTemplate.setCreateBy(SecurityUtils.getLoginUser().getUsername());
List<SysTag> sysTags = Lists.newArrayList();
// 处理标签在字段的展示
List<Long> tagIds = wxScriptTemplate.getTagIdArray();
if(!CollectionUtils.isEmpty(tagIds)) {
for (long tagId:tagIds) {
if (!CollectionUtils.isEmpty(tagIds)) {
for (long tagId : tagIds) {
SysTag sysTag = sysTagMapper.selectDeptById(tagId);
if (Objects.nonNull(sysTag)) {
sysTags.add(sysTag);
@ -90,7 +91,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
int i = wxScriptTemplateMapper.insertWxScriptTemplate(wxScriptTemplate);
for(SysTag tag : sysTags) {
for (SysTag tag : sysTags) {
// 增加关联关系
WxScriptTag scriptTag = new WxScriptTag();
scriptTag.setScriptId(wxScriptTemplate.getId());
@ -110,8 +111,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
* @return 结果
*/
@Override
public int updateWxScriptTemplate(WxScriptTemplate wxScriptTemplate)
{
public int updateWxScriptTemplate(WxScriptTemplate wxScriptTemplate) {
wxScriptTemplate.setUpdateTime(DateUtils.getNowDate());
wxScriptTemplate.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
wxScriptTemplate.setTagIds("");
@ -119,8 +119,8 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
List<SysTag> sysTags = Lists.newArrayList();
// 处理标签在字段的展示
List<Long> tagIds = wxScriptTemplate.getTagIdArray();
if(!CollectionUtils.isEmpty(tagIds)) {
for (long tagId:tagIds) {
if (!CollectionUtils.isEmpty(tagIds)) {
for (long tagId : tagIds) {
SysTag sysTag = sysTagMapper.selectDeptById(tagId);
if (Objects.nonNull(sysTag)) {
sysTags.add(sysTag);
@ -138,7 +138,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
// 先删除原本的关系
wxScriptTagMapper.deleteWxScriptByScriptId(wxScriptTemplate.getId());
for(SysTag tag : sysTags) {
for (SysTag tag : sysTags) {
// 增加关联关系
WxScriptTag scriptTag = new WxScriptTag();
scriptTag.setScriptId(wxScriptTemplate.getId());
@ -158,8 +158,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
* @return 结果
*/
@Override
public int deleteWxScriptTemplateByIds(Long[] ids)
{
public int deleteWxScriptTemplateByIds(Long[] ids) {
return wxScriptTemplateMapper.deleteWxScriptTemplateByIds(ids);
}
@ -170,8 +169,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
* @return 结果
*/
@Override
public int deleteWxScriptTemplateById(Long id)
{
public int deleteWxScriptTemplateById(Long id) {
// 先删除原本的关系
int i = wxScriptTagMapper.deleteWxScriptByScriptId(id);
return wxScriptTemplateMapper.deleteWxScriptTemplateById(id);
@ -182,4 +180,68 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService
int result = wxScriptTemplateMapper.hasChildByScriptId(id);
return result > 0;
}
@Override
public List<TreeSelect> scriptTree(WxScriptTemplate wxScriptTemplate) {
List<WxScriptTemplate> wxScriptTemplateList = this.selectWxScriptTemplateList(wxScriptTemplate);
return buildTree(wxScriptTemplateList);
}
public List<TreeSelect> buildTree(List<WxScriptTemplate> wxScriptTemplateList) {
List<WxScriptTemplate> deptTrees = buildDeptTree(wxScriptTemplateList);
return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
}
public List<WxScriptTemplate> buildDeptTree(List<WxScriptTemplate> wxScriptTemplateList) {
List<WxScriptTemplate> returnList = new ArrayList<>();
List<Long> tempList = wxScriptTemplateList.stream().map(WxScriptTemplate::getId).collect(Collectors.toList());
for (WxScriptTemplate wxScriptTemplate : wxScriptTemplateList) {
// 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(wxScriptTemplate.getParentId())) {
recursionFn(wxScriptTemplateList, wxScriptTemplate);
returnList.add(wxScriptTemplate);
}
}
if (returnList.isEmpty()) {
returnList = wxScriptTemplateList;
}
return returnList;
}
/**
* 递归列表
*/
private void recursionFn(List<WxScriptTemplate> list, WxScriptTemplate t) {
// 得到子节点列表
List<WxScriptTemplate> childList = getChildList(list, t);
t.setScriptTemplateChildren(childList);
for (WxScriptTemplate tChild : childList) {
if (hasChild(list, tChild)) {
recursionFn(list, tChild);
}
}
}
/**
* 得到子节点列表
*/
private List<WxScriptTemplate> getChildList(List<WxScriptTemplate> list, WxScriptTemplate t) {
List<WxScriptTemplate> tlist = new ArrayList<>();
Iterator<WxScriptTemplate> it = list.iterator();
while (it.hasNext()) {
WxScriptTemplate n = (WxScriptTemplate) it.next();
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue()) {
tlist.add(n);
}
}
return tlist;
}
/**
* 判断是否有子节点
*/
private boolean hasChild(List<WxScriptTemplate> list, WxScriptTemplate t) {
return getChildList(list, t).size() > 0 ? true : false;
}
}

18
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -172,13 +172,11 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
List<Integer> needAddIdList = new ArrayList<>();
// 1、查询该标签下，有那些用户关联
List<Integer> existedUserList = wxUserTagMapper.selectWxUserTagByTagId(tagId, TagTypeStatus.MINI_PROGRAM.getCode());
if (existedUserList != null && existedUserList.size() > 0) {
Iterator<Integer> iterator = userIdList.iterator();
while (iterator.hasNext()) {
Integer element = iterator.next();
if (!existedUserList.contains(element)) {
needAddIdList.add(element);
}
Iterator<Integer> iterator = userIdList.iterator();
while (iterator.hasNext()) {
Integer element = iterator.next();
if (!existedUserList.contains(element)) {
needAddIdList.add(element);
}
}
@ -237,10 +235,10 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
if (wxUserIntegralVm.getSource().equals(IntegralChangeTypeEnum.INCREASE.getCode())) {
changeUserMember.setCredit(wxUserMember.getCredit() + wxUserIntegralVm.getFloatScore().intValue());
} else if (wxUserIntegralVm.getSource().equals(IntegralChangeTypeEnum.REDUCE.getCode())) {
if (wxUserMember.getCredit() < Integer.valueOf(wxUserIntegralVm.getSource())) {
changeUserMember.setCredit(0);
} else {
if (wxUserMember.getCredit() >= wxUserIntegralVm.getFloatScore().intValue()) {
changeUserMember.setCredit(wxUserMember.getCredit() - wxUserIntegralVm.getFloatScore().intValue());
} else {
changeUserMember.setCredit(0);
}
}
changeUserMember.setId(wxUserMember.getId());

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserRemarkServiceImpl.java
Unescape Escape View File

@ -99,14 +99,6 @@ public class WxUserRemarkServiceImpl implements IWxUserRemarkService {
@Override
public void batchAddRemark(WxUserRemarkReq wxUserRemarkReq) {
if (wxUserRemarkReq.getUserIdList() == null || wxUserRemarkReq.getUserIdList().size() == 0) {
List<Integer> userIdList = wxUserMemberMapper.selectWxUserMemberIdList();
if (userIdList != null && userIdList.size() > 0) {
List<Long> collect = userIdList.stream().map(Integer::longValue).collect(Collectors.toList());
wxUserRemarkReq.setUserIdList(collect);
}
}
if (wxUserRemarkReq.getUserIdList() != null && wxUserRemarkReq.getUserIdList().size() > 0) {
WxUserRemark wxUserRemark = new WxUserRemark();
for (Long userId : wxUserRemarkReq.getUserIdList()) {

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
Unescape Escape View File

@ -111,6 +111,9 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService {
for (Long wxUserId : userIdList) {
WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
BeanUtils.copyProperties(wxUserScriptReq, wxUserScriptLog);
if (wxUserScriptReq.getTagIds() != null && wxUserScriptReq.getTagIds().size() > 0) {
wxUserScriptLog.setTagIds(wxUserScriptReq.getTagIds().stream().collect(Collectors.joining(",")));
}
wxUserScriptLog.setWxUserId(wxUserId);
wxUserScriptLog.setCreateBy(SecurityUtils.getUsername());
wxUserScriptLog.setCreateTime(DateUtils.getNowDate());
@ -131,9 +134,8 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService {
}
if (wxUserScriptReq.getIsCustom() == 1) {
// 自定义话术
if (StringUtils.isNotBlank(wxUserScriptReq.getTagIds())) {
List<String> list = Arrays.asList(wxUserScriptReq.getTagIds().split(","));
List<Integer> tagList = list.stream().map(Integer::parseInt).collect(Collectors.toList());
if (wxUserScriptReq.getTagIds() != null && wxUserScriptReq.getTagIds().size() > 0) {
List<Integer> tagList = wxUserScriptReq.getTagIds().stream().map(Integer::parseInt).collect(Collectors.toList());
List<Integer> collect = userIdList.stream().map(Long::intValue).collect(Collectors.toList());
wxUserMemberService.batchAddMiniProgramTag(tagList, collect);
}

136
flossom-ui/src/api/system/member.js
Unescape Escape View File

@ -50,6 +50,17 @@ export function selectUserCount() {
})
}
export function getMiniProgramTagsTree() {
return request({
url: '/system/tagInfo/tagTree',
method: 'get',
params:{
type: 1
}
})
}
export function getMiniProgramTags() {
return request({
url: '/system/tagInfo/getMiniProgramTags',
@ -64,6 +75,7 @@ export function getWecomTags() {
})
}
// 获取购买渠道
export function getPurchaseChannel() {
return request({
url: '/system/channelInfo/getPurchaseChannel',
@ -71,6 +83,7 @@ export function getPurchaseChannel() {
})
}
// 获取省市区
export function getRegionByPid(pid) {
return request({
url: '/system/region/getRegionByPid',
@ -80,3 +93,126 @@ export function getRegionByPid(pid) {
}
})
}
// 批量添加小程序标签
export function batchAddMiniProgramTag(tagIdList, userIdList) {
return request({
url: '/system/member/batchAddMiniProgramTag?tagIdList=' + tagIdList + '&userIdList=' + userIdList,
method: 'post',
// params: {
// "tagIdList": tagIdList,
// "userIdList": userIdList
// },
header: {
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
}
})
}
// 全量添加小程序标签
export function allAddMiniProgramTag(tagIdList, data) {
return request({
url: '/system/member/allAddMiniProgramTag?tagIdList=' + tagIdList,
method: 'post',
// params: {
// tagIdList: tagIdList
// },
data: data
})
}
// 批量删除小程序标签
export function batchDelMiniProgramTag(tagIdList, userIdList) {
return request({
url: '/system/member/batchDelMiniProgramTag?tagIdList=' + tagIdList + '&userIdList=' + userIdList,
method: 'post',
// params: {
// tagIdList: tagIdList,
// userIdList: userIdList
// }
})
}
// 全量删除小程序标签
export function allDelMiniProgramTag(tagIdList, data) {
return request({
url: '/system/member/allDelMiniProgramTag?tagIdList=' + tagIdList,
method: 'post',
// params: {
// tagIdList: tagIdList,
// },
data: data
})
}
// 批量操作积分
export function batchChangIntegral(userIdList, data) {
return request({
url: '/system/member/batchChangIntegral?userIdList=' + userIdList,
method: 'post',
// params: {
// userIdList: userIdList
// },
data: data
})
}
// 全量 操作积分
export function allChangIntegral(data, user) {
return request({
url: '/system/member/allChangIntegral',
method: 'post',
data: {
wxUserIntegralVm: data,
wxUserMemberVm: user
},
})
}
// 批量发送话术
export function batchSendScript(data) {
return request({
url: '/system/userScriptLog/batchSendScript',
method: 'post',
data: data
})
}
// 全量发送话术
export function allSendScript(data, user) {
return request({
url: '/system/userScriptLog/allSendScript',
method: 'post',
data: {
wxUserScriptReq: data,
wxUserMemberVm: user
},
})
}
// 批量添加备注
export function batchAddRemark(data) {
return request({
url: '/system/wxUserRemark/batchAddRemark',
method: 'post',
data: data
})
}
// 全量添加备注
export function allAddRemark(content, user) {
return request({
url: '/system/wxUserRemark/allAddRemark?content=' + content,
method: 'post',
data: user
})
}
export function scriptTreeSelect(query) {
return request({
url: '/system/scriptTemplate/scriptTree',
method: 'get',
params: query
})
}

840
flossom-ui/src/views/system/member/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save