Merge branch 'hr_728'

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

@@ -3746,6 +3746,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		//查询当前乐团报名订单中购买了乐保的订单
 		List<StudentApplyInstrumentDto> maintenanceList = studentPaymentOrderDetailDao.queryByType(musicGroupId, OrderDetailTypeEnum.MAINTENANCE);
 		
+		if(maintenanceList == null || maintenanceList.size() == 0){
+			return true;
+		}
+		
 		List<Long> instrumentIdList = maintenanceList.stream().map(t -> t.getStudentInstrumentId()).collect(Collectors.toList());
 		
 		List<StudentInstrument> studentInstrumentList = studentInstrumentDao.queryById(instrumentIdList);

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

@@ -253,7 +253,7 @@ public class MusicGroupController extends BaseController {
             List<StudentPaymentOrder> list = studentPaymentOrderService.queryByCondition(GroupType.MUSIC, calender.getMusicGroupId(), userId, DealStatusEnum.ING,
                     OrderTypeEnum.RENEW);
             if (list.size() > 0) {
-            	StudentPaymentOrder applyOrder = list.get(0);
+            	StudentPaymentOrder applyOrder = list.get(list.size() - 1);
             	// 查询订单状态
                 PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
                 if(payStatus == PayStatus.SUCCESSED){

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

@@ -75,7 +75,7 @@ public class SporadicChargeInfoController extends BaseController {
         if (sporadicPayDto.getIsRepeatPay() == false) {
         	List<StudentPaymentOrder> studentPaymentOrderList = studentPaymentOrderDao.findPaymentOrderByGroupType(sporadicPayDto.getUserId(), sporadicPayDto.getSporadicId(), "SPORADIC", DealStatusEnum.ING);
             if (studentPaymentOrderList != null && studentPaymentOrderList.size() > 0) {
-            	StudentPaymentOrder applyOrder = studentPaymentOrderList.get(0);
+            	StudentPaymentOrder applyOrder = studentPaymentOrderList.get(studentPaymentOrderList.size() - 1);
             	// 查询订单状态
                 PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
                 if(payStatus == PayStatus.SUCCESSED){

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

@@ -114,7 +114,7 @@ public class StudentVipGroupController extends BaseController {
                             DealStatusEnum.ING,
                             OrderTypeEnum.SMALL_CLASS_TO_BUY);
             if (list.size() > 0) {
-            	StudentPaymentOrder applyOrder = list.get(0);
+            	StudentPaymentOrder applyOrder = list.get(list.size() - 1);
             	// 查询订单状态
                 PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
                 if(payStatus == PayStatus.SUCCESSED){