学生乐团增加退团时间

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

@@ -106,8 +106,8 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @param userIds: 用户编号列表
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
      */
-    List<Map<Integer,String>> findByMusicGroupAndUsers(@Param("musicGroupId") String musicGroupId,
-                                                       @Param("userIds") List<Integer> userIds);
+    List<Map<Integer,String>> findByMusicGroupUserSubject(@Param("musicGroupId") String musicGroupId,
+                                                          @Param("userIds") List<Integer> userIds);
 
     /**
      * @describe

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

@@ -187,7 +187,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             Map<Long, BigDecimal> accessoriesAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo,"ACCESSORIES"));
             Map<Long, BigDecimal> courseAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo,"COURSE"));
             Map<Long, String> purchaseTypeMap = MapUtil.convertIntegerMap(studentRegistrationDao.queryPurchaseTypeMap(musicGroupId));
-            Map<Integer,String> userSubjectMap = MapUtil.convertIntegerMap(subjectDao.findByMusicGroupAndUsers(musicGroupId, userIds));
+            Map<Integer,String> userSubjectMap = MapUtil.convertIntegerMap(subjectDao.findByMusicGroupUserSubject(musicGroupId, userIds));
             MusicalListDetailDtos.forEach(e->{
                 e.setGoodsNames(goodsNameMap.get(e.getPaymentOrderId()));
                 e.setMusicGroupName(musicGroup.getName());

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

@@ -164,7 +164,7 @@
         SELECT * FROM `subject` WHERE del_flag_ = 0 AND FIND_IN_SET(id_,#{subjectIdList})
     </select>
 
-    <select id="findByMusicGroupAndUsers" resultType="map">
+    <select id="findByMusicGroupUserSubject" resultType="map">
         SELECT
             sr.user_id_ AS 'key',
             s.name_ AS 'value'