修改

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/ApplyUserClientFallback.java

@@ -105,4 +105,9 @@ public class ApplyUserClientFallback implements IApplyUserClient {
 	public List<ApplyUser> getListByMember(Long memberId, Long residentialId, Long roomId, Integer auditStatus) {
 		return null;
 	}
+
+    @Override
+    public Boolean logout(Long memberId) {
+        return null;
+    }
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/IApplyUserClient.java

@@ -96,4 +96,6 @@ public interface IApplyUserClient {
 	@PostMapping("/getListByMember")
 	List<ApplyUser> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId") Long residentialId,
 									@RequestParam(value = "roomId", required = false) Long roomId, @RequestParam(value = "auditStatus", required = false) Integer auditStatus);
+	@PostMapping("/logout")
+    Boolean logout(@RequestParam Long memberId);
 }

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IHouseUserClient.java

@@ -31,6 +31,9 @@ import java.util.Map;
 @FeignClient(value = "cyzh-person",path = "/feign/houseuser")
 public interface IHouseUserClient {
 
+
+	@PostMapping("logout")
+	Boolean logout(@RequestParam Long memberId);
 	/**
 	 * 详情
 	 */

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IMemberClient.java

@@ -21,6 +21,8 @@ import java.util.List;
 @FeignClient(value = "cyzh-person",path = "/feign/member")
 public interface IMemberClient  {
 
+
+
 	/**
 	 * 详情
 	 */

blade-service-api/person-api/src/main/java/org/springblade/person/feign/MemberClientFallback.java

@@ -3,61 +3,64 @@ package org.springblade.person.feign;
 import org.springblade.person.entity.Member;
 import org.springblade.person.vo.MemberVO;
 import org.springframework.stereotype.Component;
+
 import javax.validation.Valid;
 import java.util.List;
 
 @Component
 public class MemberClientFallback implements IMemberClient {
-            /**
-         * 详情
-         */
-        @Override
-        public MemberVO detail(Member member) {
-            return null;
-        }
 
-        /**
-         * 查询 会员表--小程序端，app端注册的会员信息
-         */
-        @Override
-        public List<MemberVO> list(Member member) {
-            return null;
-        }
 
 
+	/**
+	 * 详情
+	 */
+	@Override
+	public MemberVO detail(Member member) {
+		return null;
+	}
 
-        /**
-         * 新增 会员表--小程序端，app端注册的会员信息
-         */
-        @Override
-        public boolean save( Member member) {
-            return false;
-        }
+	/**
+	 * 查询 会员表--小程序端，app端注册的会员信息
+	 */
+	@Override
+	public List<MemberVO> list(Member member) {
+		return null;
+	}
 
-        /**
-         * 修改 会员表--小程序端，app端注册的会员信息
-         */
-        @Override
-        public boolean update( Member member) {
-            return false;
-        }
 
-        /**
-         * 新增或修改 会员表--小程序端，app端注册的会员信息
-         */
-        @Override
-        public boolean submit( Member member) {
-            return false;
-        }
+	/**
+	 * 新增 会员表--小程序端，app端注册的会员信息
+	 */
+	@Override
+	public boolean save(Member member) {
+		return false;
+	}
+
+	/**
+	 * 修改 会员表--小程序端，app端注册的会员信息
+	 */
+	@Override
+	public boolean update(Member member) {
+		return false;
+	}
+
+	/**
+	 * 新增或修改 会员表--小程序端，app端注册的会员信息
+	 */
+	@Override
+	public boolean submit(Member member) {
+		return false;
+	}
 
 
-        /**
-         * 删除 会员表--小程序端，app端注册的会员信息
-         */
-        @Override
-        public boolean remove( String ids) {
-            return false;
-        }
+	/**
+	 * 删除 会员表--小程序端，app端注册的会员信息
+	 */
+	@Override
+	public boolean remove(String ids) {
+		return false;
+	}
 
 	@Override
 	public Member getById(Long id) {

blade-service/estate/src/main/java/org/springblade/estate/feign/ApplyUserClient.java

@@ -205,7 +205,13 @@ public class ApplyUserClient implements IApplyUserClient {
 		return applyUserService.list(lambda);
 	}
 
-
+    @Override
+	@PostMapping("/logout")
+	public Boolean logout(@RequestParam Long memberId) {
+		QueryWrapper<ApplyUser> queryWrapper = Condition.getQueryWrapper(new ApplyUser());
+		queryWrapper.lambda().in(ApplyUser::getMemberId, memberId);
+		return applyUserService.remove(queryWrapper);
+    }
 
 
 }

blade-service/person/src/main/java/org/springblade/person/feign/HouseUserClient.java

@@ -51,9 +51,15 @@ public class HouseUserClient implements IHouseUserClient {
 	private final HouseUserService houseUserService;
 	private final IOrgPositionClient orgPositionClient;
 	private final IConfClient confClient;
-	private final IApplyUserClient applyUserClient;
 
-	/**
+    @Override
+    public Boolean logout(@RequestParam Long memberId) {
+		QueryWrapper<HouseUser> queryWrapper = Condition.getQueryWrapper(new HouseUser());
+		queryWrapper.lambda().in(HouseUser::getMemberId);
+		return houseUserService.remove(queryWrapper);
+    }
+
+    /**
 	 * 详情
 	 */
 	@Override

blade-service/person/src/main/java/org/springblade/person/feign/MemberClient.java

@@ -1,10 +1,13 @@
 package org.springblade.person.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.estate.entity.ApplyUser;
+import org.springblade.estate.feign.IApplyUserClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -29,7 +32,7 @@ public class MemberClient implements IMemberClient {
 
     private final IMemberService memberService;
 
-        /**
+    /**
      * 详情
      */
     @Override

community-app-gateway/src/main/java/org/springblade/app/controller/MemberController.java

@@ -46,10 +46,7 @@ import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.third.doordevice.feign.IDoorDeviceButtClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -84,6 +81,20 @@ public class MemberController {
 	private final static String VERIFICATION_CODE = "verification:code";
 
 
+	/**
+	 * 注销账户
+	 * @param memberId
+	 * @return
+	 */
+	@PostMapping("logout")
+	public R logout(@RequestBody Long memberId) {
+		//删除applyUser
+		boolean flag = applyUserClient.logout(memberId);
+		boolean flag1 = houseUserClient.logout(memberId);
+		boolean flag2 = memberClient.remove(memberId.toString());
+		return R.data(flag&&flag1&&flag2);
+	}
+
 	/**
 	 * 功能描述: 获取验证码
 	 *