Merge remote-tracking branch 'origin/master'

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -171,4 +171,7 @@ public interface SysConfigConstant {
      * @Date: 2022/6/1
      */
     String DESTROY_EXPIRED_PIANO_ROOM_MINUTE = "destroy_expired_piano_room_minute";
+
+    /** 老师分享曲目二维码跳转链接 */
+    String TEACHER_MUSIC_SHEET_SHARE_URL = "teacher_music_sheet_share_url";
 }

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

@@ -23,6 +23,7 @@ import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.string.MessageFormatter;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.easyexcel.ErrMsg;
 import com.yonge.toolset.utils.easyexcel.ExcelDataReaderProperty;
@@ -158,6 +159,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         musicSheetShareVo.setMusicSheetVoList(musicSheetVoIPage.getRecords());
         musicSheetShareVo.setName(sysUser.getUsername());
         musicSheetShareVo.setAvatar(sysUser.getAvatar());
+
+        String teacherMusicShareUrl= sysConfigService.findConfigValue(SysConfigConstant.TEACHER_MUSIC_SHEET_SHARE_URL);
+        musicSheetShareVo.setUrl(MessageFormatter.arrayFormat(teacherMusicShareUrl, sysUser.getId()));
+
         return musicSheetShareVo;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetShareVo.java

@@ -20,6 +20,9 @@ public class MusicSheetShareVo {
     @ApiModelProperty("老师头像")
     private String avatar;
 
+    @ApiModelProperty("二维码链接")
+    private String url;
+
     @ApiModelProperty("乐谱数量")
     private Long musicSheetCount;
 
@@ -57,4 +60,12 @@ public class MusicSheetShareVo {
     public void setMusicSheetVoList(List<MusicSheetVo> musicSheetVoList) {
         this.musicSheetVoList = musicSheetVoList;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }