From 92da9546e1b37b06f78671b34389b1dec9dfadfc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 13:57:42 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 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..f794ba1 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
@@ -242,7 +242,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 +324,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 +332,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 +520,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 +551,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 +614,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 +666,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 +685,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 +722,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 +736,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 +801,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){
--
Gitblit v1.7.1