zouxuan преди 5 години
родител
ревизия
a9f913278a

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

@@ -115,7 +115,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			e.setOpen(1);
 			e.setOpen(1);
 //			e.setPaymentStatus(PROCESSING);
 //			e.setPaymentStatus(PROCESSING);
 			e.setStartPaymentDate(date);
 			e.setStartPaymentDate(date);
-			e.setDeadlinePaymentDate(DateUtil.addDays(date,3));
+			e.setDeadlinePaymentDate(DateUtil.addDays(date,2));
 		});
 		});
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
 		musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
 		//修改学员缴费状态为未缴费
 		//修改学员缴费状态为未缴费

+ 2 - 1
mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -13,7 +13,8 @@ import java.util.List;
  */
  */
 public class RoomResult {
 public class RoomResult {
     private @Getter @Setter String roomId;
     private @Getter @Setter String roomId;
-    private @Setter Date startTime;
+    private @Getter @Setter Date startTime;
+    private @Getter @Setter int surplusTime;
     private @Getter @Setter String imToken;
     private @Getter @Setter String imToken;
     private @Getter @Setter String authorization;
     private @Getter @Setter String authorization;
     private @Getter List<MemberResult> members = new ArrayList<>();
     private @Getter List<MemberResult> members = new ArrayList<>();

+ 3 - 0
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -163,6 +163,9 @@ public class RoomServiceImpl implements RoomService {
 
 
         RoleEnum roleEnum;
         RoleEnum roleEnum;
         RoomResult roomResult = new RoomResult();
         RoomResult roomResult = new RoomResult();
+        String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
+        String endClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+        roomResult.setSurplusTime(DateUtil.secondsBetween(new Date(),DateUtil.stringToDate(classDate + " " + endClassTime,DateUtil.EXPANDED_DATE_TIME_FORMAT)));
         RoomResult.MemberResult userResult = new RoomResult.MemberResult();
         RoomResult.MemberResult userResult = new RoomResult.MemberResult();
         List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
         List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (memberList.isEmpty()) {
         if (memberList.isEmpty()) {