Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderDetailServiceImpl.java

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

@@ -105,7 +105,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
     int countLessThenThreeClassGroupNum(@Param("organIds") Set<Integer> organIds);
     List<String> getLessThenThreeMusicGroup(@Param("organIds") Set<Integer> organIds);
 
-    List<Long> queryErrInspection(@Param("organIds") Set<Integer> organIds);
+    int queryErrInspection(@Param("organIds") Set<Integer> organIds);
 
     int countNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds);
     List<String> getNoPaymentMusicGroup(@Param("organIds") Set<Integer> organIds);

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

@@ -29,6 +29,9 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     @ApiModelProperty(value = "乐团报名缴费日历",required = false)
     private MusicGroupPaymentCalender musicGroupPaymentCalender;
 
+    @ApiModelProperty(value = "乐团信息",required = false)
+    private MusicGroup musicGroup;
+
 
     public Map getCourseScheduleInfo() {
         return CourseScheduleInfo;
@@ -77,4 +80,12 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     public void setMusicGroupPaymentCalender(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         this.musicGroupPaymentCalender = musicGroupPaymentCalender;
     }
+
+    public MusicGroup getMusicGroup() {
+        return musicGroup;
+    }
+
+    public void setMusicGroup(MusicGroup musicGroup) {
+        this.musicGroup = musicGroup;
+    }
 }

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

@@ -357,8 +357,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			List<IndexErrInfoDto> oneChild = new ArrayList<>();
 
 			oneChild.add(new IndexErrInfoDto(IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE, IndexErrorType.HIGH_CLASS_STUDENT_LESS_THAN_THREE.getMsg(), indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds), null));
-			List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
-			oneChild.add(new IndexErrInfoDto(IndexErrorType.MUSIC_PATROL_ITEM, IndexErrorType.MUSIC_PATROL_ITEM.getMsg(),errInspection.size(), errInspection));
+			int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
+			oneChild.add(new IndexErrInfoDto(IndexErrorType.MUSIC_PATROL_ITEM, IndexErrorType.MUSIC_PATROL_ITEM.getMsg(),errInspection, null));
 
 			one.setNum(oneChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
 			one.setResult(oneChild);
@@ -468,8 +468,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			flag1 = true;
 		}
 		if(!flag1){
-			List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
-			if(errInspection.size() > 0){
+			int errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
+			if(errInspection > 0){
 				flag1 = true;
 			}
 		}

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

@@ -1,7 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.STUDENT;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.AUDITING;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.*;
 import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.NON_PAYMENT;
 
 import java.math.BigDecimal;
@@ -13,6 +13,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.ArrearageStudentsQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,17 +85,21 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		}
 		Date date = new Date();
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
+		//缴费项目已结束，并且没有单独开启缴费的学员，不能修改缴费金额
+		if(calender.getStatus() == OVER){
+			List<MusicGroupPaymentCalenderDetail> paymentCalenderDetails = calenderDetails.stream().filter(e -> e.getOpenFlag() == YesOrNoEnum.NO).collect(Collectors.toList());
+			if(paymentCalenderDetails != null && paymentCalenderDetails.size() > 0){
+				throw new BizException("修改失败：存在未开启缴费的学员");
+			}
+		}
 		Set<Integer> studentIds = new HashSet<>();
 				calenderDetails.forEach(e->{
 			if(e.getPaymentStatus() == null || e.getPaymentStatus() != NON_PAYMENT){
-				throw new BizException("修改失败,缴费状态不匹配");
+				throw new BizException("修改失败：缴费状态不匹配");
 			}
 			if(expectAmount.doubleValue() != 0){
 
 			}
-			/*if(expectAmount.doubleValue() == 0){
-				e.setPaymentStatus(PAID_COMPLETED);
-			}*/
 			e.setUpdateTime(date);
 			e.setExpectAmount(expectAmount);
 			if(expectAmount.doubleValue() > 0){
@@ -103,16 +108,6 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 				}
 			}
 		});
-		/*if(expectAmount.doubleValue() == 0){
-			//如果是设置为0元
-			MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
-			if(calender.getType() == ONLINE){
-				//剩余网管课可购买次数加一
-				musicGroupStudentFeeDao.remainNetworkClassTimesAdd(ids);
-			}
-			//缴费完成
-			musicGroupStudentFeeDao.setPaidCompleted(calenderDetails);
-		}*/
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
 		//推送消息
 		if (calender.getPayUserType() == STUDENT && studentIds.size() > 0) {
@@ -135,7 +130,6 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 						null, 0, memo, null, musicGroup.getName());
 			}
 		}
-//		}
 	}
 
 	@Override

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

@@ -643,9 +643,9 @@
 		</if>
 	</select>
 
-    <select id="queryErrInspection" resultType="java.lang.Long">
+    <select id="queryErrInspection" resultType="int">
 		SELECT
-			id_
+			COUNT(id_)
 		FROM
 			inspection_item_plan
 		WHERE

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.entity.ChargeType;
 import com.ym.mec.biz.service.ChargeTypeService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
+
 @RequestMapping("chargeType")
 @Api(tags = "收费类型服务")
 @RestController
@@ -42,4 +46,12 @@ public class ChargeTypeController extends BaseController {
         return succeed(chargeTypeService.queryPage(queryInfo));
     }
 
+
+    @ApiOperation(value = "获取乐团收费类型")
+    @GetMapping("/findAll")
+    @PreAuthorize("@pcs.hasPermissions('chargeType/findAll')")
+    public HttpResponseResult<List<ChargeType>> findAll() {
+        return succeed(chargeTypeService.findAll(new HashMap<>()));
+    }
+
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.entity.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -23,10 +25,6 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dto.DelRegisterDto;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.dto.StudentAddDto;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.page.StudentPreRegistrationQueryInfo;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
@@ -51,6 +49,8 @@ public class StudentRegistrationController extends BaseController {
     private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
     @Autowired
     private StudentPreRegistrationService studentPreRegistrationService;
+    @Autowired
+    private MusicGroupDao musicGroupDao;
 
     @ApiOperation(value = "乐团预报名列表分页查询")
     @GetMapping("/queryPreApplyList")
@@ -182,6 +182,7 @@ public class StudentRegistrationController extends BaseController {
         if (subjectId == null || StringUtils.isEmpty(musicGroupId) || calenderId == null) {
             return failed("参数校验异常");
         }
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
 
         MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.get(calenderId);
@@ -190,6 +191,7 @@ public class StudentRegistrationController extends BaseController {
             musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
             subjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         }
+        subjectGoodsAndInfo.setMusicGroup(musicGroup);
         return succeed(subjectGoodsAndInfo);
     }