Merge branch '2021-04-21_music_replace'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -371,10 +371,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     /**
      * 根据ids获取乐团信息
+     *
      * @param ids
      * @return
      */
     List<MusicGroup> getMusicGroupByIds(@Param("ids") List<String> ids);
 
     List<String> getNoClassStudentMusicGroupIds(@Param("organIds") List<Integer> organIds);
+
+    CooperationOrgan findCooperationOrganEduTeacher(@Param("id") Integer id);
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.FeeFlagNumDto;
 import com.ym.mec.biz.dal.dto.PracticeCourseDto;
+import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GroupType;
@@ -57,6 +58,8 @@ public class ExportServiceImpl implements ExportService {
     private ManagerDownloadDao managerDownloadDao;
     @Autowired
     private CooperationOrganDao cooperationOrganDao;
+    @Autowired
+    private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
 
     @Override
     @Async
@@ -205,6 +208,18 @@ public class ExportServiceImpl implements ExportService {
                     row.setSubjectName(practiceGroup.getSubjectName());
                     row.setEduTeacher(practiceGroup.getEduTeacherName());
                 }
+            } else if (row.getGroupType().equals(GroupType.REPLACEMENT)) {
+                row.setMusicalFee(row.getActualAmount());
+                ReplacementInstrumentActivityStatDto info = replacementInstrumentActivityDao.getInfo(Integer.parseInt(row.getMusicGroupId()));
+                if (info != null) {
+                    row.setSubjectName(info.getSubjectName());
+                    row.setCooperationOrganName(info.getCooperationOrganName());
+                    row.setMemo(info.getBrand() + "(" + info.getSpecification() + ")");
+                    CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(info.getCooperationOrganId());
+                    if (cooperationOrganEduTeacher != null) {
+                        row.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
+                    }
+                }
             } else {
                 StudentPaymentOrderExportDto feeByType = sellOrderDao.getFeeByType(row.getId());
                 BigDecimal childRepairFee = sellOrderDao.getChildRepair(row.getId());
@@ -441,6 +456,18 @@ public class ExportServiceImpl implements ExportService {
                     row.setSubjectName(practiceGroup.getSubjectName());
                     row.setEduTeacher(practiceGroup.getEduTeacherName());
                 }
+            } else if (row.getGroupType().equals(GroupType.REPLACEMENT)) {
+                row.setMusicalFee(row.getActualAmount());
+                ReplacementInstrumentActivityStatDto info = replacementInstrumentActivityDao.getInfo(Integer.parseInt(row.getMusicGroupId()));
+                if (info != null) {
+                    row.setSubjectName(info.getSubjectName());
+                    row.setCooperationOrganName(info.getCooperationOrganName());
+                    row.setMemo(info.getBrand() + "(" + info.getSpecification() + ")");
+                    CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(info.getCooperationOrganId());
+                    if (cooperationOrganEduTeacher != null) {
+                        row.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
+                    }
+                }
             } else {
                 StudentPaymentOrderExportDto feeByType = sellOrderDao.getFeeByType(row.getId());
                 BigDecimal childRepairFee = sellOrderDao.getChildRepair(row.getId());

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

@@ -63,21 +63,19 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
 
         replacementInstrumentActivityDao.openPay(replacementInstrumentCooperation.getCooperationOrganId());
 
-        Map<Integer, String> userMap = new HashMap<>();
-        Map<Integer, String> userPhoneMap = new HashMap<>();
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
         for (ReplacementInstrumentActivityStatDto pushUser : pushUsers) {
-            userMap.clear();
-            userPhoneMap.clear();
+            Map<Integer, String> userMap = new HashMap<>();
+            Map<Integer, String> userPhoneMap = new HashMap<>();
             userMap.put(pushUser.getUserId(), pushUser.getUserId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
                     userMap, null, 0, "5?" + pushUrl + pushUser.getId(), "STUDENT", pushUser.getBrand(), "");
 
             userPhoneMap.put(pushUser.getUserId(), pushUser.getMobileNo());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
-                    userPhoneMap, null, 0, null, "STUDENT", pushUser.getBrand(), HttpUtil.getSortUrl(pushUrl + pushUser.getId()));
+                    userPhoneMap, null, 0, null, "STUDENT", pushUser.getBrand(), pushUrl + pushUser.getId());
         }
 
         return replacementInstrumentCooperation;

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

@@ -712,4 +712,15 @@
                 </foreach>
             </if>
     </select>
+
+    <select id="findCooperationOrganEduTeacher" resultMap="com.ym.mec.biz.dal.dao.CooperationOrganDao.CooperationOrgan">
+        SELECT co.name_,su.real_name_ linkman_
+        FROM music_group mg
+        LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
+        LEFT JOIN sys_user su ON su.id_ = mg.educational_teacher_id_
+        WHERE co.id_ = #{id}
+        AND mg.status_ IN ('PREPARE','PROGRESS','PAUSE','CLOSE')
+        ORDER BY mg.create_time_ DESC
+        LIMIT 1
+    </select>
 </mapper>

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

@@ -242,10 +242,12 @@
                ri.discount_price_,
                ri.depreciation_price_,
                ri.sale_price_,
-               s.name_ subject_name_
+               s.name_ subject_name_,
+               co.name_ cooperationOrganName
         FROM replacement_instrument_activity ria
                  LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
-                 LEFT JOIN subject s on s.id_ = ri.subject_id_
+                 LEFT JOIN subject s ON s.id_ = ri.subject_id_
+                 LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
         WHERE ria.id_ = #{id}
     </select>