Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -1,18 +1,19 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

@@ -46,7 +47,7 @@
     */
    void deleteById(Integer id,LoginUserInfo user);

    void roleAuthById(Integer id);
    void roleAuthById(Integer id,LoginUserInfo user);

    /**
     * 删除
@@ -158,26 +159,24 @@
    void memberFreeze();
    /********************************************公众号接口***********************************************************************/

    /**
     * 司机注册
     * @param registerDriverDTO
     */
    void registerDriver(RegisterDriverDTO registerDriverDTO);

    /**
     * 微信授权接口
     * @param code
     * @return
     */
    WxAuthorizeVO wxAuthorize(String code);
    WxAuthorizeVO wxAuthorize(String code,Integer source);



    MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
    List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);


    /**
     * 账号密码
     * 内部人员/劳务访客登录
     * @param accountLoginDTO
     * @return
     */
    WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);

    /**
     * 内部可拜访人员分页
@@ -200,4 +199,13 @@
    void updateHead(Member member);

    void updateWorkStatus(Member member);

    void batchRoleAuth(Member memberRole);

    String importBatch(MultipartFile file, Integer companyType,LoginUserInfo loginUser);


    List<Member>  findDriveList(Member model);

    void initPinyinTool();
}