Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

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

@@ -108,7 +108,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             //覆盖之前的数据
             replacementInstrumentActivity.setId(activity.getId());
             replacementInstrumentActivityDao.update(replacementInstrumentActivity);
-            if (replacementInstrumentActivity.getInstrumentsId() != null && !replacementInstrumentActivity.getInstrumentsId().equals(activity.getInstrumentsId())) {
+            if (replacementInstrumentActivity.getInstrumentsId() != null && (activity.getInstrumentsId() == null || activity.getInstrumentsId() == 0)) {
                 sendPush = true;
             }
         } else {

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

@@ -75,7 +75,7 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
 
             userPhoneMap.put(pushUser.getUserId(), pushUser.getMobileNo());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
-                    userPhoneMap, null, 0, null, "STUDENT", pushUser.getBrand(), pushUrl + pushUser.getId());
+                    userPhoneMap, null, 0, null, "STUDENT", pushUser.getBrand(), HttpUtil.getSortUrl(pushUrl + pushUser.getId()));
         }
 
         return replacementInstrumentCooperation;