曲目审核流程

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

@@ -26,6 +26,12 @@ public class TeacherMusicSheetAuditReq {
     @ApiModelProperty(value = "曲谱渲染图",required = true)
     private String musicImg;
 
+    @ApiModelProperty("首调")
+    private String firstTone;
+
+    @ApiModelProperty("固定调")
+    private String fixedTone;
+
     @ApiModelProperty(value = "审批状态（PASS：通过，UNPASS：不通过）",required = true)
     @NotNull(message = "审批状态不为空 ")
     private AuthStatusEnum authStatus;
@@ -142,4 +148,20 @@ public class TeacherMusicSheetAuditReq {
     public void setAudioFileUrl(String audioFileUrl) {
         this.audioFileUrl = audioFileUrl;
     }
+
+    public String getFirstTone() {
+        return firstTone;
+    }
+
+    public void setFirstTone(String firstTone) {
+        this.firstTone = firstTone;
+    }
+
+    public String getFixedTone() {
+        return fixedTone;
+    }
+
+    public void setFixedTone(String fixedTone) {
+        this.fixedTone = fixedTone;
+    }
 }

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

@@ -640,4 +640,14 @@ public class MusicSheet implements Serializable {
 		this.audioFileUrl = audioFileUrl;
 		return this;
 	}
+
+	public MusicSheet firstTone(String firstTone) {
+		this.firstTone = firstTone;
+		return this;
+	}
+
+	public MusicSheet fixedTone(String fixedTone) {
+		this.fixedTone = fixedTone;
+		return this;
+	}
 }

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

@@ -123,8 +123,11 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
         // 群发消息记录
         List<CustomerServiceBatchSendingWrapper.CustomerServiceBatchSending> sendings = baseMapper.selectPage(page, query);
 
-        // 返回消息封闭
-        getBatchSendingPaddingData(sendings);
+        if (CollectionUtils.isNotEmpty(sendings)) {
+
+            // 返回消息封闭
+            getBatchSendingPaddingData(sendings);
+        }
 
         return page.setRecords(sendings);
     }
@@ -459,7 +462,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
                             .eq(CustomerServiceBatchSending::getId, info.getId())
                             .set(CustomerServiceBatchSending::getSendStatus, EImSendStatus.SEND)
                             .set(CustomerServiceBatchSending::getReceiveNumber, receiveNums.stream().mapToInt(Integer::intValue).sum())
-                            .set(CustomerServiceBatchSending::getSendTime, Optional.ofNullable(info.getSendTime()).orElse(DateTime.now().toDate()))
+                            .set(CustomerServiceBatchSending::getSendTime, DateTime.now().toDate())
                             .update();
 
                 } catch (Exception e) {
@@ -526,8 +529,10 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
 
         if (StringUtils.isNotEmpty(info.getImgMessage())) {
 
+            //String suffix = info.getImgMessage().substring(info.getImgMessage().lastIndexOf("."));
+
             // 发送图片消息
-            ImgMessage imgMessage = new ImgMessage(ImUtil.imageToBase64(info.getImgMessage(), "png"), "", info.getImgUrl());
+            ImgMessage imgMessage = new ImgMessage(ImUtil.imageToBase64(info.getImgMessage(), "png"), "", info.getImgMessage());
 
             messages.add(imgMessage);
         }

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

@@ -710,6 +710,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     .showFingering(param.getShowFingering())
                     //.hasBeat(param.getHasBeat())
                     .mp3Type(param.getMp3Type())
+                    .firstTone(Optional.ofNullable(param.getFirstTone()).orElse(musicSheet.getFirstTone()))
+                    .fixedTone(Optional.ofNullable(param.getFixedTone()).orElse(musicSheet.getFixedTone()))
                     //.audioType(param.getAudioType())
                     //.audioFileUrl(param.getAudioFileUrl())
                     .setState(YesOrNoEnum.YES);