乐团缴费项目改造

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

@@ -9,4 +9,6 @@ import java.util.List;
 public interface MusicGroupCalenderRefundPeriodDao extends BaseDAO<Integer, MusicGroupCalenderRefundPeriod> {
 
     void batchInsert(@Param("refundPeriods") List<MusicGroupCalenderRefundPeriod> refundPeriods);
+
+    List<MusicGroupCalenderRefundPeriod> findByCalenderId(@Param("calenderId") Long calenderId);
 }

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

@@ -4,7 +4,11 @@ import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupCalenderRefundPeriod;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface MusicGroupCalenderRefundPeriodService extends BaseService<Integer, MusicGroupCalenderRefundPeriod> {
 
     void savePeriod(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
+
+    List<MusicGroupCalenderRefundPeriod> findByCalenderId(Long calenderId);
 }

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

@@ -55,4 +55,9 @@ public class MusicGroupCalenderRefundPeriodServiceImpl extends BaseServiceImpl<I
         });
         musicGroupCalenderRefundPeriodDao.batchInsert(refundPeriods);
     }
+
+    @Override
+    public List<MusicGroupCalenderRefundPeriod> findByCalenderId(Long calenderId) {
+        return musicGroupCalenderRefundPeriodDao.findByCalenderId(calenderId);
+    }
 }

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

@@ -482,7 +482,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
     @Override
     public Map<String, Object> getDetail(Long id) {
-        Map<String, Object> result = new HashMap<>(10);
+        Map<String, Object> result = new HashMap<>(11);
         //获取缴费项目详情
         MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(id);
         //统计预计缴费人数
@@ -495,6 +495,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (actualNumMap != null) {
             calender.setActualNum(actualNumMap.get(id) == null ? 0 : actualNumMap.get(id).intValue());
         }
+        //如果是学校缴费并且金额不为0，返回费用信息
+        if (calender.getPayUserType() == SCHOOL && calender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) > 0){
+            result.put("calenderRefundPeriods",musicGroupCalenderRefundPeriodService.findByCalenderId(id));
+        }
 
         if (calender.getOrganId() != null) {
             Organization organization = organizationDao.get(calender.getOrganId());

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

@@ -49,4 +49,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_calender_refund_period
 	</select>
+	<select id="findByCalenderId" resultMap="MusicGroupCalenderRefundPeriod">
+		SELECT * FROM music_group_calender_refund_period where calender_id_ = #{calenderId} ORDER BY refund_date_
+	</select>
 </mapper>