fix

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

@@ -450,4 +450,9 @@ public interface SysConfigConstant {
      * 消息发送频率限制
      */
     String MESSAGE_SEND_LIMIT = "message_send_limit";
+
+    /**
+     * 默认曲目所属人
+     */
+    String DEFAULT_MUSIC_USER_ID = "default_music_user_id";
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
+import com.dayaedu.cbs.openfeign.properties.OpenFeignClientConfigProperties;
 import com.dayaedu.cbs.openfeign.service.CbsMusicSheetService;
 import com.dayaedu.cbs.openfeign.wrapper.music.*;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
@@ -13,10 +14,13 @@ import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.toolset.base.exception.BizException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,12 +40,23 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
     @Resource
     private SubjectService subjectService;
 
+    @Autowired
+    private SysConfigService sysConfigService;
+    @Resource
+    private OpenFeignClientConfigProperties openFeignClientConfigProperties;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveApplicationExtend(List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> addMusicSheet) {
         if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(addMusicSheet)) {
             throw new BizException("请选择曲目信息");
         }
+        String configValue = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_MUSIC_USER_ID);
+        Long userId = 3L;
+        if (StringUtils.isNotBlank(configValue)) {
+            userId = Long.parseLong(configValue);
+        }
+
         List<Long> cbsMusicSheetIds = addMusicSheet.stream().map(e -> e.getMusicSheetId()).collect(Collectors.toList());
         for (CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend extend : addMusicSheet) {
             //是否合奏曲目
@@ -56,6 +71,16 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
                     musicSheetUpdate.setSubjectIds(subjectIds.stream().map(e -> e.getId().toString()).collect(Collectors.joining(",")));
                 }
             }
+            // 如果所属人存在，判断是否是当前应用的曲目 不是，设置默认所属用户
+            if (musicSheetUpdate.getUserId() != null && musicSheetUpdate.getUserApplicationId() !=null) {
+                if (musicSheetUpdate.getUserApplicationId().equals(Long.parseLong(openFeignClientConfigProperties.getAppId()))) {
+                    musicSheetUpdate.setUserId(extend.getMusicSheetUpdate().getUserId());
+                } else {
+                    musicSheetUpdate.setUserId(userId);
+                }
+            } else {
+                musicSheetUpdate.setUserId(userId);
+            }
         }
         //需要修改的曲目
         List<MusicSheet> musicSheets = musicSheetService.lambdaQuery()
@@ -122,6 +147,21 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
                 musicSheetUpdate.setSubjectIds(subjectIds.stream().map(e -> e.getId().toString()).collect(Collectors.joining(",")));
             }
         }
+        // 如果所属人存在，判断是否是当前应用的曲目 不是，设置默认所属用户
+        String configValue = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_MUSIC_USER_ID);
+        Long userId = 3L;
+        if (StringUtils.isNotBlank(configValue)) {
+            userId = Long.parseLong(configValue);
+        }
+        if (musicSheetUpdate.getUserId() != null && musicSheetUpdate.getUserApplicationId() !=null) {
+            if (musicSheetUpdate.getUserApplicationId().equals(Long.parseLong(openFeignClientConfigProperties.getAppId()))) {
+                musicSheetUpdate.setUserId(musicSheetUpdate.getUserId());
+            } else {
+                musicSheetUpdate.setUserId(userId);
+            }
+        } else {
+            musicSheetUpdate.setUserId(userId);
+        }
         musicSheetService.getDao().updateMusicSheet(musicSheetUpdate);
         return true;
     }

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

@@ -650,6 +650,16 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
                 .set(CustomerServiceBatchSending::getReceiveNumber, receiveNums.stream().mapToInt(Integer::intValue).sum())
                 .set(CustomerServiceBatchSending::getSendEndTime, DateTime.now().toDate())
                 .update();
+
+            CustomerServiceBatchSending one = lambdaQuery()
+                .eq(CustomerServiceBatchSending::getSendStatus, EImSendStatus.SENDING)
+                .eq(CustomerServiceBatchSending::getSendFlag, 0)
+                .orderByAsc(CustomerServiceBatchSending::getId)
+                .last("limit 1")
+                .one();
+            if (one !=null) {
+                sendMessage(one);
+            }
         }
     }
 
@@ -841,7 +851,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
                     .lt(CustomerServiceBatchSending::getSendTime, endTime)
 //                    .eq(CustomerServiceBatchSending::getSendType, EImSendType.SCHEDULED)
                     .in(CustomerServiceBatchSending::getSendStatus, EImSendStatus.WAIT,EImSendStatus.SENDING)
-                    .ne(CustomerServiceBatchSending::getSendFlag,1)
+                    .eq(CustomerServiceBatchSending::getSendFlag,0)
                     .list();
 
             if (CollectionUtils.isNotEmpty(batchSendings)) {
@@ -849,7 +859,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
 
                 for (List<CustomerServiceBatchSending> item : Lists.partition(batchSendings, 10)) {
 
-                    item.parallelStream().forEach(x -> sendMessage(x.getId()));
+                    item.forEach(x -> sendMessage(x.getId()));
                 }
 
             }