Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/lunar/reserve/ReserveCTools.java

@@ -352,8 +352,8 @@ public class ReserveCTools extends XMBaseTest {
         body.put("scheduleId",scheduleId);
         body.put("memberId",memberId);
         body.put("studioId",dataApi.getLoginInfo().getStudioId());
-        dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
-        return dataApi.getBodyInJSON().getJSONObject("result").getBoolean("conflict");
+        dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
+        return dataApi.getBodyInJSON().getBoolean("success");
 
     }
 

src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java

@@ -226,7 +226,7 @@ public class TestAddToQueue extends BaseTestImpl {
                 groupScheduleTools.editGroupSchedule(scheduleId,startTime,chiefCoachId,1,2,dataUserInfo);
 
                 try {
-                    Thread.sleep(1000);
+                    Thread.sleep(2000);
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }

src/main/java/com/xiaomai/cases/lunar/reserve/TestSingleReserveSignIn.java

@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
         LocalDateTime currentDateTime = LocalDateTime.now();
         int hour = currentDateTime.getHour();
         int minutes = currentDateTime.getMinute();
-        int minute = hour*60+minutes+10 ;
+        int minute = hour*60+minutes+20 ;
         createGroupSchedule(minute);
 
         try {
@@ -113,9 +113,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
 
         // 校验会员加入课次是否有冲突
         boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId);
-        if (checkMemberConflict){
-            Assert.assertTrue(true,"校验会员有课次冲突");
-        }
+        Assert.assertTrue(checkMemberConflict,"会员该时间段已预约其他课程");
 
         // 检查是否支持预约
         String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);

src/main/java/com/xiaomai/cases/lunar/training/TrainingCTools.java

@@ -79,6 +79,7 @@ public class TrainingCTools extends BaseTestImpl {
 
         JSONObject body = new JSONObject();
         body.put("memberId",memberId);
+        body.put("accountType", "TRAINING");
         body.put("usable",true);
         dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
         return dataApi.getBodyInJSON().getJSONArray("result");