Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -20,8 +20,16 @@ public interface SubjectChangeDao extends BaseDAO<Integer, SubjectChange> {
 
     /**
      * 获取更换详情
+     *
      * @param id
      * @return
      */
     SubjectChange getChangeInfo(@Param("id") Integer id);
+
+    /**
+     * 获取待支付的的声部更换列表
+     * @param musicGroupId
+     * @return
+     */
+    List<SubjectChange> getMusicGroupWaitPay(@Param("musicGroupId") String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,9 @@ public class StudentApplyDetailDto{
     @ApiModelProperty(value = "备注",required = false)
     private String remark;
 
+    @ApiModelProperty(value = "声部更换详情",required = false)
+    private SubjectChange subjectChange;
+
     public KitGroupPurchaseTypeEnum getKitGroupPurchaseTypeEnum() {
         return kitGroupPurchaseTypeEnum;
     }
@@ -177,4 +181,12 @@ public class StudentApplyDetailDto{
     public void setId(Long id) {
         this.id = id;
     }
+
+    public SubjectChange getSubjectChange() {
+        return subjectChange;
+    }
+
+    public void setSubjectChange(SubjectChange subjectChange) {
+        this.subjectChange = subjectChange;
+    }
 }

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

@@ -125,10 +125,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             dataList = studentRegistrationDao.queryStudentDetailPage(params);
             Set<Integer> subjectIds = dataList.stream().map(e -> e.getActualSubjectId()).collect(Collectors.toSet());
             Map<Integer, String> subjectMap = MapUtil.convertIntegerMap(musicGroupSubjectPlanDao.findSubjectMap(subjectIds, queryInfo.getMusicGroupId()));
+            List<SubjectChange> waitPayChange = subjectChangeDao.getMusicGroupWaitPay(queryInfo.getMusicGroupId());
+            Map<Integer, List<SubjectChange>> studentWaitPayChange = waitPayChange.stream().collect(Collectors.groupingBy(SubjectChange::getStudentId));
             dataList.forEach(e -> {
                 if (StringUtils.isNotBlank(subjectMap.get(e.getActualSubjectId()))) {
                     e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(subjectMap.get(e.getActualSubjectId())));
                 }
+                if (studentWaitPayChange.containsKey(e.getStudentId())) {
+                    e.setSubjectChange(studentWaitPayChange.get(e.getStudentId()).get(0));
+                }
             });
         }
         if (count == 0) {
@@ -708,7 +713,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if (musicGroup.getFeeType() != null && musicGroup.getFeeType() != MusicGroupPaymentCalender.FeeType.OFFLINE && musicGroupStudentFee.getTemporaryCourseFee().doubleValue() * 100 == 0) {
                 musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
             }
-            if(studentRegistration.getPaymentStatus() == PaymentStatusEnum.YES){
+            if (studentRegistration.getPaymentStatus() == PaymentStatusEnum.YES) {
                 musicGroupStudentFee.setPaymentValidEndDate(musicGroup.getPaymentValidEndDate());
             }
             musicGroupStudentFeeDao.insert(musicGroupStudentFee);

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

@@ -160,4 +160,8 @@
         LEFT jOIN sys_user su ON su.id_=sc.student_id_
         WHERE sc.id_ = #{id}
     </select>
+
+    <select id="getMusicGroupWaitPay" resultMap="SubjectChange">
+        SELECT * FROM subject_change WHERE music_group_id_ = #{musicGroupId} AND status_ = 0
+    </select>
 </mapper>