From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 140 ++++++++++++++++++++++++++++++++++------------
1 files changed, 103 insertions(+), 37 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 d2ed66f..8645b64 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
@@ -25,17 +25,13 @@
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
-import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
-import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.config.Activeness;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
-import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
+import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.service.RemoteConfigService;
@@ -645,7 +641,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;
}
@@ -661,14 +657,20 @@
public List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto){
List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
Date nowDay = new Date();
- //处理活跃度筛选
- activenessList.stream()
- .filter(activeness -> activeness.getActivenessId().equals(merMemberPageDto.getActivenessId()))
- .findFirst()
- .ifPresent(activeness -> {
- merMemberPageDto.setActStartDate(DateUtils.addDays(nowDay, activeness.getEndDay()));
- merMemberPageDto.setActEndDate(DateUtils.addDays(nowDay, activeness.getStartDay()));
- });
+ if(merMemberPageDto.getActivenessId()!=null){
+ //处理活跃度筛选
+ activenessList.stream()
+ .filter(activeness -> activeness.getActivenessId().equals(merMemberPageDto.getActivenessId()))
+ .findFirst()
+ .ifPresent(activeness -> {
+ merMemberPageDto.setActStartDate(DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.addDays(nowDay, activeness.getEndDay())));
+ merMemberPageDto.setActEndDate(DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.addDays(nowDay, activeness.getStartDay())));
+ });
+ }
+ //处理标签为正则表达
+ if(StringUtils.isNotBlank(merMemberPageDto.getMemberTags())){
+ merMemberPageDto.setMemberTags(merMemberPageDto.getMemberTags().replace(",","|"));
+ }
//查询获取结果列表
List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto);
//处理活跃度返回
@@ -711,14 +713,20 @@
*/
@Override
public void editMemberRelationShop(MgtMemberRelEditDto mgtMemberRelEditDto){
- Member member = this.getByUserId(mgtMemberRelEditDto.getMemberUserId());
- Shop shop = shopService.getShop(mgtMemberRelEditDto.getShopId()).getData();
- member.setRelationShopId(shop.getShopId());
- member.setRelationShopName(shop.getShopName());
- member.setBindingFlag(1);
- member.setUpdateTime(new Date());
- member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
- this.saveOrUpdate(member);
+ if(StringUtils.isNotBlank(mgtMemberRelEditDto.getMemberUserIds())){
+ Shop shop = shopService.getShop(mgtMemberRelEditDto.getShopId()).getData();
+ String memberUserIds = mgtMemberRelEditDto.getMemberUserIds();
+ String[] memberUserIdArr = memberUserIds.split(",");
+ for(String str : memberUserIdArr){
+ Member member = this.getByUserId(Long.valueOf(str));
+ member.setRelationShopId(shop.getShopId());
+ member.setRelationShopName(shop.getShopName());
+ member.setBindingFlag(1);
+ member.setUpdateTime(new Date());
+ member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
+ this.saveOrUpdate(member);
+ }
+ }
}
@@ -728,11 +736,17 @@
*/
@Override
public void deleteMemberRelationShop(MgtMemberRelDelDto mgtMemberRelDelDto){
- Member member = this.getById(mgtMemberRelDelDto.getMemberUserId());
- member.setBindingFlag(0);
- member.setUpdateTime(new Date());
- member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
- this.saveOrUpdate(member);
+ if(StringUtils.isNotBlank(mgtMemberRelDelDto.getMemberUserIds())) {
+ String memberUserIds = mgtMemberRelDelDto.getMemberUserIds();
+ String[] memberUserIdArr = memberUserIds.split(",");
+ for(String str : memberUserIdArr) {
+ Member member = this.getById(Long.valueOf(str));
+ member.setBindingFlag(0);
+ member.setUpdateTime(new Date());
+ member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
+ this.saveOrUpdate(member);
+ }
+ }
}
/**
@@ -741,15 +755,22 @@
*/
@Override
public void editMemberIntegral(MgtMemberIntEditDto mgtMemberIntEditDto){
- MemberIntegralChangeDto memberIntegralChangeDto = new MemberIntegralChangeDto();
- Member member = this.getByUserId(mgtMemberIntEditDto.getMemberUserId());
- memberIntegralChangeDto.setUserId(mgtMemberIntEditDto.getMemberUserId());
- memberIntegralChangeDto.setMemberId(member.getMemberId());
- memberIntegralChangeDto.setChangeType(1);
- memberIntegralChangeDto.setRecordType(3);
- memberIntegralChangeDto.setIntegral(mgtMemberIntEditDto.getIntegral());
- //调用积分变动
- memberIntegralChange(memberIntegralChangeDto);
+ if(StringUtils.isNotBlank(mgtMemberIntEditDto.getMemberUserIds())) {
+ String memberUserIds = mgtMemberIntEditDto.getMemberUserIds();
+ String[] memberUserIdArr = memberUserIds.split(",");
+ MemberIntegralChangeDto memberIntegralChangeDto;
+ for(String str : memberUserIdArr) {
+ memberIntegralChangeDto = new MemberIntegralChangeDto();
+ Member member = this.getByUserId(Long.valueOf(str));
+ memberIntegralChangeDto.setUserId(Long.valueOf(str));
+ memberIntegralChangeDto.setMemberId(member.getMemberId());
+ memberIntegralChangeDto.setChangeType(1);
+ memberIntegralChangeDto.setRecordType(3);
+ memberIntegralChangeDto.setIntegral(mgtMemberIntEditDto.getIntegral());
+ //调用积分变动
+ memberIntegralChange(memberIntegralChangeDto);
+ }
+ }
}
@@ -863,4 +884,49 @@
public void deleteMemberTag(String memberTag){
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);
+ }
+
+ /**
+ * @description 通过ids获取用户简易返回
+ * @author jqs
+ * @date 2023/6/16 11:06
+ * @param userIds
+ * @return List<MgtSimpleMemberVo>
+ */
+ @Override
+ public List<MgtSimpleMemberVo> listSimpleVoByIds(String userIds){
+ return memberMapper.listSimpleVoByIds(userIds);
+ }
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/16 12:41
+ * @param mgtUserIdByKeywordDto
+ * @return MgtUserIdByKeywordVo
+ */
+ @Override
+ public MgtUserIdByKeywordVo getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto){
+ MgtUserIdByKeywordVo mgtUserIdByKeywordVo = new MgtUserIdByKeywordVo();
+ List<Long> userIdList = memberMapper.getUserIdByKeyword(mgtUserIdByKeywordDto);
+ if(userIdList!=null&&!userIdList.isEmpty()){
+ String userIdStr = userIdList.stream()
+ .map(Object::toString)
+ .collect(Collectors.joining(","));
+ mgtUserIdByKeywordVo.setUserIds(userIdStr);
+ }
+ return mgtUserIdByKeywordVo;
+ }
}
--
Gitblit v1.7.1