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

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

@@ -397,10 +397,11 @@ public class FsUserCourseVideoController extends AppBaseController {
 
     @ApiOperation("会员批量发送课程消息 发课")
     @PostMapping("/batchSendCourse")
-    public OpenImResponseDTO batchSendCourse(@RequestBody BatchSendCourseDTO batchSendCourseDTO) throws JsonProcessingException {
+    public R batchSendCourse(@RequestBody BatchSendCourseDTO batchSendCourseDTO) throws JsonProcessingException {
 
         if(batchSendCourseDTO.getSendType()==2){
-            throw new RuntimeException("系统维护中，请先用定时发送");
+            log.error("实时发送课程功能系统维护中，请先用定时发送");
+            return R.error("实时发送课程功能系统维护中，请先用定时发送");
         }
 
         // 生成看课短链
@@ -419,7 +420,7 @@ public class FsUserCourseVideoController extends AppBaseController {
         OpenImResponseDTO openImResponseDTO = new OpenImResponseDTO();
         openImResponseDTO.setErrCode(0);
         openImResponseDTO.setErrMsg("异步发送，详细请看明细");
-        return openImResponseDTO;
+        return R.ok().put("data", openImResponseDTO);
     }
 
     @ApiOperation("会员一键催课")