Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderDetail.java

@@ -26,14 +26,14 @@ public class MusicGroupPaymentCalenderDetail extends BaseEntity {
 	
 	/**  */
 	private Integer userId;
-	
-	/**  */
+
+	/** 废弃字段，如果需要查看金额，请前往订单详情 */
 	private java.math.BigDecimal expectAmount;
 
-	/**  */
+	/** 废弃字段，如果需要查看金额，请前往订单详情 */
 	private java.math.BigDecimal expectMemberAmount = BigDecimal.ZERO;
 	
-	/**  */
+	/** 废弃字段，如果需要查看金额，请前往订单详情 */
 	private java.math.BigDecimal actualAmount;
 	
 	/**  */

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

@@ -89,15 +89,6 @@ public interface CourseScheduleStudentPaymentService extends BaseService<Long, C
 	void createForMusicGroup(List<CourseSchedule> courseSchedules, List<Integer> studentIds,Integer musicGroupStudentClassAdjustId);
 
 	/**
-	 * @describe 根据缴费日历更新乐团课程学院课程价格
-	 * @author Joburgess
-	 * @date 2020.10.29
-	 * @param batchNo: 缴费日历批次号
-	 * @return void
-	 */
-	void updateForMusicGroupWithPaymentCalender(String batchNo);
-
-	/**
 	 * 获取班级未开始的的课程
 	 * @param classGroupIds
 	 * @return

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

@@ -564,49 +564,6 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 	}
 
-	@Override
-	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-	public void updateForMusicGroupWithPaymentCalender(String batchNo) {
-		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByBatchNo(batchNo);
-		if(CollectionUtils.isEmpty(courseScheduleStudentPayments)){
-			return;
-		}
-		List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
-		if(CollectionUtils.isEmpty(musicGroupPaymentCalenders)){
-			return;
-		}
-		List<Long> calenderIds = musicGroupPaymentCalenders.stream().map(MusicGroupPaymentCalender::getId).collect(Collectors.toList());
-		List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.getWithCalenderIds(calenderIds);
-
-		Map<Integer, List<CourseScheduleStudentPayment>> studentStudentPaymentMap = courseScheduleStudentPayments.stream().collect(Collectors.groupingBy(CourseScheduleStudentPayment::getUserId));
-		Map<Integer, List<MusicGroupPaymentCalenderDetail>> studentCalenderDetailMap = calenderDetails.stream().collect(Collectors.groupingBy(MusicGroupPaymentCalenderDetail::getUserId));
-
-		List<CourseScheduleStudentPayment> updateStudentPayments = new ArrayList<>();
-
-		for (Map.Entry<Integer, List<CourseScheduleStudentPayment>> studentStudentPaymentMapEntry : studentStudentPaymentMap.entrySet()) {
-			List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetails = studentCalenderDetailMap.get(studentStudentPaymentMapEntry.getKey());
-
-			if(CollectionUtils.isEmpty(musicGroupPaymentCalenderDetails)){
-				continue;
-			}
-
-			//学员总缴费金额
-			BigDecimal totalActualAmount = musicGroupPaymentCalenderDetails.stream().map(e -> Objects.isNull(e.getActualAmount())?BigDecimal.ZERO:e.getActualAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-			for (CourseScheduleStudentPayment courseScheduleStudentPayment : studentStudentPaymentMapEntry.getValue()) {
-				if(totalActualAmount.compareTo(courseScheduleStudentPayment.getExpectPrice())>=0){
-					courseScheduleStudentPayment.setActualPrice(courseScheduleStudentPayment.getExpectPrice());
-					totalActualAmount=totalActualAmount.subtract(courseScheduleStudentPayment.getExpectPrice());
-				}else{
-					courseScheduleStudentPayment.setActualPrice(totalActualAmount);
-					totalActualAmount=BigDecimal.ZERO;
-				}
-				updateStudentPayments.add(courseScheduleStudentPayment);
-			}
-		}
-
-		courseScheduleStudentPaymentDao.batchUpdate(updateStudentPayments);
-	}
 
 	@Override
 	public List<CourseScheduleStudentPayment> getClassGroupNoStartCourse(List<Integer> classGroupIds) {

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

@@ -153,8 +153,8 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 				throw new BizException("修改失败：缴费状态不匹配");
 			}
 			e.setUpdateTime(date);
-			e.setExpectAmount(expectAmount);
-			e.setExpectMemberAmount(expectMemberAmount);
+//			e.setExpectAmount(expectAmount);
+//			e.setExpectMemberAmount(expectMemberAmount);
 
 			if(expectAmount.doubleValue() > 0 || expectMemberAmount.doubleValue() > 0){
 				if((e.getOpen() != null && e.getOpen() == 1) || calender.getStatus() == PaymentCalenderStatusEnum.OPEN){
@@ -334,10 +334,10 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 			musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalenderId);
 			musicGroupPaymentCalenderDetail.setCreateTime(date);
-			musicGroupPaymentCalenderDetail.setExpectAmount(expectAmount);
-			musicGroupPaymentCalenderDetail.setExpectMemberAmount(expectMemberAmount);
+//			musicGroupPaymentCalenderDetail.setExpectAmount(expectAmount);
+//			musicGroupPaymentCalenderDetail.setExpectMemberAmount(expectMemberAmount);
 			if (expectAmount.doubleValue() == 0d && expectMemberAmount.doubleValue() == 0d) {
-				musicGroupPaymentCalenderDetail.setActualAmount(BigDecimal.ZERO);
+//				musicGroupPaymentCalenderDetail.setActualAmount(BigDecimal.ZERO);
 				musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
 			} else {
 				musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
@@ -413,11 +413,11 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
 			List<MusicGroupPaymentCalenderStudentDetail> calenderStudentDetails = collect.get(studentId);
 			BigDecimal totalPrice = calenderStudentDetails.stream().map(e->e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
-			musicGroupPaymentCalenderDetail.setExpectAmount(totalPrice);
+//			musicGroupPaymentCalenderDetail.setExpectAmount(totalPrice);
 			if(musicGroupPaymentCalender.getStatus() != AUDITING){
 				if (totalPrice.doubleValue() == 0d) {
 					musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.PAID_COMPLETED);
-					musicGroupPaymentCalenderDetail.setActualAmount(totalPrice);
+//					musicGroupPaymentCalenderDetail.setActualAmount(totalPrice);
 				}
 			}
 			musicGroupPaymentCalenderDetail.setMusicGroupId(musicGroupPaymentCalender.getMusicGroupId());
@@ -770,7 +770,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			musicGroupPaymentCalenderDetail.setUserId(studentPaymentOrder.getUserId());
 			musicGroupPaymentCalenderDetail.setResponsibleUserId(musicGroupPaymentCalender.getOperator());
 
-			if (currentPaymentCalenderId.longValue() == musicGroupPaymentCalender.getId()) {
+/*			if (currentPaymentCalenderId.longValue() == musicGroupPaymentCalender.getId()) {
 				musicGroupPaymentCalenderDetail.setExpectAmount(courseTotalPrice);
 				if (studentPaymentOrder.getCourseRemitFee() != null && (studentPaymentOrder.getCourseRemitFee().compareTo(BigDecimal.ZERO) > 0)) {
 					musicGroupPaymentCalenderDetail.setActualAmount(optionalCourseFee);
@@ -789,8 +789,13 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			if(orderDetailTypes.contains(OrderDetailTypeEnum.CLOUD_TEACHER.name()) || orderDetailTypes.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS.name())){
 				musicGroupPaymentCalenderDetail.setExpectAmount(musicGroupPaymentCalenderDetail.getExpectAmount().add(musicGroupPaymentCalender.getMemberPaymentAmount()));
 				musicGroupPaymentCalenderDetail.setActualAmount(musicGroupPaymentCalenderDetail.getActualAmount().add(musicGroupPaymentCalender.getMemberPaymentAmount()));
-			}
+			}*/
 
+			musicGroupPaymentCalenderDetail.setPaymentStatus(PAID_COMPLETED);
+			musicGroupPaymentCalenderDetail.setPayTime(nowDate);
+			musicGroupPaymentCalenderDetail.setPaymentOrderId(studentPaymentOrder.getId());
+			musicGroupPaymentCalenderDetail.setUseInCourse(0);
+			musicGroupPaymentCalenderDetail.setOpen(1);
 			musicGroupPaymentCalenderDetail.setUserStatus(null);
 			musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
 			musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());

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

@@ -692,7 +692,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 	@Override
 	public Map<String, Object> getDetail(Long id) {
-		Map<String, Object> result = new HashMap<>(9);
+		Map<String, Object> result = new HashMap<>(10);
 		//获取缴费项目详情
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(id);
 		//统计预计缴费人数
@@ -1175,8 +1175,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 				musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
 				musicGroupPaymentCalenderDetail.setCreateTime(date);
-				musicGroupPaymentCalenderDetail.setExpectAmount(expectAmount);
-				musicGroupPaymentCalenderDetail.setExpectMemberAmount(expectMemberAmount);
+//				musicGroupPaymentCalenderDetail.setExpectAmount(expectAmount);
+//				musicGroupPaymentCalenderDetail.setExpectMemberAmount(expectMemberAmount);
 				musicGroupPaymentCalenderDetail.setPaymentStatus(PaymentStatus.NON_PAYMENT);
 				musicGroupPaymentCalenderDetail.setUpdateTime(date);
 				musicGroupPaymentCalenderDetail.setUserId(Integer.parseInt(studentId));
@@ -1856,7 +1856,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 //		}
 		//更新学生的缴费记录状态
 		calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
-		calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
+//		calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
 		calenderDetail.setPayTime(date);
 		calenderDetail.setUpdateTime(date);
 		musicGroupPaymentCalenderDetailDao.update(calenderDetail);

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

@@ -671,6 +671,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrder.setCreateTime(date);
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrder.setVersion(0);
+        studentPaymentOrder.setCalenderId(calenderId);
         studentPaymentOrderService.insert(studentPaymentOrder);
         // 订单详情
         studentPaymentOrder = studentRegistrationService.addOrder(studentRegistration,studentPaymentOrder,goodsDto,renewParamDto);

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

@@ -315,7 +315,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
 
                 for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
-                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
+//                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
                     calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                     calenderDetail.setPayTime(nowDate);
                     calenderDetail.setUpdateTime(nowDate);

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

@@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @RequestMapping("musicGroupPaymentCalender")
 @Api(tags = "乐团缴费项目服务")
@@ -44,14 +46,6 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
     @Autowired
     private MusicGroupPaymentCalenderStudentDetailDao musicGroupPaymentCalenderStudentDetailDao;
-    @Autowired
-    private MusicGroupPaymentStudentCourseDetailDao musicGroupPaymentStudentCourseDetailDao;
-    @Autowired
-    private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
-    @Autowired
-    private MusicGroupPaymentCalenderMemberService musicGroupPaymentCalenderMemberService;
-    @Autowired
-    private MusicGroupPaymentCalenderRepairService musicGroupPaymentCalenderRepairService;
 	@Autowired
 	private MemberRankPrivilegesService memberRankPrivilegesService;
 
@@ -79,17 +73,14 @@ public class MusicGroupPaymentCalenderController extends BaseController {
             if (studentRegistration == null) {
                 return failed("乐团报名信息不存在");
             }
-            ModelMap model = new ModelMap(10);
             //课程相关信息
+            Map model = new HashMap<>(10);
             model.put("musicGroupPaymentCalenderStudentDetails",musicGroupPaymentCalenderStudentDetailDao.findByBatchNoAndUserId(calender.getBatchNo(),userId));
-            model.put("calenderCourseSettings", musicGroupPaymentStudentCourseDetailDao.findByCalenderAndUserId(calenderId,userId));
-            model.put("activity",musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId));
             model.put("musicGroup",musicGroupDao.get(musicGroupId));
             model.put("balance",studentRegistration.getBalance());
-            model.put("member",musicGroupPaymentCalenderMemberService.findByCalenderId(calenderId));
-            model.put("repair",musicGroupPaymentCalenderRepairService.findByCalenderId(calenderId));
             model.put("calender",calender);
             model.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calender.getMemberRankSettingId()));
+            musicGroupPaymentCalenderService.getCalenderDetail(model,calenderId);
             return succeed(model);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
             throw new BizException("缴费已截止,如有问题请联系指导老师");