修改总普代

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -105,12 +105,14 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
 
     @Override
     public AjaxResult update(SmileOrganization smileOrganization) {
-        smileOrganization.setUpdatedDate(LocalDateTime.now());
+        LocalDateTime now = LocalDateTime.now();
+        smileOrganization.setUpdatedDate(now);
         //查询组织信息
         LambdaQueryWrapper<SmileOrganization> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(SmileOrganization::getId, smileOrganization.getId());
         lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
+
         LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
         organizationQueryWrapper.ne(SmileOrganization::getId, smileOrganization.getId());
         organizationQueryWrapper.eq(SmileOrganization::getName, smileOrganization.getName());
@@ -124,19 +126,18 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         userLambdaQueryWrapper.eq(SmileUser::getUid, smileOrganization.getAgentId());
         userLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
         userLambdaQueryWrapper.eq(SmileUser::getState, 0);
+        userLambdaQueryWrapper.in(SmileUser::getType,1,2);
         SmileUser user = smileUserMapper.selectOne(userLambdaQueryWrapper);
         if (user != null && user.getType() == 1) {
+            if (user.getOrgId().equals(oleOrganization.getId())){
+                return AjaxResult.warn("该成员为该组总代！");
+            }
             return AjaxResult.warn("该成员为其他组织总代！");
         } else if (user == null) {
             return AjaxResult.warn("用户不存在！");
         }
         //修改总代与原总代不同
         if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !StringUtils.isEmpty(oleOrganization.getAgentId()) && !oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
-            //修改user信息
-            user.setType(1);
-            user.setOrgId(smileOrganization.getId());
-            user.setAgentId(smileOrganization.getAgentId());
-            smileUserMapper.updateById(user);
             //查询所有原总代的普代成员
             LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
             smileUserLambdaQueryWrapper.eq(SmileUser::getAgentId, oleOrganization.getAgentId());
@@ -147,16 +148,30 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             oldSmileUsers.forEach(smileUser -> {
                 //修改缓存用户redis总代信息
                 SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getUid());
+                smileUserVO.setUpdatedDate(now);
                 smileUserVO.setType(smileUser.getUid().equals(smileOrganization.getAgentId()) ? 1 : 2);
                 smileUserVO.setAgentId(smileOrganization.getAgentId());
                 //修改redis缓存
                 smileRedisUtils.setSmileUserVO(smileUser.getUid(), smileUserVO);
-
                 smileUser.setType(smileUserVO.getType());
+                smileUser.setUpdatedDate(now);
                 smileUser.setAgentId(smileOrganization.getAgentId());
                 //修改smile_user中普代总代信息
                 smileUserMapper.updateById(smileUser);
             });
+            //修改user信息
+            user.setUpdatedDate(now);
+            user.setType(1);
+            user.setOrgId(smileOrganization.getId());
+            user.setAgentId(smileOrganization.getAgentId());
+            smileUserMapper.updateById(user);
+            SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(user.getUid());
+            smileUserVO.setUpdatedDate(now);
+            smileUserVO.setType(1);
+            smileUserVO.setOrgId(smileOrganization.getId());
+            smileUserVO.setAgentId(smileOrganization.getAgentId());
+            smileRedisUtils.setSmileUserVO(smileUserVO.getUid(),smileUserVO);
+            //修改组织信息
             oleOrganization.setName(smileOrganization.getName());
             oleOrganization.setAgentId(smileOrganization.getAgentId());
             smileOrganizationMapper.updateById(oleOrganization);
@@ -173,8 +188,17 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             smileUserLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
             SmileUser smileUser = smileUserMapper.selectOne(smileUserLambdaQueryWrapper);
             smileUser.setType(1);
+            smileUser.setAgentId(smileOrganization.getAgentId());
             smileUser.setOrgId(smileOrganization.getId());
+            smileUser.setUpdatedDate(now);
             smileUserMapper.updateById(smileUser);
+            //修改redis
+            SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getUid());
+            smileUserVO.setUpdatedDate(now);
+            smileUserVO.setType(1);
+            smileUserVO.setOrgId(smileOrganization.getId());
+            smileUserVO.setAgentId(smileOrganization.getAgentId());
+            smileRedisUtils.setSmileUserVO(smileUserVO.getUid(),smileUserVO);
         }
         smileOrganizationMapper.updateById(oleOrganization);
         return AjaxResult.success();