exit SmileUserVO

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileUserVO.java

@@ -24,6 +24,7 @@ import java.time.LocalDateTime;
 @ApiModel(value = "smileUser", description = "smile的user")
 @Data
 public class SmileUserVO implements Serializable {
+
     public interface saveOne{}
     public interface saveTwo{}
     public interface saveThree{}
@@ -34,6 +35,9 @@ public class SmileUserVO implements Serializable {
     @ApiModelProperty(value = "用户id")
     private String uid;
 
+    @ApiModelProperty(value = "总代理id，如果总代理是其本身则是本uid，如果不是则是上级uid")
+    private String agentId;
+
     /**
      * 照片
      */

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

@@ -58,7 +58,7 @@ public class SmileUserController extends BaseController {
     }
 
     @PostMapping("/create")
-    @ApiOperation(value = "保存用户")
+    @ApiOperation(value = "保存用户（后端不用此接口）")
     @ResponseBody
     public AjaxResult create(@RequestBody SmileUser smileUser) {
         if (iSmileUserService.create(smileUser)) {
@@ -101,13 +101,6 @@ public class SmileUserController extends BaseController {
         return iSmileUserService.updateUserCheckById(smileUserCheckVo);
     }
 
-    @PostMapping("/redisDelUserByUid")
-    @ApiOperation("根据uid删除redis中的用户")
-    @ResponseBody
-    public AjaxResult redisDelUserByUid(String uid) {
-        return iSmileUserService.redisDelUserByUid(uid);
-    }
-
     @RequestMapping("getAreaJson")
     @ApiOperation("省市区json")
     @ResponseBody

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

@@ -26,5 +26,4 @@ public interface ISmileUserService extends IService<SmileUser> {
 
     AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheck);
 
-    AjaxResult redisDelUserByUid(String uid);
 }

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

@@ -100,6 +100,7 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     public AjaxResult del(Long id) {
         smileSchoolMapper.updateDel(id);
         smileRedisUtils.del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(String.valueOf(id)));
+        
         return AjaxResult.success();
     }
 

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

@@ -146,14 +146,14 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
             smileUserMapper.updateUserCheckByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getType(), smileUserCheckVo.getReason());
             updateRedisSetUser(smileUserVO,smileUserCheckVo.getUid(),smileUserCheckVo.getReason());
         } else {
+            //查询代理信息  查询组织是否有总代   没有则设置  有则返回异常
+            LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
+            orgQueryWrapper.eq(SmileOrganization::getId, smileUserCheckVo.getOrgId());
+            orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);
+            SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
             //通过审核
             //判断是否是总代
-            if (smileUserCheckVo.getType().equals(1)) {
-                //查询组织是否有总代   没有则设置  有则返回异常
-                LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
-                orgQueryWrapper.eq(SmileOrganization::getId, smileUserCheckVo.getOrgId());
-                orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);
-                SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
+            if (smileOrganization != null && smileUserCheckVo.getType().equals(1)) {
                 if (smileOrganization != null && StringUtils.isEmpty(smileOrganization.getAgentId())) {
                     //没有总代  修改代理
                     smileOrganization.setUpdatedDate(LocalDateTime.now());
@@ -163,21 +163,21 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
                     //有总代
                     return AjaxResult.warn("该分组已经存在总代身份");
                 }
+            }else {
+                return AjaxResult.warn("组织不存在");
             }
+
             //更新redis
-            updateRedisSetUser(smileUserVO,smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType());
+            updateRedisSetUser(smileUserVO,smileUserCheckVo.getUid(),
+                    smileUserCheckVo.getOrgId(),
+                    smileUserCheckVo.getType(),
+                    StringUtils.isEmpty(smileOrganization.getAgentId())?smileOrganization.getAgentId():smileUserCheckVo.getUid());
             //修改user代理 id 开启代理
             smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType());
         }
         return AjaxResult.success();
     }
 
-    @Override
-    public AjaxResult redisDelUserByUid(String uid) {
-        smileRedisUtils.del(SmileRedisConst.SMILE_USER + uid);
-        return AjaxResult.success();
-    }
-
     private SmileUserVO getSmileUserVOFromRedis(String uid) {
         //根据uid查询用户
         LambdaQueryWrapper<SmileUser> userQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
@@ -197,7 +197,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     }
 
     //更新redis中的用户数据
-    private void updateRedisSetUser(SmileUserVO smileUserVO,String uid,Long orgId,Integer type) {
+    private void updateRedisSetUser(SmileUserVO smileUserVO,String uid,Long orgId,Integer type,String agentId) {
         //组织id
         if (StringUtils.isNotNull(orgId)) smileUserVO.setOrgId(orgId);
         //代理 代理类型（0：未审核，1：总代，2：普代，3：未认证）
@@ -206,6 +206,8 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         smileUserVO.setAgent(1);
         //清除审核
         smileUserVO.setErrorReason(null);
+        //存入总代理id
+        smileUserVO.setAgentId(agentId);
         //存入redis中
         smileRedisUtils.set(SmileRedisConst.SMILE_USER + uid, smileUserVO);
     }