1.修改用户标签改为批量修改用户

2.新增查询销售信息接口

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -28,6 +28,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -102,6 +103,14 @@ public class CompanyUserController extends AppBaseController {
         return R.ok().put("data", pageInfo);
     }
 
+    @Login
+    @ApiOperation("获取销售信息")
+    @PostMapping("/getCompanyUserInfo")
+    public R getCompanyUserInfo(@ApiParam(name = "companyUserId", value = "销售用户ID", required = true)
+                                @RequestParam Long companyUserId) {
+        return R.ok().put("data", companyUserService.selectCompanyUserById(companyUserId));
+    }
+
     @Login
     @ApiOperation("修改用户信息")
     @PostMapping("/updateUserInfo")

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -226,7 +226,7 @@ public class FsUserController extends AppBaseController {
     @ApiOperation("修改用户标签")
     @PostMapping("/changeUserTags")
     public ResponseResult<Object> changeUserTags(@Valid @RequestBody FsUserTagUpdateParam param) {
-        companyTagUserService.changeUserTags(param.getFsUserId(), param.getTagIds());
+        companyTagUserService.changeUserTags(param.getFsUserIds(), param.getTagIds());
         return ResponseResult.ok();
     }
 

fs-company-app/src/main/java/com/fs/app/param/FsUserTagUpdateParam.java

@@ -3,7 +3,7 @@ package com.fs.app.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Data
@@ -11,9 +11,9 @@ public class FsUserTagUpdateParam {
     /**
      * 用户ID
      */
-    @ApiModelProperty("用户ID")
-    @NotNull(message = "用户ID不能为空")
-    private Long fsUserId;
+    @ApiModelProperty("用户ID集合")
+    @NotEmpty(message = "用户ID不能为空")
+    private List<Long> fsUserIds;
     /**
      * 标签ID
      */

fs-service-system/src/main/java/com/fs/company/service/ICompanyTagUserService.java

@@ -82,8 +82,8 @@ public interface ICompanyTagUserService
 
     /**
      * 修改用户标签
-     * @param fsUserId 用户ID
+     * @param fsUserIds 用户ID集合
      * @param tagIds   标签ID集合
      */
-    void changeUserTags(Long fsUserId, List<Long> tagIds);
+    void changeUserTags(List<Long> fsUserIds, List<Long> tagIds);
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyTagUserServiceImpl.java

@@ -140,33 +140,35 @@ public class CompanyTagUserServiceImpl implements ICompanyTagUserService
 
     /**
      * 修改用户标签
-     * @param fsUserId 用户ID
+     * @param fsUserIds 用户ID
      * @param tagIds   标签ID集合
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void changeUserTags(Long fsUserId, List<Long> tagIds) {
-        FsUser fsUser = fsUserMapper.selectFsUserById(fsUserId);
-        if (Objects.isNull(fsUser)) {
-            throw new ServiceException("用户不存在");
-        }
+    public void changeUserTags(List<Long> fsUserIds, List<Long> tagIds) {
+        fsUserIds.forEach(fsUserId -> {
+            FsUser fsUser = fsUserMapper.selectFsUserById(fsUserId);
+            if (Objects.isNull(fsUser)) {
+                return;
+            }
 
-        // 删除原标签
-        Map<String, Object> params = new HashMap<>();
-        params.put("userId", fsUserId);
-        params.put("companyId", fsUser.getCompanyId());
-        params.put("companyUserId", fsUser.getCompanyUserId());
-        companyTagUserMapper.deleteCompanyTagUserByMap(params);
-
-        // 不为空则添加新标签
-        if (Objects.nonNull(tagIds) && !tagIds.isEmpty()) {
-            CompanyTagUser companyTagUser = new CompanyTagUser();
-            companyTagUser.setUserId(fsUserId);
-            companyTagUser.setCompanyId(fsUser.getCompanyId());
-            companyTagUser.setCompanyUserId(fsUser.getCompanyUserId());
-            companyTagUser.setTagIds(tagIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
-            companyTagUser.setCreateTime(new Date());
-            companyTagUserMapper.insertCompanyTagUser(companyTagUser);
-        }
+            // 删除原标签
+            Map<String, Object> params = new HashMap<>();
+            params.put("userId", fsUserId);
+            params.put("companyId", fsUser.getCompanyId());
+            params.put("companyUserId", fsUser.getCompanyUserId());
+            companyTagUserMapper.deleteCompanyTagUserByMap(params);
+
+            // 不为空则添加新标签
+            if (Objects.nonNull(tagIds) && !tagIds.isEmpty()) {
+                CompanyTagUser companyTagUser = new CompanyTagUser();
+                companyTagUser.setUserId(fsUserId);
+                companyTagUser.setCompanyId(fsUser.getCompanyId());
+                companyTagUser.setCompanyUserId(fsUser.getCompanyUserId());
+                companyTagUser.setTagIds(tagIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
+                companyTagUser.setCreateTime(new Date());
+                companyTagUserMapper.insertCompanyTagUser(companyTagUser);
+            }
+        });
     }
 }

fs-service-system/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -74,5 +74,7 @@ public class FsUserPageListVO {
     @ApiModelProperty(value = "销售名称")
     private String companyUserNickName;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
 }