Commit 3f7f6f09 by xuyamei

解决报错

parent ffe87013
...@@ -352,8 +352,8 @@ public class ReserveCTools extends XMBaseTest { ...@@ -352,8 +352,8 @@ public class ReserveCTools extends XMBaseTest {
body.put("scheduleId",scheduleId); body.put("scheduleId",scheduleId);
body.put("memberId",memberId); body.put("memberId",memberId);
body.put("studioId",dataApi.getLoginInfo().getStudioId()); body.put("studioId",dataApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
return dataApi.getBodyInJSON().getJSONObject("result").getBoolean("conflict"); return dataApi.getBodyInJSON().getBoolean("success");
} }
......
...@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl { ...@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
LocalDateTime currentDateTime = LocalDateTime.now(); LocalDateTime currentDateTime = LocalDateTime.now();
int hour = currentDateTime.getHour(); int hour = currentDateTime.getHour();
int minutes = currentDateTime.getMinute(); int minutes = currentDateTime.getMinute();
int minute = hour*60+minutes+10 ; int minute = hour*60+minutes+20 ;
createGroupSchedule(minute); createGroupSchedule(minute);
try { try {
...@@ -113,9 +113,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl { ...@@ -113,9 +113,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
// 校验会员加入课次是否有冲突 // 校验会员加入课次是否有冲突
boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId); boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId);
if (checkMemberConflict){ Assert.assertTrue(checkMemberConflict,"会员该时间段已预约其他课程");
Assert.assertTrue(true,"校验会员有课次冲突");
}
// 检查是否支持预约 // 检查是否支持预约
String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0); String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment