From 4f6bdfb31697377020126710bdbd500a363ba278 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 08 九月 2025 13:41:13 +0800
Subject: [PATCH] 定时任务，优惠卷领取状态

---
 framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index bb1d11d..ed570fb 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -4,7 +4,6 @@
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.digest.MD5;
 import cn.lili.base.Result;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
@@ -26,6 +25,7 @@
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.service.ConnectService;
 import cn.lili.modules.lmk.domain.entity.VideoAccount;
+import cn.lili.modules.lmk.domain.form.MemberNickNameForm;
 import cn.lili.modules.lmk.domain.form.MemberTagForm;
 import cn.lili.modules.lmk.service.MemberTagService;
 import cn.lili.modules.lmk.service.VideoAccountService;
@@ -56,7 +56,6 @@
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.catalina.security.SecurityUtil;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -69,6 +68,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 浼氬憳鎺ュ彛涓氬姟灞傚疄鐜�
@@ -531,10 +531,24 @@
     }
 
     @Override
+    public Result updateMemberNickName(MemberNickNameForm form) {
+        Member member = baseMapper.selectById(form.getMemberId());
+        boolean update = false;
+        if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isBlank(member.getNickName())) {
+            member.setNickName(form.getNickName());
+            update = true;
+        }
+        if (update){
+            baseMapper.updateById(member);
+        }
+        return Result.ok().data(member.getNickName());
+    }
+
+    @Override
     public Result resetPassword(String id) {
         String password = "111111";
         Member member = this.getById(id);
-        member.setPassword(new BCryptPasswordEncoder().encode(password));
+        member.setPassword(new BCryptPasswordEncoder().encode(SecureUtil.md5(password)));
         this.updateById(member);
         return Result.ok("閲嶇疆鎴愬姛");
     }
@@ -563,8 +577,36 @@
         queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getDisabled()), "disabled",
                 memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
         queryWrapper.orderByDesc("create_time");
+
         return this.baseMapper.pageByMemberVO(PageUtil.initPage(page), queryWrapper);
     }
+    @Override
+    public IPage<MemberVO> getMemberPageAndTag(MemberSearchVO memberSearchVO, PageVO page) {
+        QueryWrapper<Member> queryWrapper = Wrappers.query();
+        //鐢ㄦ埛鍚嶆煡璇�
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getUsername()), "username", memberSearchVO.getUsername());
+        //鐢ㄦ埛鍚嶆煡璇�
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getNickName()), "nick_name", memberSearchVO.getNickName());
+        //鎸夌収鐢佃瘽鍙风爜鏌ヨ
+        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
+        //鎸夌収浼氬憳鐘舵�佹煡璇�
+        queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getDisabled()), "disabled",
+                memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
+        queryWrapper.orderByDesc("create_time");
+        if (CollectionUtils.isNotEmpty(memberSearchVO.getTagIds())) {
+            // 浣跨敤inSql鏂规硶杩涜瀹夊叏鐨勫瓙鏌ヨ
+            String tagIdsStr = memberSearchVO.getTagIds().stream()
+                    .map(String::valueOf)
+                    .collect(Collectors.joining(","));
+            queryWrapper.inSql("id",
+                    "SELECT DISTINCT member_id FROM lmk_member_tag WHERE tag_id IN (" +
+                            tagIdsStr + ")");
+
+            return this.baseMapper.pageByMemberVO(PageUtil.initPage(page), queryWrapper);
+        }
+        return this.baseMapper.pageByMemberVO(PageUtil.initPage(page),queryWrapper);
+    }
+
 
     @Override
     @PointLogPoint
@@ -814,7 +856,9 @@
     public MemberVO getMember(String id) {
         MemberVO member = baseMapper.getVoById(id);
         if (Objects.nonNull(member)) {
-            member.setFace(cosUtil.getPreviewUrl(member.getFace()));
+            if(StringUtils.isNotBlank(member.getFace()) && !member.getFace().contains("https")){
+                member.setFace(cosUtil.getPreviewUrl(member.getFace()));
+            }
         }
         return member;
     }

--
Gitblit v1.8.0