Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -29,7 +29,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args);
 
 	/**
-	 * 推送im文本消息,包换调整链接
+	 * 推送im文本消息,包含跳转链接
 	 * @param senderId
 	 * @param messageType
 	 * @return
@@ -37,7 +37,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	void batchSendImMessage(MessageTypeEnum messageType,String senderId,String extra, String[] targetIds,String url, Object... args);
 
 	/**
-	 * 推送im文本消息,包换调整链接
+	 * 推送im文本消息,包含跳转链接
 	 * @param senderId
 	 * @param messageType
 	 * @return

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -132,8 +132,14 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     public StudentPaymentRouteOrder addOutOrder(StudentPaymentRouteOrder studentPaymentRouteOrder) {
         Map<String, Object> params = new HashMap<>();
         params.put("transNo", studentPaymentRouteOrder.getTransNo());
-        if(studentPaymentRouteOrderDao.queryAuditCount(params) >0){
-            throw new  BizException("流水号不能重复");
+        if (studentPaymentRouteOrderDao.queryAuditCount(params) > 0) {
+            throw new BizException("流水号不能重复");
+        }
+        if (studentPaymentRouteOrder.getCalenderId() != null) {
+            MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(studentPaymentRouteOrder.getCalenderId());
+            if (musicGroupPaymentCalender == null || !musicGroupPaymentCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.SCHOOL)) {
+                throw new BizException("学校缴费单号不存在，请核查");
+            }
         }
         Date nowDate = new Date();
         String orderNo = idGeneratorService.generatorId("payment") + "";

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -214,17 +214,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		imFeignService.groupSend(groupMessage);
 	}
 
-	/*@Override
-	public void batchSendImPlayMidiMessage(String senderId,String roomId, String content) {
-		ImGroupMessage groupMessage = new ImGroupMessage();
-		privateMessage.setObjectName("DY:PlayMidiMessage");
-		groupMessage.setTargetId(roomId.split(","));
-		groupMessage.setSenderId(senderId);
-		groupMessage.setContent(new ImPlayMidiMessage(content,null));
-		groupMessage.setType("DY:PlayMidiMessage");
-		imFeignService.privateSendCustom(groupMessage);
-	}*/
-
 	@Override
 	public void sendPrivateMessage(String studentId, String content) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -91,7 +91,7 @@
     </select>
 
     <select id="lockWithUserAndMusic" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE user_id_ = #{userId} AND music_group_id_=#{musicGroupId} FOR UPDATE
+        SELECT * FROM student_registration WHERE user_id_ = #{userId} AND music_group_id_=#{musicGroupId} AND music_group_status_ != 'QUIT' FOR UPDATE
     </select>
 
     <!-- 全查询 -->

mec-client-api/src/main/java/com/ym/mec/im/ImFeignService.java

@@ -97,15 +97,4 @@ public interface ImFeignService {
 
 	@PostMapping(value = "group/send")
 	Object groupSend(@RequestBody ImGroupMessage imGroupMessage);
-
-	/**
-	 * 发送群组自定义消息
-	 * @param groupMessage
-	 * @return
-	 */
-//	@PostMapping(value = "private/sendCustom")
-	//body模板
-	//{"senderId":"325","targetId":[1094986],"objectName":"RC:TxtMsg",
-	// "content":{"content":"www.baidu.com"}}
-//	Object privateSendCustom(@RequestBody ImGroupMessage groupMessage);
 }

mec-im/src/main/java/com/ym/controller/SystemController.java

@@ -14,9 +14,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * Created by weiqinxiao on 2019/2/25.
- */
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/system")
 public class SystemController {
@@ -30,10 +33,17 @@ public class SystemController {
         ImTxtMessage content = (ImTxtMessage)imSystemMessage.getContent();
         TxtMessage txtMessage = new TxtMessage(content.getContent(),content.getExtra());
         systemMessage.setContent(txtMessage);
-        systemMessage.setTargetId(imSystemMessage.getTargetId());
         systemMessage.setSenderId(imSystemMessage.getSenderId());
         systemMessage.setObjectName(imSystemMessage.getObjectName());
-        return messageService.systemSend(systemMessage);
+        String[] targetId = imSystemMessage.getTargetId();
+        long i = Math.round(targetId.length / 100d);
+        for (int j = 0; j < i; j++) {
+            List<String> collect = Arrays.stream(targetId).skip(j * 100).limit(100).collect(Collectors.toList());
+            String[] objects = collect.toArray(new String[100]);
+            systemMessage.setTargetId(objects);
+            messageService.systemSend(systemMessage);
+        }
+        return null;
     }
 
     @RequestMapping(value = "/broadcast", method = RequestMethod.POST)