Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

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

@@ -327,16 +327,15 @@ public class FsUserCourseVideoController extends AppBaseController {
     @ApiOperation("会员批量发送课程消息")
     @PostMapping("/batchSendCourse")
     public OpenImResponseDTO batchSendCourse(@RequestBody BatchSendCourseDTO batchSendCourseDTO) throws JsonProcessingException {
-        if (CollectionUtils.isNotEmpty(batchSendCourseDTO.getUserIds())){
-            throw new RuntimeException("请选择会员信息！！");
-        }
         // 生成看课短链
         FsCourseLinkCreateParam fsCourseLinkCreateParam = new FsCourseLinkCreateParam();
         BeanUtils.copyProperties(batchSendCourseDTO, fsCourseLinkCreateParam);
         R courseSortLink = fsUserCourseService.createAppCourseSortLink(fsCourseLinkCreateParam);
         String url = courseSortLink.get("url").toString();
         batchSendCourseDTO.setUrl(url);
-        batchSendCourseDTO.setIsUrgeCourse(false);
+        if(batchSendCourseDTO.getIsUrgeCourse()==null){
+            batchSendCourseDTO.setIsUrgeCourse(false);
+        }
         return openIMService.batchSendCourse(batchSendCourseDTO);
     }
 

fs-service/src/main/java/com/fs/im/service/impl/OpenIMServiceImpl.java

@@ -1314,6 +1314,7 @@ public class OpenIMServiceImpl implements OpenIMService {
             Map<String,Object> param = new HashMap<>();
             param.put("tagIds", batchSendCourseDTO.getTagIds());
             param.put("companyUserId", batchSendCourseDTO.getCompanyUserId());
+            param.put("projectId", batchSendCourseDTO.getProjectId());
             List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectFsUserCompanyUserByIds(param);
             if(fsUserCompanyUsers.isEmpty()){
                 log.error("没有消息接收人，参数：{}", batchSendCourseDTO);

fs-service/src/main/resources/mapper/course/FsUserCompanyUserMapper.xml

@@ -191,6 +191,9 @@
             <if test="param.companyUserId != null">
                 and fs_user_company_user.company_user_id = #{param.companyUserId}
             </if>
+            <if test="param.projectId != null ">
+                and fs_user_company_user.project_id = #{param.projectId}
+            </if>
         </where>
     </select>