From 6cca89c41aea52ae6b23909bb9fbd2834f0094d5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 18:43:12 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 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 141fcaa..d2ed66f 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;
@@ -242,7 +236,7 @@
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setMemberId(memberId);
member.setBindingFlag(0);
- member.setCreateTime(DateUtils.getNowDate());
+ member.setCreateTime(new Date());
member.setMobile(mobile);
initMemberTotal(memberId);
}else{
@@ -324,7 +318,7 @@
switch (editType){
case 1:
member.setNickName(editValue);
- member.setUpdateTime(DateUtils.getNowDate());
+ member.setUpdateTime(new Date());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
break;
@@ -332,13 +326,13 @@
break;
case 3:
member.setGender(Integer.valueOf(editValue));
- member.setUpdateTime(DateUtils.getNowDate());
+ member.setUpdateTime(new Date());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
break;
case 4:
member.setBirthday(editValue);
- member.setUpdateTime(DateUtils.getNowDate());
+ member.setUpdateTime(new Date());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
break;
@@ -520,7 +514,7 @@
member.setBindingFlag(1);
member.setRelationShopId(merMemberAddDto.getShopId());
member.setCustomerSource("商户添加");
- member.setCreateTime(DateUtils.getNowDate());
+ member.setCreateTime(new Date());
log.info("member-----------------"+member.toString());
this.saveOrUpdate(member);
initMemberTotal(memberId);
@@ -551,7 +545,7 @@
member.setLevel(merMemberEditDto.getLevel());
member.setBirthday(merMemberEditDto.getBirthday());
member.setUpdateUserId(merMemberEditDto.getUserId());
- member.setUpdateTime(DateUtils.getNowDate());
+ member.setUpdateTime(new Date());
log.info("member-----------------"+member.toString());
this.saveOrUpdate(member);
SysUser sysUser = new SysUser();
@@ -614,7 +608,7 @@
member.setDelFlag(0);
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setBindingFlag(0);
- member.setCreateTime(DateUtils.getNowDate());
+ member.setCreateTime(new Date());
member.setCustomerSource("商户订单添加");
this.saveOrUpdate(member);
initMemberTotal(member.getMemberId());
@@ -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);
//处理活跃度返回
@@ -686,8 +679,8 @@
MgtActivenessJudgeVo mgtActivenessJudgeVo;
for(Activeness activeness : activenessList){
mgtActivenessJudgeVo = new MgtActivenessJudgeVo();
- mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getEndDay()));
- mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getStartDay()-1));
+ mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(),activeness.getEndDay()));
+ mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(),activeness.getStartDay()-1));
mgtActivenessJudgeVo.setActivenessName(activeness.getActivenessName());
}
//活跃度赋值
@@ -723,7 +716,7 @@
member.setRelationShopId(shop.getShopId());
member.setRelationShopName(shop.getShopName());
member.setBindingFlag(1);
- member.setUpdateTime(DateUtils.getNowDate());
+ member.setUpdateTime(new Date());
member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
this.saveOrUpdate(member);
}
@@ -737,7 +730,7 @@
public void deleteMemberRelationShop(MgtMemberRelDelDto mgtMemberRelDelDto){
Member member = this.getById(mgtMemberRelDelDto.getMemberUserId());
member.setBindingFlag(0);
- member.setUpdateTime(DateUtils.getNowDate());
+ member.setUpdateTime(new Date());
member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
this.saveOrUpdate(member);
}
@@ -802,7 +795,7 @@
integralRecord.setChangeIntegral( 0-integer);
}
integralRecord.setSurpIntegral(useableIntegral);
- integralRecord.setCreateTime(DateUtils.getNowDate());
+ integralRecord.setCreateTime(new Date());
integralRecord.setOrderId(memberIntegralChangeDto.getOrderId());
integralRecord.setOrderNo(memberIntegralChangeDto.getOrderNo());
switch (recordType){
@@ -858,4 +851,16 @@
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