添加注册用户

src/main/java/com/winhc/repal/cloud/LoginService.java

@@ -0,0 +1,24 @@
+package com.winhc.repal.cloud;
+
+import com.winhc.common.base.BeanResponse;
+import com.winhc.repal.cloud.dto.RepalRegUserDTO;
+import com.winhc.repal.cloud.dto.RepalRegUserInfoDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @Description: TODO
+ * @Author: xda
+ * @Date: 2022/5/13 19:50
+ */
+@FeignClient("login")
+public interface LoginService {
+
+
+    @RequestMapping(value = "/open/repalReg", method = RequestMethod.POST)
+    BeanResponse<List<RepalRegUserDTO>> repalRegUser(@RequestBody RepalRegUserInfoDTO dto);
+}

src/main/java/com/winhc/repal/cloud/dto/RepalRegUserDTO.java

@@ -0,0 +1,25 @@
+package com.winhc.repal.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: RepalUserDTO
+ * @Author: xda
+ * @Date: 2022/5/12 14:57
+ */
+@Data
+@ApiModel("回款宝用户")
+public class RepalRegUserDTO {
+
+
+    @ApiModelProperty("注册后的用户id")
+    private Long userId;
+
+    @ApiModelProperty("openId")
+    private String openId;
+
+    @ApiModelProperty("头像")
+    private String avatar;
+}

src/main/java/com/winhc/repal/cloud/dto/RepalRegUserInfoDTO.java

@@ -0,0 +1,27 @@
+package com.winhc.repal.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: RepalRegUserInfoDTO
+ * @Author: xda
+ * @Date: 2022/5/12 15:16
+ */
+@Data
+@ApiModel("回款宝用户注册对象")
+public class RepalRegUserInfoDTO {
+
+    @ApiModelProperty("操作人userId")
+    private Long userId;
+
+
+    @ApiModelProperty("注册用户对象")
+    private List<RepalRegUserDTO> regUserList;
+
+    @ApiModelProperty(value = "第三方服务商类型：1飞书；2钉钉")
+    private String thirdPartyType;
+}

src/main/java/com/winhc/repal/controller/RepalBookController.java

@@ -98,24 +98,6 @@ public class RepalBookController {
 
 
 
-
-//    @ApiOperation(value = "获取账本列表")
-//    @RequestMapping( method = RequestMethod.GET)
-//    public BeanResponse<List<AccountBookVO>> getAccountBookList() {
-//        return BeanResponse.success(CodeMsg.SUCCESS, accountBookService.getAccountBookList(RequesterUtil.getCurrentUserId()));
-//    }
-//
-//    @ApiOperation(value = "查看单个账本")
-//    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-//    public BeanResponse<AccountBookDetailVO> getAccountBookById(@PathVariable("id") Long id) {
-//        return BeanResponse.success(CodeMsg.SUCCESS, accountBookService.getAccountBookById(id, RequesterUtil.getCurrentUserId()));
-//    }
-//
-//    @ApiOperation("设置账本name")
-//    @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
-//    public BeanResponse<Boolean> updateAccountBookNameById(@PathVariable("id")Long id, @RequestBody UpdateAccountBookDTO dto) {
-//        return BeanResponse.success(CodeMsg.SUCCESS, accountBookService.updateAccountBookNameById(dto.setUserId(RequesterUtil.getCurrentUserId()).setAccountBookId(id)));
-//    }
 //
 //    @ApiOperation("刷新账本下所有账款评级")
 //    @PostMapping("/refresh")
@@ -124,10 +106,5 @@ public class RepalBookController {
 //        return BeanResponse.success(CodeMsg.SUCCESS, accountBookService.refreshGrade(refreshGradeDTO,RequesterUtil.getCurrentUserId()));
 //    }
 //
-//    @ApiOperation("删除账本")
-//    @RequestMapping(value = "/{accountBookId}", method = RequestMethod.DELETE)
-//    public BeanResponse<Boolean> deleteAccountBook(@PathVariable("accountBookId") Long accountBookId) {
-//        return BeanResponse.success(CodeMsg.SUCCESS, accountBookService.deleteAccountBook(accountBookId, RequesterUtil.getCurrentUserId()));
-//    }
 
 }

src/main/java/com/winhc/repal/model/dto/AddGroupMemberDTO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * @Description: AddGroupMemberDTO
@@ -14,11 +16,15 @@ import lombok.Data;
 @ApiModel("添加组织成员")
 public class AddGroupMemberDTO {
 
-    @ApiModelProperty("openId")
-    private String openId;
+
+    @ApiModelProperty("用户list")
+    private List<GroupMemberRegDTO> regList;
 
 
     @ApiModelProperty("角色id")
     private Long roleId;
+
+    @ApiModelProperty("1飞书。2钉钉")
+    private String thirdPartyType;
 }
 

src/main/java/com/winhc/repal/model/dto/GroupMemberRegDTO.java

@@ -0,0 +1,21 @@
+package com.winhc.repal.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: GroupMemberRegDTO
+ * @Author: xda
+ * @Date: 2022/5/13 20:06
+ */
+@Data
+@ApiModel("回款宝注册人员")
+public class GroupMemberRegDTO {
+
+    @ApiModelProperty("openId")
+    private String openId;
+
+    @ApiModelProperty("avatar")
+    private String avatar;
+}

src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -111,12 +111,10 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
             throw new CommonException(CodeMsg.FAILED, "必须保留一个账本哦～");
         }
         if (!this.update(Wrappers.lambdaUpdate(RepalBook.class)
-                .eq(RepalBook::getRepalGroupId, groupId)
-                .set(RepalBook::getDeleted, DeletedStatusEnum.NORMAL.getCode()))) {
+                .eq(RepalBook::getId, dto.getRepalBookId())
+                .set(RepalBook::getDeleted, DeletedStatusEnum.DELETE.getCode()))) {
             throw new CommonException(CodeMsg.FAILED, "参数错误");
         }
-        this.update(Wrappers.lambdaUpdate(RepalBook.class).eq(RepalBook::getId, dto.getRepalBookId())
-                .set(RepalBook::getDeleted, DeletedStatusEnum.DELETE.getCode()));
         // 账款和账款关联责任人也删掉
         repalBillService.deleteRepalBillByBookId(dto.getRepalBookId());
         return true;

src/main/java/com/winhc/repal/service/impl/RepalGroupMemberServiceImpl.java

@@ -3,8 +3,12 @@ package com.winhc.repal.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.common.base.BeanResponse;
 import com.winhc.common.enums.CodeMsg;
 import com.winhc.common.exception.CommonException;
+import com.winhc.repal.cloud.LoginService;
+import com.winhc.repal.cloud.dto.RepalRegUserDTO;
+import com.winhc.repal.cloud.dto.RepalRegUserInfoDTO;
 import com.winhc.repal.entity.RepalGroupMember;
 import com.winhc.repal.entity.RepalGroupRole;
 import com.winhc.repal.entity.UserExt;
@@ -46,6 +50,9 @@ public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMap
     @Autowired
     private RepalGroupRoleService repalGroupRoleService;
 
+    @Autowired
+    private LoginService loginService;
+
     @Override
     public Long getUserGroupId(Long userId) {
         RepalGroupMember repalGroupMember = this.getOne(Wrappers.lambdaQuery(RepalGroupMember.class)
@@ -135,6 +142,7 @@ public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMap
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean addGroupMember(AddGroupMemberDTO dto) {
         RepalGroupRole role = repalGroupRoleService.getById(dto.getRoleId());
         if (Objects.isNull(role)) {
@@ -142,14 +150,28 @@ public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMap
         }
         long userId = UserContextUtil.getUser().getUserId();
         long groupId = this.getUserGroupId(userId);
-        RepalGroupMember repalGroupMember = new RepalGroupMember();
-        // todo login注册
-        //repalGroupMember.setUserId();
-        repalGroupMember.setRepalGroupId(groupId);
-        //repalGroupMember.setMemberUserName(login);
-        repalGroupMember.setRoleType(role.getRoleType());
-        repalGroupMember.setRoleId(role.getId());
-        this.save(repalGroupMember);
+        RepalRegUserInfoDTO regUserInfoDTO = new RepalRegUserInfoDTO();
+        regUserInfoDTO.setUserId(userId);
+        regUserInfoDTO.setThirdPartyType(dto.getThirdPartyType());
+        regUserInfoDTO.setRegUserList(dto.getRegList().stream().map(t -> {
+            RepalRegUserDTO userDTO = new RepalRegUserDTO();
+            userDTO.setAvatar(t.getAvatar());
+            userDTO.setOpenId(t.getOpenId());
+            return userDTO;
+        }).collect(Collectors.toList()));
+        BeanResponse<List<RepalRegUserDTO>> beanResponse = loginService.repalRegUser(regUserInfoDTO);
+        if (Objects.isNull(beanResponse) || CollUtil.isEmpty(beanResponse.getBody())) {
+            throw new CommonException(CodeMsg.FAILED, "添加用户失败");
+        }
+        for (RepalRegUserDTO regUserDTO : beanResponse.getBody()) {
+            RepalGroupMember repalGroupMember = new RepalGroupMember();
+            repalGroupMember.setUserId(regUserDTO.getUserId());
+            repalGroupMember.setRepalGroupId(groupId);
+            // todo repalGroupMember.setMemberUserName();
+            repalGroupMember.setRoleType(role.getRoleType());
+            repalGroupMember.setRoleId(role.getId());
+            this.save(repalGroupMember);
+        }
         return true;
     }
 }