From d6e5d5a71112fb1f0a7361485e80692cc03bc4c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 13 六月 2023 19:01:48 +0800
Subject: [PATCH] 优惠券管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 1af5cf0..59cfbb1 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -645,7 +645,7 @@
* @return
*/
private String createMemberNo(){
- int memberTotal = memberMapper.selectCount(new LambdaQueryWrapper<Member>().eq(Member::getDelFlag, 0));
+ int memberTotal = memberMapper.selectCount(new LambdaQueryWrapper<Member>());
String memberNo = CodeFactoryUtil.getMemberNo(Long.valueOf(memberTotal+1));
return memberNo;
}
@@ -669,6 +669,10 @@
merMemberPageDto.setActStartDate(DateUtils.addDays(nowDay, activeness.getEndDay()));
merMemberPageDto.setActEndDate(DateUtils.addDays(nowDay, activeness.getStartDay()));
});
+ //处理标签为正则表达
+ if(StringUtils.isNotBlank(merMemberPageDto.getMemberTags())){
+ merMemberPageDto.setMemberTags(merMemberPageDto.getMemberTags().replace(",","|"));
+ }
//查询获取结果列表
List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto);
//处理活跃度返回
@@ -883,5 +887,16 @@
memberMapper.deleteMemberTag(memberTag);
}
-
+ /**
+ * @description 通过发送类型获取userId
+ * @author jqs
+ * @date 2023/6/13 17:53
+ * @param sendType
+ * @return List<Long>
+ */
+ @Override
+ public List<Long> listIdBySendType(Integer sendType){
+ //1.手动领取2.全部用户3.会员用户4非会员用户5自定义
+ return memberMapper.listIdBySendType(sendType);
+ }
}
--
Gitblit v1.7.1