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/ReplacementInstrumentCooperationServiceImpl.java

@@ -57,12 +57,12 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
         replacementInstrumentCooperation.setOpenPay(YesOrNoEnum.YES);
         replacementInstrumentCooperationDao.update(replacementInstrumentCooperation);
 
-        replacementInstrumentActivityDao.openPay(replacementInstrumentCooperation.getCooperationOrganId());
-
         //发送推送链接
         //家长您好！您订购的 {乐器品牌}品牌乐器已经开始接受预定，请点击{链接地址}完成付款，付款后15个工作日以内到货，如有疑问请咨询乐团管理老师。
         List<ReplacementInstrumentActivityStatDto> pushUsers = replacementInstrumentActivityDao.getPushUsers(replacementInstrumentCooperation.getCooperationOrganId());
 
+        replacementInstrumentActivityDao.openPay(replacementInstrumentCooperation.getCooperationOrganId());
+
         Map<Integer, String> userMap = new HashMap<>();
         Map<Integer, String> userPhoneMap = new HashMap<>();
 

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

@@ -196,7 +196,7 @@
     </select>
 
     <select id="getPushUsers" resultMap="ReplacementInstrumentActivityStatDto">
-        SELECT *,su.phone_ mobile_no_,ri.brand_ FROM replacement_instrument_activity ria
+        SELECT ria.*,su.phone_ mobile_no_,ri.brand_ FROM replacement_instrument_activity ria
         LEFT JOIN sys_user su ON su.id_ = ria.user_id_
         LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
         WHERE cooperation_organ_id_ = #{cooperationOrganId}