增加一对一和一对多 点名

src/main/java/com/xiaomai/cases/polar/reserve/personal/TestReservePerson.java

@@ -153,14 +153,17 @@ public class TestReservePerson extends BaseTestImpl {
 
 
         // 从课表查询scheduleId
-        JSONArray personalScheduleTable = reserveTools.getPersonalScheduleTable(timestamp,TimeUtils.getTodayEndTime(),courseId);
-        for (int i = 0; i < personalScheduleTable.size(); i++){
-            if (personalScheduleTable.getJSONObject(i).getString("startTime").equals(String.valueOf(timestamp))){
+        JSONArray personalScheduleTable = reserveTools.getPersonalScheduleTable(timestamp, TimeUtils.getTodayEndTime(), courseId);
+        for (int i = 0; i < personalScheduleTable.size(); i++) {
+            for (int j = 0; j < personalScheduleTable.getJSONObject(i).getJSONArray("reserveIds").size(); j++){
+                if (personalScheduleTable.getJSONObject(i).getString("startTime").equals(String.valueOf(timestamp)) && personalScheduleTable.getJSONObject(i).getJSONArray("reserveIds").getString(j).equals(reserveId)) {
                     scheduleId = personalScheduleTable.getJSONObject(i).getString("scheduleId");
                     break;
                 }
             }
 
+        }
+
         // check 1：课次学员是否包含该会员
         JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
         JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
@@ -261,7 +264,7 @@ public class TestReservePerson extends BaseTestImpl {
             }
         }
 
-        // check 3： 会员卡消耗记录中包含该记录锁定的次数释放
+        // check 4： 会员卡消耗记录中包含该记录锁定的次数释放
         JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records");
         String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
         String[] respect = new String[] {reserveId,"CANCEL_RESERVE","1.00"};
@@ -345,14 +348,17 @@ public class TestReservePerson extends BaseTestImpl {
         }
 
         // 从课表查询scheduleId
-        JSONArray personalScheduleTable = reserveTools.getPersonalScheduleTable(timestamp,TimeUtils.getTodayEndTime(),courseId);
-        for (int i = 0; i < personalScheduleTable.size(); i++){
-            if (personalScheduleTable.getJSONObject(i).getString("startTime").equals(String.valueOf(timestamp))){
+        JSONArray personalScheduleTable = reserveTools.getPersonalScheduleTable(timestamp, TimeUtils.getTodayEndTime(), courseId);
+        for (int i = 0; i < personalScheduleTable.size(); i++) {
+            for (int j = 0; j < personalScheduleTable.getJSONObject(i).getJSONArray("reserveIds").size(); j++){
+                if (personalScheduleTable.getJSONObject(i).getString("startTime").equals(String.valueOf(timestamp)) && personalScheduleTable.getJSONObject(i).getJSONArray("reserveIds").getString(j).equals(reserveId)) {
                     scheduleId = personalScheduleTable.getJSONObject(i).getString("scheduleId");
                     break;
                 }
             }
 
+        }
+
         // check 1：课次学员是否包含该会员
         JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
         JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
@@ -484,7 +490,7 @@ public class TestReservePerson extends BaseTestImpl {
             }
         }
 
-        // check 3： 会员卡消耗记录中包含该记录锁定的次数释放
+        // check 4： 会员卡消耗记录中包含该记录锁定的次数释放
         JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(member2.getString(1),member2.getString(2)).getJSONObject("result").getJSONArray("records");
         String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
         String[] respect = new String[] {member2.getString(3),"CANCEL_RESERVE","1.00"};