liujunchi 3 年之前
父节点
当前提交
c506f2d3d5
共有 15 个文件被更改,包括 271 次插入122 次删除
  1. 0 16
      cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PmsPortalProductController.java
  2. 51 0
      cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/open/OpenShareController.java
  3. 34 0
      cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/ShareProfitParam.java
  4. 2 2
      cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/PmsPortalProductServiceImpl.java
  5. 34 0
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ShareProfitParam.java
  6. 25 16
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java
  7. 1 1
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java
  8. 3 3
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java
  9. 11 23
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseGroupShareVo.java
  10. 6 6
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ShareProfitVo.java
  11. 1 15
      cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MemberPriceSettingsController.java
  12. 8 21
      cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java
  13. 1 9
      cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseGroupController.java
  14. 1 10
      cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java
  15. 93 0
      cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

+ 0 - 16
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PmsPortalProductController.java

@@ -95,20 +95,4 @@ public class PmsPortalProductController {
     }
 
 
-    @ApiOperation(value = "老师商品分享分润")
-    @GetMapping(value="/profit/{productId}")
-    @ResponseBody
-    public CommonResult shareProductProfit(@PathVariable Long productId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return CommonResult.failed("用户信息获取失败");
-        }
-        HttpResponseResult<String> client = sysUserFeignService.client();
-        if (client.getStatus()) {
-            if (!StringUtil.isEmpty(client.getData()) && "teacher".equals(client.getData())) {
-                return CommonResult.success(portalProductService.shareProductProfit(sysUser, productId));
-            }
-        }
-        return CommonResult.failed("分享功能暂未开放");
-    }
 }

+ 51 - 0
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/open/OpenShareController.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.portal.controller.open;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.mall.common.api.CommonResult;
+import com.yonge.cooleshow.portal.dto.ShareProfitParam;
+import com.yonge.cooleshow.portal.service.PmsPortalProductService;
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/open")
+@Api(value = "开放权限接口-分享", hidden = true)
+public class OpenShareController extends BaseController {
+    private final static Logger log = LoggerFactory.getLogger(OpenShareController.class);
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private PmsPortalProductService portalProductService;
+
+
+    @ApiOperation(value = "老师商品分享分润")
+    @PostMapping(value="/productProfit")
+    @ResponseBody
+    public CommonResult shareProductProfit(@RequestBody ShareProfitParam param) {
+        SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
+        if (sysUser == null  || sysUser.getId() == null) {
+            return CommonResult.failed("用户信息获取失败");
+        }
+        HttpResponseResult<String> client = sysUserFeignService.client();
+        if (client.getStatus()) {
+            if (!StringUtil.isEmpty(client.getData()) && "teacher".equals(client.getData())) {
+                return CommonResult.success(portalProductService.shareProductProfit(sysUser, param.getBizId()));
+            }
+        } else {
+            return CommonResult.success(portalProductService.shareProductProfit(sysUser, param.getBizId()));
+        }
+        return CommonResult.failed("分享功能暂未开放");
+    }
+}

+ 34 - 0
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/ShareProfitParam.java

@@ -0,0 +1,34 @@
+package com.yonge.cooleshow.portal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-07-22
+ */
+public class ShareProfitParam {
+
+    @ApiModelProperty("分享人id")
+    private Long userId;
+
+    @ApiModelProperty("曲目/直播课/视频课 id")
+    private Long bizId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+}

+ 2 - 2
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -205,9 +205,9 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
         shareProductVo.setAvatar(sysUser.getAvatar());
         shareProductVo.setTeacherId(sysUser.getId());
         shareProductVo.setName(sysUser.getUsername());
-        String url = adminFeignService.findConfigValue(SysConfigConstant.TEACHER_PRODUCT_SHARE_PROFIT_URL).getData();
+        // String url = adminFeignService.findConfigValue(SysConfigConstant.TEACHER_PRODUCT_SHARE_PROFIT_URL).getData();
 
-        shareProductVo.setUrl(MessageFormatter.arrayFormat(url, detail.getProduct().getId(), sysUser.getId()));
+        // shareProductVo.setUrl(MessageFormatter.arrayFormat(url, detail.getProduct().getId(), sysUser.getId()));
 
         return shareProductVo;
     }

+ 34 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ShareProfitParam.java

@@ -0,0 +1,34 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-07-22
+ */
+public class ShareProfitParam {
+
+    @ApiModelProperty("分享人id")
+    private Long userId;
+
+    @ApiModelProperty("曲目/直播课/视频课 id")
+    private Long bizId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+}

+ 25 - 16
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -107,6 +107,16 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
      */
     @Override
     public LiveCourseInfoVo queryLiveCourseInfo(Long groupId) {
+        return queryLiveCourseInfo(groupId,getSysUser());
+    }
+
+    /**
+     * 查询课程组详情-直播课详情
+     *
+     * @param groupId 课程组id
+     */
+
+    private LiveCourseInfoVo queryLiveCourseInfo(Long groupId,SysUser sysUser) {
         CourseGroup group = Optional.ofNullable(groupId).map(this::getById)
                 .orElseThrow(() -> new BizException("课程组信息不存在"));
 
@@ -126,12 +136,14 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         result.setSalesEndDate(group.getSalesEndDate());
         result.setMixStudentNum(group.getMixStudentNum());
         result.setImGroupId(group.getImGroupId());
-        Optional.ofNullable(group.getTeacherId()).map(this::getSysUser)
-                .ifPresent(sysUser -> {
-                    result.setTeacherName(sysUser.getRealName());
-                    result.setUserName(sysUser.getUsername());
-                    result.setAvatar(sysUser.getAvatar());
-                });
+        SysUser teacher = getSysUser(group.getTeacherId());
+        if (teacher == null) {
+            throw new BizException("用户不存在");
+        }
+
+        result.setTeacherName(teacher.getRealName());
+        result.setUserName(teacher.getUsername());
+        result.setAvatar(teacher.getAvatar());
         Optional.ofNullable(group.getSubjectId()).map(subjectService::get)
                 .ifPresent(subject -> result.setSubjectName(subject.getName()));
         //课程组计划
@@ -142,7 +154,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         param.put("orderState", OrderStatusEnum.PAID.getCode());
         result.setStudentList(courseScheduleStudentPaymentService.queryStudentInfoByGroupId(param));
         //查询是否购买过该课程组
-        Long id = getSysUser().getId();
+        Long id = sysUser.getId();
 
         //这里修改为,订单完成后才算购买过,待支付和支付中订单不算
         //因为页面再点击购买按钮时,会请求/userOrder/getPendingOrder接口,如果有支付中的订单,用户选择继续支付或取消订单
@@ -1203,16 +1215,13 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
 
     @Override
     public ShareProfitVo shareLiveCourseProfit(SysUser sysUser, Long liveGroupId) {
-        CourseGroup courseGroup = this.getById(liveGroupId);
-        SysUser teacher = this.getSysUser(courseGroup.getTeacherId());
+        LiveCourseInfoVo liveCourseInfoVo = queryLiveCourseInfo(liveGroupId, sysUser);
+        SysUser teacher = this.getSysUser(liveCourseInfoVo.getTeacherId());
 
         LiveCourseGroupShareVo liveCourseGroupShareVo = new LiveCourseGroupShareVo();
-        BeanUtils.copyProperties(courseGroup,liveCourseGroupShareVo);
-        liveCourseGroupShareVo.setTeacherAvatar(teacher.getAvatar());
-        liveCourseGroupShareVo.setTeacherName(teacher.getUsername());
-        Subject subject = subjectService.get(courseGroup.getSubjectId());
-
-        liveCourseGroupShareVo.setSubjectName(subject.getName());
+        BeanUtils.copyProperties(liveCourseInfoVo,liveCourseGroupShareVo);
+        liveCourseGroupShareVo.setShareTeacherAvatar(teacher.getAvatar());
+        liveCourseGroupShareVo.setShareTeacherName(teacher.getUsername());
 
         String teacherLiveGroupShareProfitUrl= sysConfigService.findConfigValue(SysConfigConstant.TEACHER_LIVE_GROUP_SHARE_PROFIT_URL);
 
@@ -1220,7 +1229,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         result.setTeacherId(sysUser.getId());
         result.setType("LIVE");
         result.setLiveCourseGroup(liveCourseGroupShareVo);
-        result.setUrl(MessageFormatter.arrayFormat(teacherLiveGroupShareProfitUrl, courseGroup.getId(), sysUser.getId()));
+        result.setUrl(MessageFormatter.arrayFormat(teacherLiveGroupShareProfitUrl,liveGroupId, sysUser.getId()));
         result.setName(sysUser.getUsername());
         result.setAvatar(sysUser.getAvatar());
         return result;

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -871,7 +871,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Override
     public ShareProfitVo shareMusicSheetProfit(SysUser sysUser, Long musicSheetId) {
         ShareProfitVo result = new ShareProfitVo();
-        MusicSheet musicSheet = getById(musicSheetId);
+        MusicSheetDetailVo musicSheet = detail(musicSheetId,null,null);
 
         result.setTeacherId(sysUser.getId());
         result.setType("MUSIC");

+ 3 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java

@@ -378,15 +378,15 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     @Override
     public ShareProfitVo shareVideoCourseProfit(SysUser sysUser, Long videoGroupId) {
 
-        VideoLessonGroupVo detail = detail(videoGroupId);
+        VideoLessonStudentVo videoLessonStudentVo = selectVideoLesson(videoGroupId);
 
         String teacherVideoGroupShareProfitUrl= sysConfigService.findConfigValue(SysConfigConstant.TEACHER_VIDEO_GROUP_SHARE_PROFIT_URL);
 
         ShareProfitVo result = new ShareProfitVo();
         result.setType("VIDEO");
         result.setTeacherId(sysUser.getId());
-        result.setVideoGroup(detail);
-        result.setUrl(MessageFormatter.arrayFormat(teacherVideoGroupShareProfitUrl, detail.getId(), sysUser.getId()));
+        result.setVideoGroup(videoLessonStudentVo);
+        result.setUrl(MessageFormatter.arrayFormat(teacherVideoGroupShareProfitUrl, videoGroupId, sysUser.getId()));
         result.setName(sysUser.getUsername());
         result.setAvatar(sysUser.getAvatar());
         return result;

+ 11 - 23
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseGroupShareVo.java

@@ -11,40 +11,28 @@ import io.swagger.annotations.ApiModelProperty;
  * @date 2022-07-20
  */
 @ApiModel("直播课分享")
-public class LiveCourseGroupShareVo extends CourseGroup {
+public class LiveCourseGroupShareVo extends LiveCourseInfoVo {
 
 
     @ApiModelProperty("老师名称")
-    private String teacherName;
+    private String shareTeacherName;
 
     @ApiModelProperty("老师头像")
-    private String teacherAvatar;
+    private String shareTeacherAvatar;
 
-    @ApiModelProperty("声部名")
-    private String subjectName;
-
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
+    public String getShareTeacherName() {
+        return shareTeacherName;
     }
 
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
+    public void setShareTeacherName(String shareTeacherName) {
+        this.shareTeacherName = shareTeacherName;
     }
 
-    public String getTeacherAvatar() {
-        return teacherAvatar;
+    public String getShareTeacherAvatar() {
+        return shareTeacherAvatar;
     }
 
-    public void setTeacherAvatar(String teacherAvatar) {
-        this.teacherAvatar = teacherAvatar;
+    public void setShareTeacherAvatar(String shareTeacherAvatar) {
+        this.shareTeacherAvatar = shareTeacherAvatar;
     }
 }

+ 6 - 6
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ShareProfitVo.java

@@ -29,13 +29,13 @@ public class ShareProfitVo {
     private String type;
 
     @ApiModelProperty("乐谱信息")
-    private MusicSheet musicSheet;
+    private MusicSheetDetailVo musicSheet;
 
     @ApiModelProperty("直播课程组信息")
     private LiveCourseGroupShareVo liveCourseGroup;
 
     @ApiModelProperty("视频课信息")
-    private VideoLessonGroupVo videoGroup;
+    private VideoLessonStudentVo videoGroup;
 
     @ApiModelProperty("会员信息")
     private MemberPriceSettingsVo vip;
@@ -56,11 +56,11 @@ public class ShareProfitVo {
         this.vip = vip;
     }
 
-    public VideoLessonGroupVo getVideoGroup() {
+    public VideoLessonStudentVo getVideoGroup() {
         return videoGroup;
     }
 
-    public void setVideoGroup(VideoLessonGroupVo videoGroup) {
+    public void setVideoGroup(VideoLessonStudentVo videoGroup) {
         this.videoGroup = videoGroup;
     }
 
@@ -80,11 +80,11 @@ public class ShareProfitVo {
         this.type = type;
     }
 
-    public MusicSheet getMusicSheet() {
+    public MusicSheetDetailVo getMusicSheet() {
         return musicSheet;
     }
 
-    public void setMusicSheet(MusicSheet musicSheet) {
+    public void setMusicSheet(MusicSheetDetailVo musicSheet) {
         this.musicSheet = musicSheet;
     }
 

+ 1 - 15
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MemberPriceSettingsController.java

@@ -1,13 +1,10 @@
 package com.yonge.cooleshow.teacher.controller;
 
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.entity.SysConfig;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
-import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -27,8 +24,7 @@ public class MemberPriceSettingsController extends BaseController {
 	private MemberPriceSettingsService memberPriceSettingsService;
 	@Autowired
 	private SysConfigService sysConfigService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
+
 	/**
 	 * 查询单条
 	 */
@@ -55,14 +51,4 @@ public class MemberPriceSettingsController extends BaseController {
 	}
 
 
-
-	@ApiOperation(value = "老师VIP分享分润")
-	@GetMapping(value="/vipProfit/{vipId}")
-	public HttpResponseResult<ShareProfitVo> shareVipProfit(@PathVariable Long vipId) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null  || sysUser.getId() == null) {
-			return failed("用户信息获取失败");
-		}
-		return succeed(memberPriceSettingsService.shareVipProfit(sysUser,vipId));
-	}
 }

+ 8 - 21
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -3,27 +3,23 @@ package com.yonge.cooleshow.teacher.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
-
-import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
-
-import com.yonge.cooleshow.common.enums.SysUserType;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
-import com.yonge.toolset.base.page.QueryInfo;
-import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetShareVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.SysUserType;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.base.page.QueryInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -190,14 +186,5 @@ public class MusicSheetController extends BaseController {
     }
 
 
-    @ApiOperation(value = "老师乐谱分享分润")
-    @GetMapping(value="/share/profit/{musicSheetId}")
-    public HttpResponseResult<ShareProfitVo> shareMusicSheetProfit(@PathVariable Long musicSheetId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(musicSheetService.shareMusicSheetProfit(sysUser,musicSheetId));
-    }
 
 }

+ 1 - 9
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseGroupController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.CheckCourseTimeDto;
 import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
+import com.yonge.cooleshow.biz.dal.dto.search.ShareProfitParam;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
@@ -125,14 +126,5 @@ public class TeacherCourseGroupController extends BaseController {
 
 
 
-    @ApiOperation(value = "老师直播课分享分润")
-    @GetMapping(value= "/liveShareProfit/{liveGroupId}")
-    public HttpResponseResult<ShareProfitVo> shareLiveCourseProfit(@PathVariable Long liveGroupId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(courseGroupService.shareLiveCourseProfit(sysUser, liveGroupId));
-    }
 }
 

+ 1 - 10
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.teacher.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.ShareProfitParam;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
@@ -174,14 +175,4 @@ public class VideoLessonGroupController extends BaseController {
     }
 
 
-
-    @ApiOperation(value = "老师视频课分享分润")
-    @GetMapping(value= "/videoShareProfit/{videoGroupId}")
-    public HttpResponseResult<ShareProfitVo> shareVideoCourseProfit(@PathVariable Long videoGroupId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(videoLessonGroupService.shareVideoCourseProfit(sysUser, videoGroupId));
-    }
 }

+ 93 - 0
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -0,0 +1,93 @@
+package com.yonge.cooleshow.teacher.controller.open;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.search.ShareProfitParam;
+import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
+import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/open")
+@Api(value = "开放权限接口-分享", hidden = true)
+public class OpenShareController extends BaseController {
+    private final static Logger log = LoggerFactory.getLogger(OpenShareController.class);
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private VideoLessonGroupService videoLessonGroupService;
+
+    @Autowired
+    private MusicSheetService musicSheetService;
+
+    @Autowired
+    private MemberPriceSettingsService memberPriceSettingsService;
+
+    /**
+     * 服务对象
+     */
+    @Resource
+    private CourseGroupService courseGroupService;
+
+    @ApiOperation(value = "老师乐谱分享分润")
+    @PostMapping(value="/musicShareProfit")
+    public HttpResponseResult<ShareProfitVo> shareMusicSheetProfit(@RequestBody ShareProfitParam param) {
+        SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        return succeed(musicSheetService.shareMusicSheetProfit(sysUser,param.getBizId()));
+    }
+
+
+    @ApiOperation(value = "老师直播课分享分润")
+    @PostMapping(value= "/liveShareProfit")
+    public HttpResponseResult<ShareProfitVo> shareLiveCourseProfit(@RequestBody ShareProfitParam param) {
+        SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        return succeed(courseGroupService.shareLiveCourseProfit(sysUser, param.getBizId()));
+    }
+
+
+
+    @ApiOperation(value = "老师视频课分享分润")
+    @PostMapping(value= "/videoShareProfit")
+    public HttpResponseResult<ShareProfitVo> shareVideoCourseProfit(@RequestBody ShareProfitParam param) {
+        SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        return succeed(videoLessonGroupService.shareVideoCourseProfit(sysUser, param.getBizId()));
+    }
+
+
+
+    @ApiOperation(value = "老师VIP分享分润")
+    @PostMapping(value="/vipProfit")
+    public HttpResponseResult<ShareProfitVo> shareVipProfit(@RequestBody ShareProfitParam param) {
+        SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        return succeed(memberPriceSettingsService.shareVipProfit(sysUser,param.getBizId()));
+    }
+}