Skip to content

X
xm-sportstest
Commit 4162e588 by DuJunLi
Options

Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiamai-test/xm-sportstest

parents a07aa094 dde03b4a
Showing with 223 additions and 23 deletions
src/main/java/com/xiaomai/cases/lunar/reserve/ReserveCTools.java
...@@ -6,6 +6,7 @@ import com.xiaomai.client.DataUserInfo; ...@@ -6,6 +6,7 @@ import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -183,7 +184,7 @@ public class ReserveCTools extends XMBaseTest { ...@@ -183,7 +184,7 @@ public class ReserveCTools extends XMBaseTest {
* @param dataUserInfos * @param dataUserInfos
* @return: com.alibaba.fastjson.JSONObject * @return: com.alibaba.fastjson.JSONObject
**/ **/
public JSONObject getDetailById(String reserveId,DataUserInfo...dataUserInfos) { public JSONObject getReserveDetailById(String reserveId,DataUserInfo...dataUserInfos) {
setUP("API_getDetailById"); setUP("API_getDetailById");
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
...@@ -336,4 +337,130 @@ public class ReserveCTools extends XMBaseTest { ...@@ -336,4 +337,130 @@ public class ReserveCTools extends XMBaseTest {
} }
/**
* @description: 检查会员课次是否冲突
* @author: xuyamei
* @date: 2024/7/30 11:18
* @param memberId 会员id
* @param scheduleId 课次id
* @return: java.lang.Boolean
**/
public Boolean checkMemberConflict(String memberId,String scheduleId){
setUP("API_checkMemberConflict");
JSONObject body = new JSONObject();
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");
}
/**
* @description:检查是否支持单次约课、排队
* @author: xuyamei
* @date: 2024/7/30 11:37
* @param addToQueue 是否排队
* @param courseId 课程id
* @param chiefCoachId 主教id
* @param memberId 会员id
* @param scheduleId 课次id
* @param scheduleStartTime 课次开始时间
* @param spanMinutes 上课时长
* @param receivableAmount 单次约课金额
* @return: java.lang.String
**/
public String checkAddSingleReserve(boolean addToQueue,String courseId,String chiefCoachId,String memberId,String scheduleId,long scheduleStartTime,int spanMinutes,int receivableAmount){
setUP("API_checkAddSingleReserve");
JSONObject body = new JSONObject();
body.put("addToQueue",addToQueue);
JSONArray areaIds = new JSONArray();
body.put("areaIds", areaIds); // 场地
JSONArray assistantCoachIds = new JSONArray();
body.put("assistantCoachIds",assistantCoachIds); // 助教
body.put("chiefCoachId",chiefCoachId); // 教练
body.put("memberId", memberId); // 会员id
body.put("courseId", courseId); // 课次id
body.put("objectId", RandomStringUtil.randomString(16)); // 会员id
body.put("receivableAmount", receivableAmount); // 会员id
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("scheduleId", scheduleId);
body.put("scheduleStartTime", scheduleStartTime);
body.put("spanMinutes", spanMinutes);
body.put("brandId", dataApi.getLoginInfo().getBrandId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode");
}
/**
* @description:创建单次约课订单
* @author: xuyamei
* @date: 2024/7/30 11:48
* @param addToQueue 是否排队
* @param chiefCoachId 主教id
* @param memberId 会员id
* @param scheduleId 课次id
* @param scheduleStartTime 课次开始时间
* @param spanMinutes 上课时长
* @param receivableAmount 单次约课金额
* @return: java.lang.String
**/
public String createSingleReserve(boolean addToQueue,String courseId,String chiefCoachId,String memberId,String scheduleId,long scheduleStartTime,int spanMinutes,int receivableAmount){
setUP("API_createSingleReserve");
JSONObject body = new JSONObject();
body.put("addToQueue",addToQueue);
JSONArray areaIds = new JSONArray();
body.put("areaIds", areaIds); // 场地
JSONArray assistantCoachIds = new JSONArray();
body.put("assistantCoachIds",assistantCoachIds); // 助教
body.put("chiefCoachId",chiefCoachId); // 教练
body.put("memberId", memberId); // 会员id
body.put("courseId", courseId); // 课次id
body.put("objectId", RandomStringUtil.randomString(16)); // 会员id
body.put("receivableAmount", receivableAmount); // 会员id
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("scheduleId", scheduleId);
body.put("scheduleStartTime", scheduleStartTime);
body.put("spanMinutes", spanMinutes);
body.put("brandId", dataApi.getLoginInfo().getBrandId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getString("result");
}
/**
* @description:根据订单凭证id获取任务信息
* @author: xuyamei
* @date: 2024/7/30 11:56
* @param voucherId ：订单id
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject getDetailById(String voucherId){
setUP("API_singleReserve_getByVoucherId");
JSONObject body = new JSONObject();
body.put("voucherId",voucherId);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result");
}
} }
src/main/java/com/xiaomai/cases/lunar/reserve/TestAddMemberReserve.java
...@@ -182,7 +182,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -182,7 +182,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
int[] minuteOffset = {60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720, 780, 840, 900, 960, 1020, 1080, 1140, 1200, 1260}; int[] minuteOffset = {60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720, 780, 840, 900, 960, 1020, 1080, 1140, 1200, 1260};
Random random = new Random(); Random random = new Random();
//1.1-创建排课日程 //1.1-创建排课日程
groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), false, 1,minuteOffset[random.nextInt(20)],dataUserInfo); groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), true, 1,minuteOffset[random.nextInt(20)],dataUserInfo);
//1.2-查询排课日程 //1.2-查询排课日程
JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo); JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
//统计查询到的目标日程数量 //统计查询到的目标日程数量
......
src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java
...@@ -268,7 +268,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -268,7 +268,7 @@ public class TestAddToQueue extends BaseTestImpl {
int[] minuteOffset = {60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720, 780, 840, 900, 960, 1020, 1080, 1140, 1200, 1260}; int[] minuteOffset = {60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720, 780, 840, 900, 960, 1020, 1080, 1140, 1200, 1260};
Random random = new Random(); Random random = new Random();
//1.1-创建排课日程 //1.1-创建排课日程
groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), false, 1,minuteOffset[random.nextInt(20)],dataUserInfo); groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), true, 1,minuteOffset[random.nextInt(20)],dataUserInfo);
//1.2-查询排课日程 //1.2-查询排课日程
JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo); JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
//统计查询到的目标日程数量 //统计查询到的目标日程数量
......
src/main/java/com/xiaomai/cases/polar/clue/MemberTools.java
...@@ -30,7 +30,7 @@ public class MemberTools extends BaseTestImpl { ...@@ -30,7 +30,7 @@ public class MemberTools extends BaseTestImpl {
super.beforeDataRequest(userInfos); super.beforeDataRequest(userInfos);
Random random = new Random(); Random random = new Random();
String[] idCardType = {"IDENTITY","SAR_PERMIT","idCardType"};//身份证、港澳通行证、护照 String[] idCardType = {"IDENTITY","SAR_PERMIT","PASSPORT"};//身份证、港澳通行证、护照
String[] intention = {"HIGH","MIDDLE","LOW"};//意向度：高、中、低 String[] intention = {"HIGH","MIDDLE","LOW"};//意向度：高、中、低
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
......
src/main/java/com/xiaomai/cases/polar/course/CourseTools.java
...@@ -454,4 +454,49 @@ public class CourseTools extends XMBaseTest { ...@@ -454,4 +454,49 @@ public class CourseTools extends XMBaseTest {
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
} }
/**
* @description:编辑团课
* @author: xuyamei
* @date: 2024/7/30 10:57
* @param categoryId 课程分类
* @param courseId 课程id
* @param courseName 课程名称
* @param duration 时长
* @param singleReserve 是否支持单次预约
* @param reservePrice 单次预约价格
* @param dataUserInfo
* @return: void
**/
public void editGroupCourse(String categoryId,String courseId,String courseName,int duration,boolean singleReserve,int reservePrice,DataUserInfo...dataUserInfo){
dataApi.setApiModule(ApiModule.Polar_Course)
.setApiName("API_editGroupCourse")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfo);
JSONObject body = new JSONObject();
body.put("categoryId", categoryId);
body.put("courseName", courseName);
body.put("duration", duration); // 时长
body.put("difficulty", 3); // 难度
body.put("color", "#AACF53");
body.put("calorie", "0"); // 卡路里
body.put("coverId", "0");
body.put("timeUnit", "MINUTE");
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("sourceId", dataApi.getLoginInfo().getStudioId()); // 来源：场馆、品牌
body.put("sourceType", "STUDIO"); // 来源类型：场馆、品牌
body.put("brandId", dataApi.getLoginInfo().getBrandId()); // 品牌
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandCourseId", courseId);
body.put("singleReserve", singleReserve); // 是否支持单次约课
if (singleReserve){
body.put("reservePrice", reservePrice); // 单次预约的价格
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
}
} }
src/main/java/com/xiaomai/cases/polar/reserve/ReserveTools.java
...@@ -646,4 +646,25 @@ public class ReserveTools extends XMBaseTest { ...@@ -646,4 +646,25 @@ public class ReserveTools extends XMBaseTest {
} }
} }
/**
* @description:删除私教课次
* @author: xuyamei
* @date: 2024/7/29 16:13
* @param scheduleId ： 课次id
* @return: void
**/
public void delPersonalScheduleItem(String scheduleId){
setUp("API_delPersonalScheduleItem");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("scheduleId", scheduleId);
body.put("applyRestRule", false);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
}
} }
src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java
...@@ -64,18 +64,15 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -64,18 +64,15 @@ public class TestAddMemberReserve extends BaseTestImpl {
String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0); String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
//获取今天结束日期的时间戳 //获取今天结束日期的时间戳
String todayEndDateTimeTamp = CommUtil.getNDayEndTimeTamp(0); String todayEndDateTimeTamp = CommUtil.getNDayEndTimeTamp(0);
private String ruldId; private String ruldId;
private String benefitId;
private String memberId;
private String scheduleId; private String scheduleId;
private Long startTime; private Long startTime;
private String courseId; private String courseId;
private String reserveId; JSONArray memberInfo1 = new JSONArray();
JSONArray memberInfo2 = new JSONArray();
private String memberCardId;
@BeforeMethod @BeforeMethod
@Override @Override
...@@ -121,6 +118,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -121,6 +118,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
String memberId;
// 查询存量的学员没有则创建学员 // 查询存量的学员没有则创建学员
if (tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").size()>0){ if (tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").size()>0){
memberId = tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").getJSONObject(0).getString("id"); memberId = tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").getJSONObject(0).getString("id");
...@@ -131,6 +129,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -131,6 +129,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
}else{ }else{
memberId = memberTools.create("约课学员sandy", RandomStringUtil.randomMobile("203")).getString("result"); memberId = memberTools.create("约课学员sandy", RandomStringUtil.randomMobile("203")).getString("result");
} }
memberInfo1.add(memberId);
// 查询是否有可用的会员卡，没有则购买 // 查询是否有可用的会员卡，没有则购买
...@@ -146,14 +145,18 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -146,14 +145,18 @@ public class TestAddMemberReserve extends BaseTestImpl {
listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId, TimeUtils.getTodayTime()); listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId, TimeUtils.getTodayTime());
} }
// 查询权益 // 查询权益
benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId"); String benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId"); String memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
memberInfo1.add(benefitId);
memberInfo1.add(memberCardId);
// 查询课次详情 查课次的开始时间 // 查询课次详情 查课次的开始时间
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId); JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
startTime = getScheduleItemDetail.getLongValue("startTime"); startTime = getScheduleItemDetail.getLongValue("startTime");
// 预约 // 预约
reserveId = reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId,1,scheduleId,startTime,true); String reserveId = reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId,1,scheduleId,startTime,true);
memberInfo1.add(reserveId);
try { try {
Thread.sleep(2000); Thread.sleep(2000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
...@@ -221,7 +224,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -221,7 +224,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
@Test(priority = 1,description = "学员已经在课次中，无需重复添加") @Test(priority = 1,description = "学员已经在课次中，无需重复添加")
public void testAddMemberReserve2(){ public void testAddMemberReserve2(){
reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId,1,scheduleId,startTime,false); reserveTools.addReserve("","",memberInfo1.getString(1),xmAppApi.getLoginInfo().getAdminId(),memberInfo1.getString(0),1,scheduleId,startTime,false);
String message = dataApi.getBodyInJSON().getString("message"); String message = dataApi.getBodyInJSON().getString("message");
Assert.assertTrue(message.equals("会员已约该课程，不可重复预约") || message.equals("预约失败，无需重复添加")); Assert.assertTrue(message.equals("会员已约该课程，不可重复预约") || message.equals("预约失败，无需重复添加"));
} }
...@@ -249,6 +252,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -249,6 +252,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
}else{ }else{
memberId2 = memberTools.create("约课学员susan", RandomStringUtil.randomMobile("203")).getString("result"); memberId2 = memberTools.create("约课学员susan", RandomStringUtil.randomMobile("203")).getString("result");
} }
memberInfo2.add(memberId2);
// 查询是否有可用的会员卡，没有则购买 // 查询是否有可用的会员卡，没有则购买
JSONArray listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime()); JSONArray listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime());
...@@ -262,7 +266,10 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -262,7 +266,10 @@ public class TestAddMemberReserve extends BaseTestImpl {
} }
listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime()); listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime());
} }
benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId"); String benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
String memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
memberInfo2.add(benefitId);
memberInfo2.add(memberCardId);
reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId2,1,scheduleId,startTime,true); reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId2,1,scheduleId,startTime,true);
String resultCode = dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode"); String resultCode = dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode");
...@@ -279,7 +286,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -279,7 +286,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
} }
@Test(dataProvider = "dataProvider",priority = 3) @Test(dataProvider = "dataProvider",priority = 3)
public void testCancelMemberReserve(boolean success,String message){ public void testCancelMemberReserve(boolean success,String message){
reserveTools.cancelMemberReserve(reserveId,success); reserveTools.cancelMemberReserve(memberInfo1.getString(3),success);
Assert.assertEquals(dataApi.getBodyInJSON().getString("message").contains(message),true); Assert.assertEquals(dataApi.getBodyInJSON().getString("message").contains(message),true);
try { try {
Thread.sleep(2000); Thread.sleep(2000);
...@@ -292,36 +299,36 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -292,36 +299,36 @@ public class TestAddMemberReserve extends BaseTestImpl {
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds"); JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
success = false; success = false;
for (int i = 0; i < reserveIds.size(); i++){ for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getString(i).equals(reserveId)){ if(reserveIds.getString(i).equals(memberInfo1.getString(3))){
success = true; success = true;
} }
} }
Assert.assertFalse(success,"取消约课后课次详情学员还在课次中"); Assert.assertFalse(success,"取消约课后课次详情学员还在课次中");
// check 2：会员详情 - 预约记录已取消 // check 2：会员详情 - 预约记录已取消
JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"RESERVE_CANCEL","","", startTime,TimeUtils.getTodayEndTime(),memberId,"GROUP_CLASS"); JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"RESERVE_CANCEL","","", startTime,TimeUtils.getTodayEndTime(),memberInfo1.getString(0),"GROUP_CLASS");
success = false; success = false;
for(int i =0;i<getPageByMember.size();i++){ for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByMember.getJSONObject(i).getString("id").equals(memberInfo1.getString(3))){
success = true; success = true;
} }
} }
Assert.assertTrue(success,"取消约课后查询取消状态在会员详情页面未查询到相关信息"); Assert.assertTrue(success,"取消约课后查询取消状态在会员详情页面未查询到相关信息");
// check 3：预约记录列表中已取消 // check 3：预约记录列表中已取消
JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"RESERVE_CANCEL","","",startTime,TimeUtils.getTodayEndTime(),memberId,"GROUP_CLASS",""); JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"RESERVE_CANCEL","","",startTime,TimeUtils.getTodayEndTime(),memberInfo1.getString(0),"GROUP_CLASS","");
success = false; success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(memberInfo1.getString(3))){
success = true; success = true;
} }
} }
Assert.assertTrue(success,"取消约课后在约课记录查询取消状态没有查询到相关信息"); Assert.assertTrue(success,"取消约课后在约课记录查询取消状态没有查询到相关信息");
// check 3： 会员卡消耗记录中包含该记录锁定的次数释放 // check 3： 会员卡消耗记录中包含该记录锁定的次数释放
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records"); JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(memberInfo1.getString(1),memberInfo1.getString(2)).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[] {memberInfo1.getString(3),"CANCEL_RESERVE","1.00"};
String[] message1 = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"}; String[] message1 = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){ for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message1[i]); Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message1[i]);
......
src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddToQueue.java
...@@ -207,7 +207,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -207,7 +207,7 @@ public class TestAddToQueue extends BaseTestImpl {
Assert.assertEquals(getDetailById.getString("queueSort"),"1","第一位的学员取消排队后排队名次应该是第1位"); Assert.assertEquals(getDetailById.getString("queueSort"),"1","第一位的学员取消排队后排队名次应该是第1位");
// 操作3：将约课的学员取消 // 操作3：将约课的学员取消
reserveTools.cancelMemberReserve(memberId1.getString(2),true); reserveTools.cancelMemberReserve(memberId1.getString(3),true);
try { try {
Thread.sleep(2500); Thread.sleep(2500);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
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