Commit 860acdb0 by xuyamei

增加一对一和一对多 点名

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