Merge remote-tracking branch 'origin/master'

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkProviderController.java

@@ -57,16 +57,14 @@ public class BlinkProviderController {
 
     @Operation(summary = "获取服务商入库审核信息")
     @GetMapping("/supports/provider/audit/query/{providerId}")
-    @NoNeedLogin
     public ResponseDTO<BlinkProviderStorageDTO> supportsProviderAuditQuery(@PathVariable("providerId") String providerId) {
         return providerService.supportsProviderAuditQuery(providerId);
     }
 
     @Operation(summary = "获取服务商入库保证金信息")
-    @GetMapping("/supports/provider/margin/query/{providerId}")
-    @NoNeedLogin
-    public ResponseDTO<List<BlinkStorageMarginDTO>> supportsStorageMarginQuery(@PathVariable("providerId") String providerId) {
-        return providerService.supportsStorageMarginQuery(providerId);
+    @PostMapping("/supports/provider/margin/query")
+    public ResponseDTO<PageResult<BlinkStorageMarginDTO>> supportsStorageMarginQueryPage(@RequestBody @Valid BlinkProviderQry qry) {
+        return providerService.supportsStorageMarginQueryPage(qry);
     }
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/EmployeeFileController.java

@@ -24,7 +24,7 @@ public class EmployeeFileController extends SupportBaseController {
 
 
     @Operation(summary = "文件上传 @author admin")
-    @PostMapping("/employee/file/upload")
+    @PostMapping("/file/upload/employee")
     @NoNeedLogin
     public ResponseDTO<FileUploadVO> upload(@RequestParam MultipartFile file, @RequestParam Integer folder) {
         RequestUser requestUser = BlinkRequestUtil.getRequestUser();

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkActivityMemberDO.java

@@ -40,4 +40,9 @@ public class BlinkActivityMemberDO extends BaseEntity {
      * 活动ID
      */
     private Long activityId;
+
+    /**
+     * 人员ID
+     */
+    private Long employeeId;
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkActivityMemberDTO.java

@@ -38,6 +38,11 @@ public class BlinkActivityMemberDTO extends BaseEntity {
      */
     private Long activityId;
 
+    /**
+     * 人员ID
+     */
+    private Long employeeId;
+
     /**
      * 营销人
      */

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkActivityMemberServiceImpl.java

@@ -67,9 +67,9 @@ public class BlinkActivityMemberServiceImpl extends ServiceImpl<BlinkActivityMem
             return ResponseDTO.dataErrorParam("留资客户不存在!请检查");
         }
         // 查询营销人
-        List<FrameworkDTO> marketer = frameworkService.supportsGroupQuery(id);
+        List<FrameworkDTO> marketer = frameworkService.supportsGroupQuery(memberDO.getEmployeeId());
         // 查询营销团队
-        List<FrameworkDTO> marketingTeam = frameworkService.supportsPersonnelQuery(id);
+        List<FrameworkDTO> marketingTeam = frameworkService.supportsPersonnelQuery(memberDO.getEmployeeId());
         // 生成DO
         BlinkActivityMemberDTO activityMemberDTO = new BlinkActivityMemberDTO();
         mapper.toBlinkActivityMemberDTO(memberDO, activityMemberDTO);
@@ -92,6 +92,11 @@ public class BlinkActivityMemberServiceImpl extends ServiceImpl<BlinkActivityMem
         if (!Objects.nonNull(memberDO)) {
             return ResponseDTO.dataErrorParam("成员信息不存在!请检查");
         }
+        // 验证留资客户是否重复
+        BlinkActivityMemberDO memberDO1 = repository.queryByMarketer(dto.getMarketer(), null, Boolean.FALSE);
+        if (Objects.nonNull(memberDO1)) {
+            return ResponseDTO.dataErrorParam("成员名称重复!请检查");
+        }
         // 生成DO
         BlinkActivityMemberDO activityMemberDO = new BlinkActivityMemberDO();
         mapper.toBlinkActivityMemberDO(dto, activityMemberDO);

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkProviderServiceImpl.java

@@ -125,7 +125,7 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
     }
 
     @Override
-    public ResponseDTO<List<BlinkStorageMarginDTO>> supportsStorageMarginQuery(String providerId) {
+    public ResponseDTO<PageResult<BlinkStorageMarginDTO>> supportsStorageMarginQueryPage(BlinkProviderQry qry) {
         BlinkStorageMarginDTO marginDTO = new BlinkStorageMarginDTO();
         marginDTO.setProviderId("1");
         marginDTO.setMarginName("入库保证金");
@@ -139,6 +139,11 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
         List<BlinkStorageMarginDTO> marginDTOS = new ArrayList<>();
         marginDTOS.add(marginDTO);
         marginDTOS.add(marginDTO);
-        return ResponseDTO.ok(marginDTOS);
+        marginDTOS.add(marginDTO);
+        marginDTOS.add(marginDTO);
+        marginDTOS.add(marginDTO);
+        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
+        PageResult<BlinkStorageMarginDTO> pageResult = BlinkPageUtil.convert2PageResult(page, marginDTOS);
+        return ResponseDTO.ok(pageResult);
     }
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/FrameworkServiceImpl.java

@@ -46,12 +46,12 @@ public class FrameworkServiceImpl implements IFrameworkService {
     /**
      * 查询人员
      *
-     * @param id
+     * @param employeeId
      * @return
      */
     @Override
-    public List<FrameworkDTO> supportsPersonnelQuery(Long id) {
-        PersonnelDO employeeDO = pRepository.selectById(id);
+    public List<FrameworkDTO> supportsPersonnelQuery(Long employeeId) {
+        PersonnelDO employeeDO = pRepository.selectById(employeeId);
         List<DepartmentDTO> departmentDTOSChild = dRepository.queryDepartmentByDepartmentId(employeeDO.getDepartmentId());
         Set<Long> ids = departmentDTOSChild.stream().map(DepartmentDTO::getParentId)
                 .collect(Collectors.toSet());
@@ -82,12 +82,12 @@ public class FrameworkServiceImpl implements IFrameworkService {
     /**
      * 查询人员
      *
-     * @param id
+     * @param employeeId
      * @return
      */
     @Override
-    public List<FrameworkDTO> supportsGroupQuery(Long id) {
-        PersonnelDO employeeDO = pRepository.selectById(id);
+    public List<FrameworkDTO> supportsGroupQuery(Long employeeId) {
+        PersonnelDO employeeDO = pRepository.selectById(employeeId);
         List<DepartmentDTO> departmentDTO = dRepository.queryDepartmentByDepartmentId(employeeDO.getDepartmentId());
         List<FrameworkDTO> frameworkDTOS = new ArrayList<>();
         for (DepartmentDTO dto : departmentDTO) {

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkProviderService.java

@@ -47,10 +47,10 @@ public interface IBlinkProviderService {
     /**
      * 获取服务商入库保证金信息
      *
-     * @param providerId
+     * @param qry
      * @return
      */
-    ResponseDTO<List<BlinkStorageMarginDTO>> supportsStorageMarginQuery(String providerId);
+    ResponseDTO<PageResult<BlinkStorageMarginDTO>> supportsStorageMarginQueryPage(BlinkProviderQry qry);
 
 
     /**

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IFrameworkService.java

@@ -19,16 +19,16 @@ public interface IFrameworkService {
     /**
      * 查询人员
      *
-     * @param id
+     * @param employeeId
      * @return
      */
-    List<FrameworkDTO> supportsPersonnelQuery(Long id);
+    List<FrameworkDTO> supportsPersonnelQuery(Long employeeId);
 
     /**
      * 查询人员
      *
-     * @param id
+     * @param employeeId
      * @return
      */
-    List<FrameworkDTO> supportsGroupQuery(Long id);
+    List<FrameworkDTO> supportsGroupQuery(Long employeeId);
 }