Merge branch 'dev_v1.3.4_20220919'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/AdminClient.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.admin.controller.open;
 
-import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.admin.io.request.coupon.CouponOrderVO;
 import com.yonge.cooleshow.api.feign.dto.CouponInfoApi;
 import com.yonge.cooleshow.api.feign.dto.EmployeeApi;
@@ -10,14 +9,16 @@ import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
-import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.service.CouponInfoService;
+import com.yonge.cooleshow.biz.dal.service.EmployeeService;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.service.UserFirstTimeService;
 import com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponOrderWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.ContractDto;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +27,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.Arrays;

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/im/ImUserFriendController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/ImUserFriendController.java

@@ -1,4 +1,4 @@
-package com.yonge.cooleshow.admin.controller.im;
+package com.yonge.cooleshow.admin.controller.open;
 
 import com.yonge.cooleshow.admin.io.request.im.UserFriendInfoVO;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
@@ -7,7 +7,6 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +22,7 @@ import javax.annotation.Resource;
  */
 @Api(tags = "用户通讯录表")
 @RestController
-@RequestMapping("/im")
+@RequestMapping("/open/im")
 public class ImUserFriendController extends BaseController {
 
     // 新用户注册，默认添加官方客服联系人配置

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -43,12 +43,18 @@ public class TeacherMusicSheetAuditReq {
     @ApiModelProperty(value = "是否展示指法(0:否;1:是)")
     private YesOrNoEnum showFingering;  //是否展示指法(0:否;1:是)
 
-    @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)", hidden = true)
+    @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
     private YesOrNoEnum hasBeat;  //是否自带节拍器(0:否;1:是)
 
     @ApiModelProperty(value = "mp3类型 MP3：mp3, MP3_METRONOME:MP3_METRONOME,")
     private AudioTypeEnum mp3Type;
 
+    @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi,")
+    private AudioTypeEnum audioType;
+
+    @ApiModelProperty(value = "音频文件存储路径")
+    private String audioFileUrl;  //音频文件存储路径
+
     public String getMusicImg() {
         return musicImg;
     }
@@ -120,4 +126,20 @@ public class TeacherMusicSheetAuditReq {
     public void setMp3Type(AudioTypeEnum mp3Type) {
         this.mp3Type = mp3Type;
     }
+
+    public AudioTypeEnum getAudioType() {
+        return audioType;
+    }
+
+    public void setAudioType(AudioTypeEnum audioType) {
+        this.audioType = audioType;
+    }
+
+    public String getAudioFileUrl() {
+        return audioFileUrl;
+    }
+
+    public void setAudioFileUrl(String audioFileUrl) {
+        this.audioFileUrl = audioFileUrl;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -571,4 +571,14 @@ public class MusicSheet implements Serializable {
 		this.mp3Type = mp3Type;
 		return this;
 	}
+
+	public MusicSheet audioType(AudioTypeEnum audioType) {
+		this.audioType = audioType;
+		return this;
+	}
+
+	public MusicSheet audioFileUrl(String audioFileUrl) {
+		this.audioFileUrl = audioFileUrl;
+		return this;
+	}
 }

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

@@ -436,8 +436,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     .notation(param.getNotation())
                     .canEvaluate(param.getCanEvaluate())
                     .showFingering(param.getShowFingering())
-                    //.hasBeat(param.getHasBeat())
+                    .hasBeat(param.getHasBeat())
                     .mp3Type(param.getMp3Type())
+                    .audioType(param.getAudioType())
+                    .audioFileUrl(param.getAudioFileUrl())
                     .setState(YesOrNoEnum.YES);
             // 替换曲目id
             replaceMusicSheet(param, musicSheet, originalMusicSheetId);