Merge branch 'zx_saas_0208' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -15,4 +15,6 @@ public interface MusicGroupPaymentCalenderActivityDao extends BaseDAO<Long, Musi
     List<MusicGroupPaymentCalenderActivity> findByCalenderId(Long calenderId);
 
     List<MusicGroupPaymentCalenderActivity> findByIds(@Param("activityIdList") List<Long> buyCalenderActivityIdList);
+
+    List<MusicGroupPaymentCalenderActivity> findByActivityIds(@Param("activityIdList") List<Long> buyCalenderActivityIdList,@Param("calenderId") Long calenderId);
 }

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

@@ -21,4 +21,6 @@ public interface MusicGroupPaymentCalenderActivityService {
     List<MusicGroupPaymentCalenderActivity> findByCalenderId(Long calenderId);
 
     List<MusicGroupPaymentCalenderActivity> findByIds(List<Long> buyCalenderActivityIdList);
+
+    List<MusicGroupPaymentCalenderActivity> findByActivityIds(List<Long> buyCalenderActivityIdList,Long calenderId);
 }

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

@@ -138,4 +138,9 @@ public class MusicGroupPaymentCalenderActivityServiceImpl extends BaseServiceImp
     public List<MusicGroupPaymentCalenderActivity> findByIds(List<Long> buyCalenderActivityIdList) {
         return musicGroupPaymentCalenderActivityDao.findByIds(buyCalenderActivityIdList);
     }
+
+    @Override
+    public List<MusicGroupPaymentCalenderActivity> findByActivityIds(List<Long> buyCalenderActivityIdList,Long calenderId) {
+        return musicGroupPaymentCalenderActivityDao.findByActivityIds(buyCalenderActivityIdList,calenderId);
+    }
 }

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

@@ -108,4 +108,11 @@
           #{id}
         </foreach>
     </select>
+    <select id="findByActivityIds" resultType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
+      SELECT <include refid="Base_Column_List"/> FROM music_group_payment_calender_activity
+      WHERE calender_id_ = #{calenderId} AND activity_id_ IN
+        <foreach collection="activityIdList" separator="," item="id" close=")" open="(">
+          #{id}
+        </foreach>
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -191,19 +191,19 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("detailType", orderDetailType);
             orderDetail.put("chargeTypeId", musicGroup.getChargeTypeId());
             orderDetail.put("courseViewType", musicGroup.getCourseViewType());
-            //如果包含vip和网管，代表购买了活动包
-            List<Long> activityList = orderDetail1.stream().filter(e -> e.getType() == OrderDetailTypeEnum.VIP
-                    || e.getType() == OrderDetailTypeEnum.PRACTICE).map(e -> e.getStudentInstrumentId())
-                    .collect(Collectors.toList());
-            if(activityList != null && activityList.size() > 0){
-                orderDetail.put("activity", musicGroupPaymentCalenderActivityService.findByIds(activityList));
-            }
 
             //新的课程形态10.27
             MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroup.getId());
             if (musicGroupRegCalender != null) {
                 List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroup.getId());
                 musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+                //如果包含vip和网管，代表购买了活动包
+                List<Long> activityList = orderDetail1.stream().filter(e -> e.getType() == OrderDetailTypeEnum.VIP
+                        || e.getType() == OrderDetailTypeEnum.PRACTICE).map(e -> e.getStudentInstrumentId())
+                        .collect(Collectors.toList());
+                if(activityList != null && activityList.size() > 0){
+                    orderDetail.put("activity", musicGroupPaymentCalenderActivityService.findByActivityIds(activityList,musicGroupRegCalender.getId()));
+                }
             }
             orderDetail.put("calender", musicGroupRegCalender);