修改总代

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

@@ -50,8 +50,6 @@ public class SmileOrganizationController {
         return smileOrganizationService.update(smileOrganization);
     }
 
-
-
     @PostMapping("/getOrgById")
     @ApiOperation("根据组织id获取信息")
     @ResponseBody
@@ -59,5 +57,4 @@ public class SmileOrganizationController {
         SmileOrgAndUserVo orgById = smileOrganizationService.getOrgById(id);
         return AjaxResult.success(orgById);
     }
-
 }

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

@@ -110,26 +110,26 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         lambdaQueryWrapper.eq(SmileOrganization::getId, smileOrganization.getId());
         lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
-        //新旧总代理相同
-        if (oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
-            //修改总代与原总代相同
-            smileOrganizationMapper.updateById(smileOrganization);
-        } else {
-            //修改总代与原总代不同
+        smileOrganizationMapper.updateById(smileOrganization);
+        //修改总代与原总代不同
+        if (!oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
             //查询所有原总代的普代成员
             LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
             smileUserLambdaQueryWrapper.eq(SmileUser::getAgentId, oleOrganization.getAgentId());
             smileUserLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
-            smileUserLambdaQueryWrapper.eq(SmileUser::getType, 2);
+            smileUserLambdaQueryWrapper.in(SmileUser::getType, 1, 2);
             List<SmileUser> oldSmileUsers = smileUserMapper.selectList(smileUserLambdaQueryWrapper);
             log.info("原总代id:{},修改总代id:{},受影响普代{}个", oleOrganization.getAgentId(), smileOrganization.getAgentId(), oldSmileUsers.size());
-//            List<SmileUser> newSmileUsers = oldSmileUsers.stream().peek(smileUser -> smileUser.setAddress(smileOrganization.getAgentId())).collect(Collectors.toList());
             oldSmileUsers.forEach(smileUser -> {
-                smileUser.setAddress(smileOrganization.getAgentId());
                 //修改缓存用户redis总代信息
                 SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getUid());
+                smileUserVO.setType(smileUserVO.getUid().equals(smileOrganization.getAgentId()) ? 1 : 2);
                 smileUserVO.setAgentId(smileOrganization.getAgentId());
+                //修改redis缓存
                 smileRedisUtils.setSmileUserVO(smileUser.getUid(), smileUserVO);
+
+                smileUser.setType(smileUser.getUid().equals(smileOrganization.getAgentId()) ? 1 : 2);
+                smileUser.setAgentId(smileOrganization.getAgentId());
                 //修改smile_user中普代总代信息
                 smileUserMapper.updateById(smileUser);
             });