Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2025-06-04 4e502853119c6d8e7ff686191e19bb0a19a4f875

 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();