乐团缴费项目改造

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

@@ -25,4 +25,6 @@ public interface MusicGroupCalenderRefundPeriodDao extends BaseDAO<Integer, Musi
     int countCoopCalender(Map<String, Object> params);
 
     List<CooperationCalenderRefundDto> queryCoopCalender(Map<String, Object> params);
+
+    void deleteByCalenderId(@Param("calenderId") Long calenderId);
 }

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

@@ -23,4 +23,6 @@ public interface MusicGroupCalenderRefundPeriodService extends BaseService<Integ
 
 
     PageInfo<CooperationCalenderRefundDto> queryCoopCalender(CooperationRefundQueryInfo queryInfo);
+
+    void deleteByCalenderId(Long id);
 }

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

@@ -129,4 +129,10 @@ public class MusicGroupCalenderRefundPeriodServiceImpl extends BaseServiceImpl<I
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByCalenderId(Long id) {
+        musicGroupCalenderRefundPeriodDao.deleteByCalenderId(id);
+    }
 }

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

@@ -1323,6 +1323,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (musicGroupPaymentCalenderDetailList != null && musicGroupPaymentCalenderDetailList.size() > 0) {
             throw new BizException("操作失败：缴费项目中已存在学员");
         }
+        //如果是学校缴费，删除缴费周期
+        musicGroupCalenderRefundPeriodService.deleteByCalenderId(id);
         MusicGroupStudentClassAdjust adjust = musicGroupStudentClassAdjustDao.findByBatchNo(calender.getBatchNo());
         if (!Objects.isNull(adjust)) {
 //            throw new BizException("操作失败：班级调整的缴费项目不支持");

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

@@ -17,8 +17,10 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
-	
-	
+	<delete id="deleteByCalenderId">
+		DELETE FROM music_group_calender_refund_period WHERE calender_id_ = #{calenderId}
+	</delete>
+
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupCalenderRefundPeriod">
 		SELECT * FROM music_group_calender_refund_period

mec-web/src/main/java/com/ym/mec/web/controller/UploadFileController.java

@@ -14,10 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Base64Utils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
@@ -40,7 +37,7 @@ public class UploadFileController extends BaseController {
 	
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
 
-	@PostMapping(value = "uploadFile")
+	@RequestMapping(value = "uploadFile")
 	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file){
 		try {
 //			BucketContextHolder.setBucket(bucket);