From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 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 2fa2972..3cfd13a 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
@@ -70,33 +70,47 @@
  * @since 2021-03-29 14:10:16
  */
 @Service
-@RequiredArgsConstructor
 public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
 
     /**
      * 浼氬憳token
      */
-    private final MemberTokenGenerate memberTokenGenerate;
+    @Autowired
+    private MemberTokenGenerate memberTokenGenerate;
     /**
      * 鍟嗗token
      */
-    private final StoreTokenGenerate storeTokenGenerate;
+    @Autowired
+    private StoreTokenGenerate storeTokenGenerate;
     /**
      * 鑱斿悎鐧诲綍
      */
-    private final ConnectService connectService;
+    @Autowired
+    private ConnectService connectService;
     /**
      * 搴楅摵
      */
-    private final StoreService storeService;
+    @Autowired
+    private StoreService storeService;
     /**
      * RocketMQ 閰嶇疆
      */
-    private final RocketmqCustomProperties rocketmqCustomProperties;
-    private final RocketMQTemplate rocketMQTemplate;
-    private final ApplicationEventPublisher applicationEventPublisher;
-    private final Cache cache;
-    private final VideoAccountService videoAccountService;
+    @Autowired
+    private RocketmqCustomProperties rocketmqCustomProperties;
+
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
+
+    @Autowired
+    private ApplicationEventPublisher applicationEventPublisher;
+    /**
+     * 缂撳瓨
+     */
+    @Autowired
+    private Cache cache;
+
+    @Autowired
+    private VideoAccountService videoAccountService;
 
     @Override
     public Member findByUsername(String userName) {
@@ -488,6 +502,21 @@
         return member;
     }
 
+
+    @Override
+    public Member updateMemberPartProperties(String id,String password,String mobile) {
+        //鏌ヨ浼氬憳淇℃伅
+        Member member = this.getById(id);
+        //濡傛灉瀵嗙爜涓嶄负绌哄垯鍔犲瘑瀵嗙爜
+        if (CharSequenceUtil.isNotBlank(password)) {
+            member.setPassword(new BCryptPasswordEncoder().encode(password));
+        }
+        member.setMobile(mobile);
+        member.setUsername(mobile);
+        this.updateById(member);
+        return member;
+    }
+
     @Override
     public IPage<MemberVO> getMemberPage(MemberSearchVO memberSearchVO, PageVO page) {
         QueryWrapper<Member> queryWrapper = Wrappers.query();

--
Gitblit v1.8.0