From 924242a73d62d247f7055ffd0dd86a2700757f5b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 12 六月 2023 18:06:51 +0800
Subject: [PATCH] 基础配置 管理台联调bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 45 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 fe39f94..1af5cf0 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
@@ -1,21 +1,19 @@
package com.ruoyi.member.service.impl.member;
-import com.google.common.collect.Lists;
-import java.util.Date;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.pojo.member.IntegralRecord;
@@ -24,34 +22,30 @@
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.member.MemberMapper;
import com.ruoyi.member.service.member.*;
-import com.ruoyi.member.util.CodeFactoryUtil;
import com.ruoyi.member.util.HttpUtils;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
-import com.ruoyi.system.api.domain.poji.config.Activeness;
-import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
-import com.ruoyi.system.api.service.RemoteConfigService;
-import com.ruoyi.system.api.service.RemoteOrderService;
-import com.ruoyi.system.api.service.RemoteShopService;
-import com.ruoyi.system.api.service.RemoteUserService;
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.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.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import io.swagger.models.auth.In;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteOrderService;
+import com.ruoyi.system.api.service.RemoteShopService;
+import com.ruoyi.system.api.service.RemoteUserService;
import lombok.extern.log4j.Log4j2;
-import com.ruoyi.common.core.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
-import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -666,16 +660,15 @@
@Override
public List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto){
List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
- Date nowDay = DateUtils.getNowDate();
+ Date nowDay = new Date();
//处理活跃度筛选
- if(activenessList!=null&&!activenessList.isEmpty()){
- for(Activeness activeness : activenessList){
- if(activeness.getActivenessId().equals(merMemberPageDto.getActivenessId())){
- merMemberPageDto.setActStartDate(DateUtils.addDays(nowDay,activeness.getEndDay()));
- merMemberPageDto.setActEndDate(DateUtils.addDays(nowDay,activeness.getStartDay()));
- }
- }
- }
+ 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()));
+ });
//查询获取结果列表
List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto);
//处理活跃度返回
@@ -718,14 +711,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);
+ }
+ }
}
@@ -735,11 +734,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);
+ }
+ }
}
/**
@@ -748,14 +753,22 @@
*/
@Override
public void editMemberIntegral(MgtMemberIntEditDto mgtMemberIntEditDto){
- MemberIntegralChangeDto memberIntegralChangeDto = new MemberIntegralChangeDto();
- Member member = this.getByUserId(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);
+ }
+ }
}
@@ -793,6 +806,7 @@
//记录变动
IntegralRecord integralRecord = new IntegralRecord();
integralRecord.setDelFlag(0);
+ integralRecord.setUserId(memberIntegralChangeDto.getUserId());
integralRecord.setChangeType(recordType);
if(changeType==1){
integralRecord.setChangeIntegral(integer);
@@ -856,4 +870,18 @@
mgtMemberGetVo.setMemberTags(member.getUserTags());
return mgtMemberGetVo;
}
+
+ /**
+ * @description 删除标签
+ * @author jqs
+ * @date 2023/6/8 15:18
+ * @param memberTag
+ * @return void
+ */
+ @Override
+ public void deleteMemberTag(String memberTag){
+ memberMapper.deleteMemberTag(memberTag);
+ }
+
+
}
--
Gitblit v1.7.1