用户注销逻辑删除企业用户子用户

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrganizationDepartmentServiceImpl.java

@@ -50,23 +50,29 @@ public class OrganizationDepartmentServiceImpl extends ServiceImpl<OrganizationD
     @Override
     public void organizationDepartEdit(OrganizationDepartment request) {
         deparementDao.updateById(request);
-
         String id = request.getId();
-        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(UserBypassAccount::getDepartmentId,id);
-        UserBypassAccount userBypassAccount = userBypassAccountService.getOne(queryWrapper);
-        if (null!=userBypassAccount){
-            userBypassAccount.setDepartment(request.getName());
-            userBypassAccountService.updateById(userBypassAccount);
-        }
-
         LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
         enterpriseLambdaQueryWrapper.eq(UserEnterprise::getOrganizationId,request.getOrganizationId());
+        enterpriseLambdaQueryWrapper.eq(UserEnterprise::getIsDelete,0);
         UserEnterprise userEnterprise = userEnterpriseService.getOne(enterpriseLambdaQueryWrapper);
         if (null!=userEnterprise){
             userEnterprise.setDepartment(request.getName());
             userEnterpriseService.updateById(userEnterprise);
         }
+
+        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserBypassAccount::getDepartmentId,id);
+        queryWrapper.eq(UserBypassAccount::getEnterpriseId,userEnterprise.getId());
+        List<UserBypassAccount> list = userBypassAccountService.list(queryWrapper);
+        if (null!=list&&list.size()>0){
+            for (UserBypassAccount userBypassAccount : list) {
+                userBypassAccount.setDepartment(request.getName());
+                userBypassAccountService.updateById(userBypassAccount);
+            }
+        }
+
+
+
     }
 }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java

@@ -21,10 +21,7 @@ import com.zbkj.common.model.admin.SystemAdmin;
 import com.zbkj.common.model.bill.Bill;
 import com.zbkj.common.model.bill.UserBill;
 import com.zbkj.common.model.system.TaskMessage;
-import com.zbkj.common.model.user.User;
-import com.zbkj.common.model.user.UserBalanceRecord;
-import com.zbkj.common.model.user.UserEnterprise;
-import com.zbkj.common.model.user.UserIntegralRecord;
+import com.zbkj.common.model.user.*;
 import com.zbkj.common.page.CommonPage;
 import com.zbkj.common.request.*;
 import com.zbkj.common.response.*;
@@ -94,6 +91,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     private TaskMessageService taskMessageService;
     @Autowired
     private UserEnterpriseService userEnterpriseService;
+    @Autowired
+    private UserBypassAccountService userBypassAccountService;
 
     /**
      * 手机号注册用户
@@ -1148,6 +1147,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
      * 6.清空用户登录状态
      * 7.清除用户标签
      * 8.关闭推广人按钮
+     * 9.注销企业用户 企业子账户
      */
     @Override
     public Boolean logoff() {
@@ -1157,13 +1157,36 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         user.setTagId("");
         user.setIsPromoter(false);
 
+        //注销企业用户
         LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
         enterpriseLambdaQueryWrapper.eq(UserEnterprise::getUserId, user.getId());
         UserEnterprise one = userEnterpriseService.getOne(enterpriseLambdaQueryWrapper);
-        BigDecimal usedLineOfCredit = one.getUsedLineOfCredit();
-        int i = usedLineOfCredit.compareTo(BigDecimal.valueOf(0));
-        if (i > 0) {
-            return false;
+        if (null!=one){
+            LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(UserBypassAccount::getEnterpriseId, one.getId());
+            queryWrapper.eq(UserBypassAccount::getIsDelete, 1);
+            List<UserBypassAccount> list = userBypassAccountService.list(queryWrapper);
+            if (null!=list&&list.size()>0){
+                for (UserBypassAccount userBypassAccount : list) {
+                    userBypassAccount.setIsDelete(1);
+                }
+            }
+            one.setIsDelete(1);
+            BigDecimal usedLineOfCredit = one.getUsedLineOfCredit();
+            int i = usedLineOfCredit.compareTo(BigDecimal.valueOf(0));
+            if (i > 0) {
+                return false;
+            }
+        }
+       //注销企业子用户
+        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserBypassAccount::getUserId, user.getId());
+        queryWrapper.eq(UserBypassAccount::getIsDelete, 1);
+        List<UserBypassAccount> list = userBypassAccountService.list(queryWrapper);
+        if (null!=list&&list.size()>0){
+            for (UserBypassAccount userBypassAccount : list) {
+                userBypassAccount.setIsDelete(1);
+            }
         }