From 7433322e94209c63bd6257dd4bf3b24be0452325 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 21 八月 2025 18:12:04 +0800
Subject: [PATCH] 奖品,抽奖活动bug改动,商家入驻密码重置111111

---
 framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index 3f8b4dc..4beb1dc 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.crypto.SecureUtil;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
@@ -11,10 +12,12 @@
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.BeanUtil;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsService;
 import cn.lili.modules.goods.service.GoodsSkuService;
+import cn.lili.modules.lmk.enums.general.DEFAULT_PASSWORD;
 import cn.lili.modules.member.entity.dos.Clerk;
 import cn.lili.modules.member.entity.dos.FootPrint;
 import cn.lili.modules.member.entity.dos.Member;
@@ -40,9 +43,11 @@
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -97,8 +102,10 @@
     private Cache cache;
 
     @Override
-    public IPage<StoreVO> findByConditionPage(StoreSearchParams storeSearchParams, PageVO page) {
-        return this.baseMapper.getStoreList(PageUtil.initPage(page), storeSearchParams.queryWrapper());
+    public IPage<StoreVO> findByConditionPage(StoreSearchParams storeSearchParams, PageVO vo) {
+        Page<StoreVO> page = PageUtil.initPage(vo);
+        this.baseMapper.getStoreList(page, storeSearchParams.queryWrapper());
+        return page;
     }
 
     @Override
@@ -213,6 +220,9 @@
             Member member = memberService.getById(store.getMemberId());
             member.setHaveStore(true);
             member.setStoreId(id);
+            if (StringUtils.isBlank(member.getPassword()) || DEFAULT_PASSWORD.DEFAULT_PASSWORD.getDesc().equals(member.getPassword())) {
+                member.setPassword(new BCryptPasswordEncoder().encode(SecureUtil.md5(DEFAULT_PASSWORD.DEFAULT_PASSWORD.getDesc())));
+            }
             memberService.updateById(member);
             //鍒涘缓搴楀憳
             ClerkAddDTO clerkAddDTO = new ClerkAddDTO();
@@ -412,4 +422,4 @@
         return this.getOne(lambdaQueryWrapper, false);
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0