Skip to content

X
xm-sportstest
Commit 06eeff5e by zhangyuxiao
Options

Merge remote-tracking branch 'origin/master'

parents 5d2283dc 9edee6dc
Showing with 3840 additions and 684 deletions
src/main/java/com/xiaomai/cases/lunar/reserve/ReserveCTools.java
......@@ -6,6 +6,7 @@ import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMBaseTest;
import org.springframework.stereotype.Component;
......@@ -183,7 +184,7 @@ public class ReserveCTools extends XMBaseTest {
* @param dataUserInfos
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject getDetailById(String reserveId,DataUserInfo...dataUserInfos) {
public JSONObject getReserveDetailById(String reserveId,DataUserInfo...dataUserInfos) {
setUP("API_getDetailById");
JSONObject body = new JSONObject();
......@@ -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 {
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();
//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-查询排课日程
JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
//统计查询到的目标日程数量
......@@ -313,7 +313,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
}
Assert.assertTrue(success,mes+"预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getDetailById(memberInfo.getString(2));
JSONObject getDetailById = reserveCTools.getReserveDetailById(memberInfo.getString(2));
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getDetailById.getString(resultString),resultData[j],mes+"产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
......
src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java
......@@ -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};
Random random = new Random();
//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-查询排课日程
JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
//统计查询到的目标日程数量
......@@ -412,7 +412,7 @@ public class TestAddToQueue extends BaseTestImpl {
}
Assert.assertTrue(success,mes+"预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getDetailById(memberInfo.getString(2));
JSONObject getDetailById = reserveCTools.getReserveDetailById(memberInfo.getString(2));
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getDetailById.getString(resultString),resultData[j],mes+"产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
......
src/main/java/com/xiaomai/cases/lunar/reserve/TestCreateSingleReserve.java 0 → 100644
package com.xiaomai.cases.lunar.reserve;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.course.CourseTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.reserve.ReserveTools;
import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
import com.xiaomai.cases.polar.setting.courseCategory.CourseCategoryTools;
import com.xiaomai.cases.polar.setting.rules.RuleTools;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Random;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.reserve
* @Author: xuyamei
* @CreateTime: 2024-07-30 14:44
* @Description: 单次预约
* @Version: 1.0
*/
public class TestCreateSingleReserve extends BaseTestImpl {
@Resource(name = "userTools")
UserTools userTools;
@Resource(name = "reserveCTools")
ReserveCTools reserveCTools;
@Resource(name = "courseCategoryTools")
CourseCategoryTools courseCategoryTools;
@Resource(name = "courseTools")
CourseTools courseTools;
@Resource(name = "reserveTools")
ReserveTools reserveTools;
@Resource(name = "groupScheduleTools")
GroupScheduleTools groupScheduleTools;
@Resource(name = "ruleTools")
RuleTools ruleTools;
@Resource(name = "orderTools")
OrderTools orderTools;
String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(1);
//获取今天结束日期的时间戳
String todayEndDateTimeTamp = CommUtil.getNDayEndTimeTamp(1);
Long scheduleEndTime = TimeUtils.getTodayEndTime(1);
private String ruldId;
private String reserveId;
private String scheduleId;
private Long startTime;
private String courseId;
private String memberId;
private String chiefCoachId;
private String voucherId;
private String benefitId;
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Reserve,"API_createSingleReserve", LoginAccount.GYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test(description = "小程序单次团课预约")
public void testCreateSingleReserve() {
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 预约规则开启允许排队
JSONObject getRules = ruleTools.getGroupBookingRules(); // 获取场馆团课预约规则
String id = getRules.getString("id"); // 获取规则id
Random random = new Random();
int bookingSeatCount = random.nextInt(10)+1; // 席位
ruleTools.saveGroupBookingRules(id,true,bookingSeatCount,true,true,random.nextInt(30)+10,false,random.nextInt(100)+10,random.nextInt(5)+1,false,random.nextInt(100)+10,"minutes",false,random.nextInt(100)+10,"minutes");
memberId = userTools.getMemberInfo().getString("memberId");
// 创建团课课次
createGroupSchedule();
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 课次详情获取上课老师和
JSONObject memberScheduleItemDetail = reserveCTools.getMemberScheduleItemDetail(scheduleId, memberId);
startTime = memberScheduleItemDetail.getLongValue("startTime");
chiefCoachId = memberScheduleItemDetail.getString("chiefCoachId");
// 校验会员加入课次是否有冲突
boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId);
if (checkMemberConflict){
Assert.assertTrue(true,"校验会员有课次冲突");
}
// 检查是否支持预约
String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);
Assert.assertEquals(checkAddSingleReserve,"SUCCESS","支持单次付费约课但返回的不是SUCCESS");
// 创建单次付费约课
voucherId = reserveCTools.createSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 通过订单id获取单次约课任务信息
JSONObject getDetail = reserveCTools.getDetailById(voucherId);
// 验证单次约课信息
String[] result = {"scheduleStartTime","spanMinutes","reserveState","courseId","memberId","scheduleId","courseType","accountType"};
String[] expect = {String.valueOf(startTime),"10","SUCCESS",courseId,memberId,scheduleId,"GROUP_CLASS","SINGLE_RESERVE"};
for (int i = 0; i < result.length-2; i++){
Assert.assertEquals(getDetail.getString(result[i]),expect[i],getDetail.getString(result[i])+"返回值与预期值不一致:"+expect[i]);
}
reserveId = getDetail.getString("reserveId");
benefitId = getDetail.getString("id");
// check 1：查询小程序课次详情，学员是预约状态
String[] result1 = {"reserveState","memberId","scheduleId","accountType"};
String[] expect1 = {"SUCCESS",memberId,scheduleId,"SINGLE_RESERVE"};
memberScheduleItemDetail = reserveCTools.getMemberScheduleItemDetail(scheduleId,memberId);
for(int i = 0;i<4;i++) {
Assert.assertEquals(memberScheduleItemDetail.getJSONObject("memberScheduleInfoVO").getString(result1[i]), expect1[i], "预约产生的数据与实际数据不符合" + result[i] + "：" + expect[i]);
}
// check 2：查询小程序预约记录
JSONArray getPageByMember = reserveCTools.getPageByMember("SUCCESS","",startTime,scheduleEndTime,memberId,"GROUP_CLASS");
boolean success = false;
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getPageByMember.getJSONObject(i).getString(resultString),expect[j],"预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getPageByMember.getJSONObject(i).getString("memberId"),memberId,"查询的预约数据不是同一个会员");
}
}
Assert.assertTrue(success,"预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getReserveDetailById(reserveId);
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getDetailById.getString(resultString),expect[j],"单次预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),memberId,"查询的数据不是同一个会员");
// check 4：查询B端预约详情
result = new String[] {"id","benefitId","benefitType","reserveMemberNum","courseId","courseType","scheduleStartTime","reserveState","scheduleId","accountType"};
expect = new String[] {reserveId,benefitId,"STORED_VALUE","1",courseId,"GROUP_CLASS",startTime+"","SUCCESS",scheduleId,"SINGLE_RESERVE"};
getDetailById = reserveTools.getDetailById(reserveId,dataUserInfo);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),expect[j],"单次预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),memberId,"查询的单次预约数据不是同一个会员");
// check 5：查询B端课次详情
// 课次学员是否包含该会员 且 消耗方式为单次约课
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId,dataUserInfo);
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("memberReserveList");
success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getJSONObject(0).getString("id").equals(reserveId)){
success = true;
for (int j = 0; j < result.length; j++){
Assert.assertEquals(reserveIds.getJSONObject(0).getString(result[j]),expect[j],"单次预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
}
}
Assert.assertTrue(success,"约课后课次详情学员不在课次中");
}
@Test(priority = 2,description = "取消单次约课")
public void cancelMemberReserve(){
reserveCTools.cancelMemberReserve(reserveId,memberId,true);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
String[] result = {"memberOperation","memberId","scheduleId"};
String[] expect = {"TO_RESERVE",memberId,scheduleId};
// check 1：查询小程序课次详情，学员是预约状态
JSONObject memberScheduleItemDetail = reserveCTools.getMemberScheduleItemDetail(scheduleId,memberId);
for(int i = 0;i<result.length;i++) {
Assert.assertEquals(memberScheduleItemDetail.getJSONObject("memberScheduleInfoVO").getString(result[i]), expect[i], "取消预约产生的数据与实际数据不符合" + result[i] + "：" + expect[i]);
}
// 验证单次约课信息
result = new String[]{"scheduleStartTime","spanMinutes","reserveState","courseId","memberId","scheduleId","courseType","accountType","refundState"};
expect = new String[]{String.valueOf(startTime),"10","RESERVE_CANCEL",courseId,memberId,scheduleId,"GROUP_CLASS","SINGLE_RESERVE","NO_REFUND"};
// check 2：查询小程序预约记录
JSONArray getPageByMember = reserveCTools.getPageByMember("RESERVE_CANCEL","",startTime,scheduleEndTime,memberId,"GROUP_CLASS");
boolean success = false;
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getPageByMember.getJSONObject(i).getString(resultString),expect[j],"取消预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getPageByMember.getJSONObject(i).getString("memberId"),memberId,"查询的预约数据不是同一个会员");
}
}
Assert.assertTrue(success,"取消预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getReserveDetailById(reserveId);
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getDetailById.getString(resultString),expect[j],"单次取消预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),memberId,"查询的数据不是同一个会员");
// check 4：查询B端预约详情
result = new String[] {"id","benefitId","benefitType","reserveMemberNum","courseId","courseType","scheduleStartTime","reserveState","scheduleId","accountType","refundState"};
expect = new String[] {reserveId,benefitId,"STORED_VALUE","1",courseId,"GROUP_CLASS",startTime+"","RESERVE_CANCEL",scheduleId,"SINGLE_RESERVE","NO_REFUND"};
getDetailById = reserveTools.getDetailById(reserveId,dataUserInfo);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),expect[j],"单次取消预约产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),memberId,"查询的单次预约数据不是同一个会员");
// check 5：查询B端课次详情
// 课次学员是否包含该会员 且 消耗方式为单次约课
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId,dataUserInfo);
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
Assert.assertTrue(reserveIds.size()==0,"取消约课后课次详情学员还在课次中");
// check 6：查询订单状态为已作废
JSONObject fetchDetailById = orderTools.getDetail(voucherId,dataUserInfo);
Assert.assertEquals(fetchDetailById.getJSONObject("result").getString("state"),"DISCARD","单次付费约课取消订单状态不是已作废");
Assert.assertEquals(fetchDetailById.getJSONObject("result").getString("discardMemo"),"取消预约/排队，自动作废订单","单次付费约课取消备注不是：取消预约/排队，自动作废订单");
}
@Test(priority = 3)
public void del(){
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 删除排课数据
groupScheduleTools.delGroupRuleSchedule(ruldId,true,dataUserInfo);
// 删除课次
groupScheduleTools.delGroupScheduleItem(scheduleId,dataUserInfo);
}
// 创建团课课次
public void createGroupSchedule(){
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 查询存量的约课课程
// 查询存量的课程分类
String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
courseId = courseTools.getPersonalOrGroupCourseId("GROUP", "单次付费约课团课", categoryId, "STUDIO", "", 2, 1,dataUserInfo).getString(0);
// 修改课程支持单次约课
courseTools.editGroupCourse(categoryId,courseId,"单次付费约课团课",10,true,0,dataUserInfo);
// 创建排课
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();
//1.1-创建排课日程
groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), true, 1,minuteOffset[random.nextInt(20)],dataUserInfo);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//1.2-查询排课日程
JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
//统计查询到的目标日程数量
ruldId = XMJSONPath.readPath(getGroupRuleScheduleList.getJSONObject(0), "$.ruleId");
Long scheduleEndTime = TimeUtils.getTodayEndTime(1);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 查询课次id
JSONArray memberTimetable = reserveCTools.memberTimetable(memberId,Long.valueOf(todayStartTimeTamp), scheduleEndTime);
for (int i = 0; i < memberTimetable.size(); i++){
if (memberTimetable.getJSONObject(i).containsKey("ruleId") && memberTimetable.getJSONObject(i).getString("ruleId").equals(ruldId)){
scheduleId = memberTimetable.getJSONObject(i).getString("scheduleId");
break;
}
}
}
}
src/main/java/com/xiaomai/cases/lunar/reserve/TestSingleReserveSignIn.java 0 → 100644
package com.xiaomai.cases.lunar.reserve;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.course.CourseTools;
import com.xiaomai.cases.polar.reserve.ReserveTools;
import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
import com.xiaomai.cases.polar.setting.courseCategory.CourseCategoryTools;
import com.xiaomai.cases.polar.setting.rules.RuleTools;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Random;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.reserve
* @Author: xuyamei
* @CreateTime: 2024-07-30 16:57
* @Description: 单次约课签到
* @Version: 1.0
*/
public class TestSingleReserveSignIn extends BaseTestImpl {
@Resource(name = "userTools")
UserTools userTools;
@Resource(name = "reserveCTools")
ReserveCTools reserveCTools;
@Resource(name = "courseCategoryTools")
CourseCategoryTools courseCategoryTools;
@Resource(name = "courseTools")
CourseTools courseTools;
@Resource(name = "reserveTools")
ReserveTools reserveTools;
@Resource(name = "groupScheduleTools")
GroupScheduleTools groupScheduleTools;
@Resource(name = "ruleTools")
RuleTools ruleTools;
String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
//获取今天结束日期的时间戳
String todayEndDateTimeTamp = CommUtil.getNDayEndTimeTamp(0);
Long scheduleEndTime = TimeUtils.getTodayEndTime(0);
private String ruldId;
private String reserveId;
private String scheduleId;
private Long startTime;
private String courseId;
private String memberId;
private String chiefCoachId;
private String voucherId;
private String benefitId;
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Reserve,"API_createSingleReserve", LoginAccount.GYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test(description = "小程序单次团课预约")
public void testSingleReserveSignIn() {
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 预约规则开启允许排队
JSONObject getRules = ruleTools.getGroupBookingRules(); // 获取场馆团课预约规则
String id = getRules.getString("id"); // 获取规则id
Random random = new Random();
int bookingSeatCount = random.nextInt(10)+1; // 席位
ruleTools.saveGroupBookingRules(id,true,bookingSeatCount,true,true,999,false,random.nextInt(100)+10,random.nextInt(5)+1,false,random.nextInt(100)+10,"minutes",false,random.nextInt(100)+10,"minutes");
memberId = userTools.getMemberInfo().getString("memberId");
// 创建团课课次
LocalDateTime currentDateTime = LocalDateTime.now();
int hour = currentDateTime.getHour();
int minutes = currentDateTime.getMinute();
int minute = hour*60+minutes+10 ;
createGroupSchedule(minute);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 课次详情获取上课老师和
JSONObject memberScheduleItemDetail = reserveCTools.getMemberScheduleItemDetail(scheduleId, memberId);
startTime = memberScheduleItemDetail.getLongValue("startTime");
chiefCoachId = memberScheduleItemDetail.getString("chiefCoachId");
// 校验会员加入课次是否有冲突
boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId);
if (checkMemberConflict){
Assert.assertTrue(true,"校验会员有课次冲突");
}
// 检查是否支持预约
String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);
Assert.assertEquals(checkAddSingleReserve,"SUCCESS","支持单次付费约课但返回的不是SUCCESS");
// 创建单次付费约课
voucherId = reserveCTools.createSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 通过订单id获取单次约课任务信息
JSONObject getDetail = reserveCTools.getDetailById(voucherId);
// 验证单次约课信息
String[] result = {"scheduleStartTime","spanMinutes","reserveState","courseId","memberId","scheduleId","courseType","accountType"};
String[] expect = {String.valueOf(startTime),"10","SUCCESS",courseId,memberId,scheduleId,"GROUP_CLASS","SINGLE_RESERVE"};
for (int i = 0; i < result.length-2; i++){
Assert.assertEquals(getDetail.getString(result[i]),expect[i],getDetail.getString(result[i])+"返回值与预期值不一致:"+expect[i]);
}
reserveId = getDetail.getString("reserveId");
benefitId = getDetail.getString("id");
// 手动签到
reserveCTools.signIn(true,reserveId,memberId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 签到完成后check
// check 1：查询小程序课次详情，学员是预约状态
String[] result1 = {"reserveState","memberId","scheduleId","accountType","signInState"};
String[] expect1 = {"SUCCESS",memberId,scheduleId,"SINGLE_RESERVE","SIGNED"};
memberScheduleItemDetail = reserveCTools.getMemberScheduleItemDetail(scheduleId,memberId);
for(int i = 0;i<4;i++) {
Assert.assertEquals(memberScheduleItemDetail.getJSONObject("memberScheduleInfoVO").getString(result1[i]), expect1[i], "预约产生的数据与实际数据不符合" + result[i] + "：" + expect[i]);
}
// check 2：查询小程序预约记录
JSONArray getPageByMember = reserveCTools.getPageByMember("SIGNED","",startTime,scheduleEndTime,memberId,"GROUP_CLASS");
boolean success = false;
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getPageByMember.getJSONObject(i).getString(resultString),expect[j],"单次预约签到产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getPageByMember.getJSONObject(i).getString("memberId"),memberId,"查询的预约数据不是同一个会员");
}
}
Assert.assertTrue(success,"预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getReserveDetailById(reserveId);
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getDetailById.getString(resultString),expect[j],"单次预约签到产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),memberId,"查询的数据不是同一个会员");
// check 4：查询B端预约详情
result = new String[] {"id","benefitId","benefitType","reserveMemberNum","courseId","courseType","scheduleStartTime","reserveState","scheduleId","accountType","signInState"};
expect = new String[] {reserveId,benefitId,"STORED_VALUE","1",courseId,"GROUP_CLASS",startTime+"","SUCCESS",scheduleId,"SINGLE_RESERVE","SIGNED"};
getDetailById = reserveTools.getDetailById(reserveId,dataUserInfo);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),expect[j],"单次预约签到产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),memberId,"查询的单次预约数据不是同一个会员");
// check 5：查询B端课次详情
// 课次学员是否包含该会员 且 消耗方式为单次约课
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId,dataUserInfo);
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("memberReserveList");
success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getJSONObject(0).getString("id").equals(reserveId)){
success = true;
for (int j = 0; j < result.length; j++){
Assert.assertEquals(reserveIds.getJSONObject(0).getString(result[j]),expect[j],"单次预约签到产生的数据与实际数据不符合"+result[j]+"："+expect[j]);
}
}
}
Assert.assertTrue(success,"单次预约签到后课次详情学员不在课次中");
}
// 创建团课课次
public void createGroupSchedule(int minute){
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 查询存量的约课课程
// 查询存量的课程分类
String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
courseId = courseTools.getPersonalOrGroupCourseId("GROUP", "单次付费团课签到", categoryId, "STUDIO", "", 2, 1,dataUserInfo).getString(0);
// 创建排课
//1.1-创建排课日程
groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), true, 1,minute,dataUserInfo);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//1.2-查询排课日程
JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
//统计查询到的目标日程数量
ruldId = XMJSONPath.readPath(getGroupRuleScheduleList.getJSONObject(0), "$.ruleId");
Long scheduleEndTime = TimeUtils.getTodayEndTime(0);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 查询课次id
JSONArray memberTimetable = reserveCTools.memberTimetable(memberId,Long.valueOf(todayStartTimeTamp), scheduleEndTime);
for (int i = 0; i < memberTimetable.size(); i++){
if (memberTimetable.getJSONObject(i).containsKey("ruleId") && memberTimetable.getJSONObject(i).getString("ruleId").equals(ruldId)){
scheduleId = memberTimetable.getJSONObject(i).getString("scheduleId");
break;
}
}
// 修改课程支持单次约课
courseTools.editGroupCourse(categoryId,courseId,"单次付费团课签到",10,true,0,dataUserInfo);
}
}
src/main/java/com/xiaomai/cases/lunar/reserve/TestXCXSignIn.java
......@@ -332,7 +332,7 @@ public class TestXCXSignIn extends BaseTestImpl {
}
Assert.assertTrue(success,mes+"预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getDetailById(memberInfo.getString(2));
JSONObject getDetailById = reserveCTools.getReserveDetailById(memberInfo.getString(2));
for(int j = 0;j<result.length;j++){
String resultString = result[j].equals("reserveId")?"id":result[j];
Assert.assertEquals(getDetailById.getString(resultString),resultData[j],mes+"产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
......
src/main/java/com/xiaomai/cases/lunar/training/TestGetMemberCampScheduleItemList.java 0 → 100644
package com.xiaomai.cases.lunar.training;
import com.alibaba.fastjson.JSONArray;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.training
* @Author: xuyamei
* @CreateTime: 2024-07-31 17:45
* @Description: 训练营课表数据
* @Version: 1.0
*/
public class TestGetMemberCampScheduleItemList extends BaseTestImpl {
@Resource(name = "trainingCTools")
TrainingCTools trainTools;
@Resource(name = "userTools")
UserTools userTools;
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Training,"API_getMemberCampScheduleItemList", LoginAccount.GYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test(description = "获取会员训练营课表数据")
public void testGetMemberCampScheduleItemList(){
// 获取的微信用户
String memberId = userTools.getMemberInfo().getString("memberId");
JSONArray data = trainTools.getMemberCampScheduleItemList(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),memberId);
Assert.assertEquals(data.size()>=3,true,"有3条存量的训练营课次数据");
}
}
src/main/java/com/xiaomai/cases/lunar/training/TestPurchaseCamp.java 0 → 100644
package com.xiaomai.cases.lunar.training;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.order.OrderCTools;
import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.training
* @Author: xuyamei
* @CreateTime: 2024-07-31 14:55
* @Description: 购买存量的训练营
* @Version: 1.0
*/
public class TestPurchaseCamp extends BaseTestImpl {
@Resource(name = "trainingCTools")
TrainingCTools trainTools;
@Resource(name = "userTools")
UserTools userTools;
OrderCTools orderCTools = new OrderCTools();
@Resource(name = "orderTools")
OrderTools orderTools;
private String orderId = "";
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Training,"API_purchaseCamp", LoginAccount.GYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test
public void testPurchaseCamp(){
// 获取存量训练营活动
String id = trainTools.getAppliableCampList("存量训练营Ｃ端报名活动").getJSONObject(0).getString("id");
// 获取的微信用户
String memberId = userTools.getMemberInfo().getString("memberId");
JSONObject body = new JSONObject();
body.put("campId", id);
body.put("memberId", memberId);
body.put("memo", "");
body.put("receivableAmount", "0.00");
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("objectId", RandomStringUtil.randomString(16));
xmAppApi.doRequest(RequestType.JSON,params, body.toString(), headers).assetsSuccess(true);
orderId = xmAppApi.getBodyInJSON().getString("result");
// check 1:订单详情
JSONArray voucherItems = orderCTools.getDetail(orderId).getJSONObject("result").getJSONArray("voucherItems");
String[] keys = new String[]{"skuId","skuType"};
String[] expect = new String[]{id,"TRAINING_CAMP"};
for (int i = 0; i < keys.length; i++) {
Assert.assertTrue(voucherItems.getJSONObject(0).getString(keys[i]).equals(expect[i]) );
}
// check 2：查询我的训练营列表
JSONArray listMyTrainingCamp = trainTools.listMyTrainingCamp(memberId);
keys = new String[]{"tradeOrderId","accountType"};
expect = new String[]{orderId,"TRAINING"};
// 生成训练营账户的id
String accountId = "";
for (int i = 0; i < listMyTrainingCamp.size(); i++){
if (listMyTrainingCamp.getJSONObject(i).getString("tenantMemberCardId").equals(id)){
for (int j = 0; j < keys.length; j++){
Assert.assertTrue(listMyTrainingCamp.getJSONObject(i).getString(keys[j]).equals(expect[j]));
accountId = listMyTrainingCamp.getJSONObject(i).getString("id");
}
}
}
// check 3：获取我的训练营详情 以及和购买的训练营内容是否一致
JSONObject findMyTrainingCampDetailById =trainTools.findMyTrainingCampDetailById(accountId);
JSONObject findDetailById = trainTools.findDetailById(id,memberId);
keys = new String[]{"id","studioId","title","courseId","openStartDate","openEndDate","totalClassHour","price","trainerIds"};
for (int i = 0; i < keys.length; i++){
Assert.assertTrue(findMyTrainingCampDetailById.getJSONObject("trainingCampInfo").getString(keys[i]).equals(findDetailById.getString(keys[i])));
}
// check 3.2 验证我的训练营订单id
Assert.assertTrue(findMyTrainingCampDetailById.getString("tradeOrderId").equals(orderId));
}
@Test(description = "作废订单数据，为了下次再购买",priority = 2)
public void delOrderData(){
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
orderTools.discard(orderId,"重复录入","作废训练营订单",dataUserInfo);
}
}
src/main/java/com/xiaomai/cases/lunar/training/TestTrainingFindDetailById.java 0 → 100644
package com.xiaomai.cases.lunar.training;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.training.TrainingTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.training
* @Author: xuyamei
* @CreateTime: 2024-07-31 15:03
* @Description: 小程序训练营详情
* @Version: 1.0
*/
public class TestTrainingFindDetailById extends BaseTestImpl {
@Resource(name = "trainingCTools")
TrainingCTools trainingCTools;
@Resource(name = "userTools")
UserTools userTools;
@Resource(name = "trainingTools")
TrainingTools trainingTools;
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Training,"API_findDetailById", LoginAccount.GYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test
public void testTrainingFindDetailById(){
// 获取微信学员
String memberId = userTools.getMemberInfo().getString("memberId");
// 获取训练营活动
String id = trainingCTools.getAppliableCampList("量训练营Ｃ端报名活动").getJSONObject(0).getString("id");
JSONObject findDetailById = trainingCTools.findDetailById(id,memberId);
String[] keys = {"id","studioId","state","title","courseId","openStartDate","openEndDate","totalClassHour","price","trainerIds"};
trainingTools.findTrainingDetailById(id);
JSONObject findTrainingDetailById = dataApi.getBodyInJSON().getJSONObject("result");
for (int i = 0; i < keys.length; i++){
Assert.assertEquals(findDetailById.getString(keys[i]),findTrainingDetailById.getString(keys[i]),"训练营详情返回值与B端对比内容不一致");
}
}
}
src/main/java/com/xiaomai/cases/lunar/training/TestTrainingSign.java 0 → 100644
package com.xiaomai.cases.lunar.training;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.reserve.ReserveCTools;
import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.setting.rules.RuleTools;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.training
* @Author: xuyamei
* @CreateTime: 2024-08-01 10:18
* @Description: 训练营签到（因训练营点名只能取存量数据，所以准备3个存量活动执行点名，超出3次抛出异常）
* @Version: 1.0
*/
public class TestTrainingSign extends BaseTestImpl {
@Resource(name = "trainingCTools")
TrainingCTools trainTools;
@Resource(name = "userTools")
UserTools userTools;
@Resource(name = "ruleTools")
RuleTools ruleTools;
@Resource(name = "reserveCTools")
ReserveCTools reserveCTools;
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Reserve,"API_signInByScanCode", LoginAccount.GYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test(description = "训练营签到")
public void testTrainingSign(){
DataUserInfo dataUserInfo = new DataUserInfo();
dataUserInfo.setTerminal(Terminal.B);
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 获取的微信用户
String memberId = userTools.getMemberInfo().getString("memberId");
// 获取训练营签到规则
JSONObject getRules = ruleTools.getCampBookingRules(dataUserInfo); // 获取场馆团课预约规则
String id = getRules.getString("id"); // 获取规则id
// 因训练营课表列表无法查看到约课id，所以签到方式只取扫码签到
ruleTools.saveCampBookingRules(id,true,true,999,dataUserInfo);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
String scheduleId = "";
JSONArray getMemberCampScheduleItemList = trainTools.getMemberCampScheduleItemList(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),memberId);
boolean hasData = false;
for (int j = 0; j < getMemberCampScheduleItemList.size(); j++){
if (getMemberCampScheduleItemList.getJSONObject(j).getString("recordStatus").equals("TODO")){
hasData = true;
scheduleId = getMemberCampScheduleItemList.getJSONObject(j).getString("scheduleId");
}
}
Assert.assertTrue(hasData,"存量已经没有可签到的训练营，请手动回归训练营手动签到和扫码签到");
// 扫码签到
reserveCTools.signInByScanCode(true,scheduleId,memberId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1: 课次列表是已点名状态
getMemberCampScheduleItemList = trainTools.getMemberCampScheduleItemList(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),memberId);
for (int j = 0; j < getMemberCampScheduleItemList.size(); j++){
if (getMemberCampScheduleItemList.getJSONObject(j).getString("scheduleId").equals(scheduleId)){
Assert.assertEquals(getMemberCampScheduleItemList.getJSONObject(j).getString("recordStatus"),"DONE","签到失败");
}
}
// check 2：查询小程序预约记录
JSONArray getPageByMember = reserveCTools.getPageByMember("SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),memberId,"TRAINING_CAMP");
boolean success = false;
String reserveId = "";
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("scheduleId").equals(scheduleId)){
success = true;
Assert.assertEquals(getPageByMember.getJSONObject(i).getString("signInState"),"SIGNED");
reserveId = getPageByMember.getJSONObject(i).getString("id");
}
}
Assert.assertTrue(success,"签到之后预约记录没有查询到相关信息");
// check 3：查询小程序预约详情
JSONObject getDetailById = reserveCTools.getReserveDetailById(reserveId);
Assert.assertEquals(getDetailById.getString("signInState"),"SIGNED");
}
}
src/main/java/com/xiaomai/cases/lunar/training/TrainingCTools.java 0 → 100644
package com.xiaomai.cases.lunar.training;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import org.springframework.stereotype.Component;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.training
* @Author: xuyamei
* @CreateTime: 2024-07-31 14:48
* @Description: 训练营相关接口
* @Version: 1.0
*/
@Component("trainingCTools")
public class TrainingCTools extends BaseTestImpl {
public void setUP(String apiName, DataUserInfo... userInfo) {
dataApi.setApiModule(ApiModule.Lunar_Training)
.setApiName(apiName)
.setTerminal(Terminal.minApp);
super.beforeDataRequest(userInfo);
}
/**
* @description: 查询在售训练营
* @author: xuyamei
* @date: 2024/7/31 16:55
* @param title：训练营名称
* @return: com.alibaba.fastjson.JSONArray
**/
public JSONArray getAppliableCampList(String title) {
setUP("API_fetchAppliableCampList");
JSONObject body = new JSONObject();
body.put("current",0);
body.put("size",10);
body.put("title",title);
body.put("brandId",dataApi.getLoginInfo().getBrandId());
body.put("studioId",dataApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("records");
}
/**
* @description:查询训练营详情
* @author: xuyamei
* @date: 2024/7/31 16:55
* @param trainingCampId 训练营活动id
* @param memberId 会员id
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject findDetailById(String trainingCampId,String memberId) {
setUP("API_findDetailById");
JSONObject body = new JSONObject();
body.put("trainingCampId",trainingCampId);
body.put("memberId",memberId);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result");
}
/**
* @description:我的训练营列表
* @author: xuyamei
* @date: 2024/7/31 16:56
* @param memberId 会员id
* @return: com.alibaba.fastjson.JSONArray
**/
public JSONArray listMyTrainingCamp(String memberId) {
setUP("API_listMyTrainingCamp");
JSONObject body = new JSONObject();
body.put("memberId",memberId);
body.put("usable",true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONArray("result");
}
/**
* @description:获取我的训练营详情
* @author: xuyamei
* @date: 2024/7/31 17:06
* @param id
* @return: com.alibaba.fastjson.JSONArray
**/
public JSONObject findMyTrainingCampDetailById(String id) {
setUP("API_findMyTrainingCampDetailById");
JSONObject body = new JSONObject();
body.put("id",id);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result");
}
public JSONArray getMemberCampScheduleItemList(Long startDate, Long endDate, String memberId){
setUP("API_getMemberCampScheduleItemList");
JSONObject body = new JSONObject();
body.put("startDate",startDate);
body.put("endDate",endDate);
body.put("memberId",memberId);
body.put("brandId",dataApi.getLoginInfo().getBrandId());
body.put("studioId",dataApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONArray("result");
}
}
src/main/java/com/xiaomai/cases/polar/clue/MemberTools.java
......@@ -30,7 +30,7 @@ public class MemberTools extends BaseTestImpl {
super.beforeDataRequest(userInfos);
Random random = new Random();
String[] idCardType = {"IDENTITY","SAR_PERMIT","idCardType"};//身份证、港澳通行证、护照
String[] idCardType = {"IDENTITY","SAR_PERMIT","PASSPORT"};//身份证、港澳通行证、护照
String[] intention = {"HIGH","MIDDLE","LOW"};//意向度：高、中、低
JSONObject object = new JSONObject();
......
src/main/java/com/xiaomai/cases/polar/coupon/CouponTools.java
......@@ -9,6 +9,7 @@ import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.springframework.stereotype.Component;
import org.testng.Assert;
import java.util.ArrayList;
import java.util.List;
......@@ -97,7 +98,8 @@ public class CouponTools extends BaseTestImpl {
body.put("memo", memo);
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
return XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
}
......@@ -150,7 +152,9 @@ public class CouponTools extends BaseTestImpl {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id",couponId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
......@@ -166,7 +170,9 @@ public class CouponTools extends BaseTestImpl {
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id",couponId);
body.put("inventory",inventory);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -184,6 +190,64 @@ public class CouponTools extends BaseTestImpl {
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
}
/**
* 优惠券详情-查看已发放/已使用优惠券
* @param couponId 优惠券ID
* @param status 优惠券的适用状态，""表示已发放列表的状态，USED是已使用
*/
public void getCouponReceiveRecord(String couponId,String status){
setUP("API_getCouponReceiveRecord");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("current", 0);
body.put("size", 500);
body.put("couponId", couponId);
body.put("status", status);
if(status.isEmpty()){
body.put("status", null);
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
* 会员详情-查看会员已领取/已发放优惠券
* @param memberId 会员ID
* @param status 优惠券状态：待使用"AVAILABLE"， 已使用"USED"， 已过期"EXPIRED"，已作废"ABANDONED"
*/
public void getMemberReceivedCoupon(String memberId,String status){
setUP("API_getMemberReceivedCoupon");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("current", 0);
body.put("size", 500);
body.put("receiverId", memberId);
body.put("status", status);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
}
/**
* 作废会员已领取/已发放的优惠券
* @param recordId 对应的记录ID
*/
public void abandonMembercouponReceiveRecord(String recordId){
setUP("API_abandonMembercouponReceiveRecord");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", recordId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/coupon/TestBatchSendCouponToMember.java
package com.xiaomai.cases.polar.coupon;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.schedule.camp.SelectTargetTrainingCampAndGetInfo;
import com.xiaomai.cases.polar.training.TrainingTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
......@@ -25,7 +26,7 @@ import java.util.List;
* data 2024/7/27 17:16
*/
public class TestBatchSendCouponToMember extends BaseTestImpl {
public class TestBatchSendCouponToMember extends SelectTargetTrainingCampAndGetInfo {
@Resource(name = "couponTools")
CouponTools couponTools;
String memberId = "";
......@@ -34,6 +35,9 @@ public class TestBatchSendCouponToMember extends BaseTestImpl {
@Resource(name = "trainingTools")
TrainingTools trainingTools;
@Resource(name = "orderTools")
OrderTools orderTools;
String title = "";
String couponId = "";
......@@ -64,13 +68,14 @@ public class TestBatchSendCouponToMember extends BaseTestImpl {
int quantityBefore = Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.quantity"));
int inventoryBefore = Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.inventory"));
int receivedBefore = Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.received"));
Double preferential=Double.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.preferential"));
//4.操作定向发放优惠券
//搜索目标会员
String phone = "17682302508";
String phone = "15558121569";
memberId = trainingTools.searchTargerMember(phone);
if (memberId.isEmpty()) {
memberId = tools.create("测试机吴彦祖", phone).getString("result");
memberId = tools.create("杜君丽", phone).getString("result");
}
JSONObject body = new JSONObject();
List<String> receiverIds = new ArrayList<>();
......@@ -80,7 +85,8 @@ public class TestBatchSendCouponToMember extends BaseTestImpl {
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("couponId", couponId);
body.put("receiverIds", receiverIds);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
String taskId = XMJSONPath.readPath(xmAppApi.getApi_response(), "$.result");
//check任务中心生成一条任务
......@@ -101,9 +107,107 @@ public class TestBatchSendCouponToMember extends BaseTestImpl {
Assert.assertTrue(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.inventory"))+1==inventoryBefore,"优惠券发放给会员后，剩余库存没减少");
Assert.assertTrue(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.received"))-1==receivedBefore,"优惠券发放给会员后，已发放数据不对");
//优惠券详情-已发放记录
couponTools.getCouponReceiveRecord(couponId,"");
Long countR= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("couponId").equals(couponId)).count();
Assert.assertTrue(countR==1,"操作定向发放优惠券后，发给一个学员，然后在优惠券详情已发放列表没匹配到数据");
String goalRecordId=XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("couponId").equals(couponId)).map(e->e.getString("id")).findFirst().orElse(null);
//会员详情-优惠券-已发放优惠券:待使用列表check
couponTools.getMemberReceivedCoupon(memberId,"AVAILABLE");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)).count()==1,"操作定向发放优惠券后，发给一个学员，然后在会员详情-优惠券-待使用列表没匹配到数据");
//操作修改剩余库存
couponTools.modifyCouponInventory(couponId,10);
//剩余库存修改成功后，优惠券详情check 总数据，剩余库存，已发放数量
couponTools.getCouponDetail(couponId);
Assert.assertTrue(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.quantity"))==11,"修改剩余库存后，优惠券的总数量对不上了");
Assert.assertTrue(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.inventory"))==10,"修改剩余库存后，剩余库存数量对不上");
Assert.assertTrue(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.received"))==1,"优惠券发放给会员后，已发放数据不对");
//操作失效优惠券
couponTools.InvalidCoupon(couponId);
//查看优惠券详情，check状态
couponTools.getCouponDetail(couponId);
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.status").equals("VOIDED"),"操作失效优惠券后，查看优惠券详情，后端返回的状态值不是VOIDED");
//操作给刚发放优惠券的会员 去买训练营（使用优惠券）
trainingTools.doSignCampOrder(memberId,this.price-preferential,this.campId,goalRecordId);
String orderId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result");
//优惠券详情-已使用优惠券check
couponTools.getCouponReceiveRecord(couponId,"USED");
Long countRUse= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().
filter(e ->
e.getString("couponId").equals(couponId)).
filter(e ->
e.getString("status").equals("USED")).count();
Assert.assertTrue(countRUse==1,"定向发放优惠券后，学员使用了优惠券，在优惠券详情-已使用记录中数据没匹配上");
//会员详情-优惠券-已使用优惠券 为 1check
couponTools.getMemberReceivedCoupon(memberId,"USED");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)). filter(e ->
e.getString("status").equals("USED")).count()==1,"会员使用优惠券后，会员详情-优惠券-已使用优惠券列表数据没有目标数据");
//会员详情-优惠券-目标待使用优惠券为0
couponTools.getMemberReceivedCoupon(memberId,"AVAILABLE");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)). filter(e ->
e.getString("status").equals("AVAILABLE")).count()==0,"会员使用优惠券后，会员详情-优惠券-待使用优惠券列表数据还有目标数据");
//用完优惠券后check，优惠券详情已核销数量
couponTools.getCouponDetail(couponId);
Assert.assertTrue(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.verified"))==1,"优惠券发放给会员,会员适用后，对应优惠券已使用数量不对");
//操作作废订单，check优惠券是否返还给会员，优惠券中已发放数量中核销数量是否同步更新
orderTools.discard(orderId,"重复录入","自动化测试作废训练营订单");
//优惠券详情-已使用优惠券check
couponTools.getCouponReceiveRecord(couponId,"USED");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().
filter(e ->
e.getString("couponId").equals(couponId)).
filter(e ->
e.getString("status").equals("USED")).count()==0,"学员使用了优惠券报名，订单被作废后，在优惠券详情-已使用记录中数据还存在");
//会员详情-优惠券-已使用优惠券check（退）
couponTools.getMemberReceivedCoupon(memberId,"USED");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)). filter(e ->
e.getString("status").equals("USED")).count()==0,"会员使用优惠券后，再操作作废订单，会员详情-优惠券-已使用优惠券列表数据还有目标数据");
//会员详情-优惠券-已发放check（+1）
couponTools.getMemberReceivedCoupon(memberId,"AVAILABLE");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)).count()==1,"会员使用优惠券下单，作废订单后，然后在会员详情-优惠券-待使用列表没匹配到数据");
//优惠券详情-已发放记录-操作作废优惠券
couponTools.abandonMembercouponReceiveRecord(goalRecordId);
//优惠券详情，已发放记录列表，优惠券状态为已作废
couponTools.getCouponReceiveRecord(couponId,"");
Long countRAbandon= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("couponId").equals(couponId)).filter(e ->
e.getString("status").equals("ABANDONED")).count();
Assert.assertTrue(countR==1,"操作定向发放优惠券后，再作废优惠券，然后在优惠券详情已发放列表没匹配到数据");
//会员详情-优惠券-已作废优惠券check
couponTools.getMemberReceivedCoupon(memberId,"ABANDONED");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)).filter(e ->
e.getString("status").equals("ABANDONED")).count()==1,"作废会员优惠券后，会员详情-优惠券-已作废优惠券列表数据没有目标数据");
//会员详情-优惠券-已发放check（-1）
couponTools.getMemberReceivedCoupon(memberId,"AVAILABLE");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream().filter(e ->
e.getString("id").equals(goalRecordId)).filter(e ->
e.getString("status").equals("AVAILABLE")).count()==0,"作废会员优惠券后，然后在会员详情-优惠券-待使用列表还能匹配到数据");
//最后要删除刚创建的训练营活动
trainingTools.deleteTraining(this.campId);
}
}
......
src/main/java/com/xiaomai/cases/polar/course/CourseTools.java
......@@ -454,4 +454,49 @@ public class CourseTools extends XMBaseTest {
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 {
}
}
/**
* @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 {
String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
//获取今天结束日期的时间戳
String todayEndDateTimeTamp = CommUtil.getNDayEndTimeTamp(0);
private String ruldId;
private String benefitId;
private String memberId;
private String scheduleId;
private Long startTime;
private String courseId;
private String reserveId;
JSONArray memberInfo1 = new JSONArray();
JSONArray memberInfo2 = new JSONArray();
private String memberCardId;
@BeforeMethod
@Override
......@@ -121,6 +118,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
throw new RuntimeException(e);
}
String memberId;
// 查询存量的学员没有则创建学员
if (tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").size()>0){
memberId = tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").getJSONObject(0).getString("id");
......@@ -131,6 +129,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
}else{
memberId = memberTools.create("约课学员sandy", RandomStringUtil.randomMobile("203")).getString("result");
}
memberInfo1.add(memberId);
// 查询是否有可用的会员卡，没有则购买
......@@ -146,14 +145,18 @@ public class TestAddMemberReserve extends BaseTestImpl {
listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId, TimeUtils.getTodayTime());
}
// 查询权益
benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
String benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
String memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
memberInfo1.add(benefitId);
memberInfo1.add(memberCardId);
// 查询课次详情 查课次的开始时间
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
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 {
Thread.sleep(2000);
} catch (InterruptedException e) {
......@@ -221,7 +224,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
@Test(priority = 1,description = "学员已经在课次中，无需重复添加")
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");
Assert.assertTrue(message.equals("会员已约该课程，不可重复预约") || message.equals("预约失败，无需重复添加"));
}
......@@ -230,6 +233,11 @@ public class TestAddMemberReserve extends BaseTestImpl {
public void testAddMemberReserve3(){
// 修改课次人数上限为1
groupScheduleTools.editGroupSchedule(scheduleId,startTime,xmAppApi.getLoginInfo().getAdminId(),1,1);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 修改预约规则不允许排队
JSONObject getRules = ruleTools.getGroupBookingRules(); // 获取场馆团课预约规则
String id = getRules.getString("id"); // 获取规则id
......@@ -249,6 +257,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
}else{
memberId2 = memberTools.create("约课学员susan", RandomStringUtil.randomMobile("203")).getString("result");
}
memberInfo2.add(memberId2);
// 查询是否有可用的会员卡，没有则购买
JSONArray listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime());
......@@ -262,7 +271,10 @@ public class TestAddMemberReserve extends BaseTestImpl {
}
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);
String resultCode = dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode");
......@@ -279,7 +291,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
}
@Test(dataProvider = "dataProvider",priority = 3)
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);
try {
Thread.sleep(2000);
......@@ -292,36 +304,36 @@ public class TestAddMemberReserve extends BaseTestImpl {
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getString(i).equals(reserveId)){
if(reserveIds.getString(i).equals(memberInfo1.getString(3))){
success = true;
}
}
Assert.assertFalse(success,"取消约课后课次详情学员还在课次中");
// 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;
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;
}
}
Assert.assertTrue(success,"取消约课后查询取消状态在会员详情页面未查询到相关信息");
// 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;
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;
}
}
Assert.assertTrue(success,"取消约课后在约课记录查询取消状态没有查询到相关信息");
// 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[] 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与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; 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 {
Assert.assertEquals(getDetailById.getString("queueSort"),"1","第一位的学员取消排队后排队名次应该是第1位");
// 操作3：将约课的学员取消
reserveTools.cancelMemberReserve(memberId1.getString(2),true);
reserveTools.cancelMemberReserve(memberId1.getString(3),true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestCreateBatchNormalDate.java
......@@ -9,7 +9,7 @@ import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
......@@ -30,7 +30,7 @@ public class TestCreateBatchNormalDate extends BaseTestImpl {
JSONArray coachIds = new JSONArray();
@BeforeClass
@BeforeMethod
@Override
public void beforeTest(){
setTestInfo(ApiModule.Polar_Reserve,"API_createBatchNormalDate", LoginAccount.GYM_PROD, Terminal.B,"xym");
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestCreateBatchSpecialDate.java
......@@ -10,7 +10,6 @@ import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
......@@ -103,7 +102,25 @@ public class TestCreateBatchSpecialDate extends BaseTestImpl {
}
@Test(description = "设置特定日期全天休息",priority = 1)
@Test(description = "删除特殊日期",priority = 1)
public void testDeleteSpecialDate1() {
for (int j = 0; j < coachIds.size(); j++){
// 查询特殊可约时间列表
JSONArray specialTimeVOS = reserveTools.getPersonalCoachTime(coachIds.getString(j),"specialTimeVOS");
for (int i = 0; i < specialTimeVOS.size(); i++){
String id = specialTimeVOS.getJSONObject(i).getJSONArray("recordIds").getString(0);
// 删除查询到的特殊可约时间
reserveTools.deleteSpecialDate(id);
}
specialTimeVOS = reserveTools.getPersonalCoachTime(coachIds.getString(j),"specialTimeVOS");
Assert.assertEquals(specialTimeVOS.size(),0,"删除特殊日期后，特殊日期列表不为空");
}
}
@Test(description = "设置特定日期全天休息",priority = 2)
public void testCreateBatchSpecialDate2() {
// 获取教练列表
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
......@@ -162,7 +179,7 @@ public class TestCreateBatchSpecialDate extends BaseTestImpl {
}
@Test(description = "删除特殊日期",priority = 2)
@Test(description = "删除特殊日期",priority = 3)
public void testDeleteSpecialDate() {
for (int j = 0; j < coachIds.size(); j++){
// 查询特殊可约时间列表
......@@ -174,7 +191,7 @@ public class TestCreateBatchSpecialDate extends BaseTestImpl {
reserveTools.deleteSpecialDate(id);
}
specialTimeVOS = reserveTools.getPersonalCoachTime(xmAppApi.getLoginInfo().getAdminId(),"specialTimeVOS");
specialTimeVOS = reserveTools.getPersonalCoachTime(coachIds.getString(j),"specialTimeVOS");
Assert.assertEquals(specialTimeVOS.size(),0,"删除特殊日期后，特殊日期列表不为空");
}
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestGetCoachHistorySpecialDate.java
......@@ -44,9 +44,19 @@ public class TestGetCoachHistorySpecialDate extends BaseTestImpl {
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
int total = pageStudioPersonalCoach.getInteger("total");
Random rand = new Random();
// 随机取两个教练
// 随机取1个教练
coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(rand.nextInt(total>10?10:total)).getString("id");
// 获取教练后先清除特殊日期数据。避免重叠
// 查询特殊可约时间列表
JSONArray specialTimeVOS = reserveTools.getCoachHistorySpecialDate(coachedId);
for (int i = 0; i < specialTimeVOS.size(); i++){
String id = specialTimeVOS.getJSONObject(i).getJSONArray("recordIds").getString(0);
// 删除查询到的特殊可约时间
reserveTools.deleteSpecialDate(id);
}
Long date = TimeUtils.getBeforeDayDate(1);
JSONObject body = new JSONObject();
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
......@@ -65,7 +75,7 @@ public class TestGetCoachHistorySpecialDate extends BaseTestImpl {
reserveTools.createSpecialDate(coachedId,"OFF_DUTY",specialTimeInfoRequest);
// 设置全天休息完成后检查个人时间是否有这条数据
JSONArray specialTimeVOS = reserveTools.getCoachHistorySpecialDate(coachedId);
specialTimeVOS = reserveTools.getCoachHistorySpecialDate(coachedId);
boolean flag = false;
for (int i = 0; i < specialTimeVOS.size(); i++){
JSONObject specialTimeVO = specialTimeVOS.getJSONObject(i);
......@@ -77,8 +87,23 @@ public class TestGetCoachHistorySpecialDate extends BaseTestImpl {
Assert.assertTrue(flag,"设置特殊日期全天休息后在历史特定日期可约时间列表没有找到相关数据");
}
@Test(description = "删除特殊日期",priority = 1)
public void testDeleteSpecialDate() {
// 查询特殊可约时间列表
JSONArray specialTimeVOS = reserveTools.getCoachHistorySpecialDate(coachedId);
for (int i = 0; i < specialTimeVOS.size(); i++){
String id = specialTimeVOS.getJSONObject(i).getJSONArray("recordIds").getString(0);
// 删除查询到的特殊可约时间
reserveTools.deleteSpecialDate(id);
}
@Test(description = "设置特定日期可约",priority = 1)
specialTimeVOS = reserveTools.getCoachHistorySpecialDate(coachedId);
Assert.assertEquals(specialTimeVOS.size(),0,"删除特殊日期后，特殊日期列表不为空");
}
@Test(description = "设置特定日期可约",priority = 2)
public void testCreateSpecialDate_ON() {
Long date = TimeUtils.getBeforeDayDate(2);
......@@ -123,8 +148,8 @@ public class TestGetCoachHistorySpecialDate extends BaseTestImpl {
Assert.assertTrue(flag,"设置特殊日期在历史特定日期可约时间列表没有找到相关数据");
}
@Test(description = "删除特殊日期",priority = 2)
public void testDeleteSpecialDate() {
@Test(description = "删除特殊日期",priority = 3)
public void testDeleteSpecialDate2() {
// 查询特殊可约时间列表
JSONArray specialTimeVOS = reserveTools.getCoachHistorySpecialDate(coachedId);
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestReservePerson.java
......@@ -32,7 +32,7 @@ import java.util.Random;
* @BelongsPackage: com.xiaomai.cases.polar.reserve.personal
* @Author: xuyamei
* @CreateTime: 2024-07-26 16:25
* @Description: 一对一私教课预约
* @Description: 一对一和一对多私教课预约
* @Version: 1.0
*/
public class TestReservePerson extends BaseTestImpl {
......@@ -69,6 +69,9 @@ public class TestReservePerson extends BaseTestImpl {
private String coachedId;
private String memberCardId;
private String reserveId;
JSONArray member2 = new JSONArray();
JSONArray member1 = new JSONArray();
@BeforeClass
@Override
public void beforeTest() {
......@@ -78,8 +81,7 @@ public class TestReservePerson extends BaseTestImpl {
@Test
public void
testReservePerson(){
public void testReservePerson(){
// 第一步：查询存量的约课课程
// 查询存量的课程分类
String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
......@@ -151,13 +153,15 @@ public class TestReservePerson extends BaseTestImpl {
// 从课表查询scheduleId
JSONArray personalScheduleTable = reserveTools.getPersonalScheduleTable(timestamp,TimeUtils.getTodayEndTime(),courseId);
for (int i = 0; i < personalScheduleTable.size(); i++){
System.out.println("personalScheduleTable.getJSONObject(i).getString(\"startTime\").equals(String.valueOf(timestamp)):"+personalScheduleTable.getJSONObject(i).getString("startTime").equals(String.valueOf(timestamp)));
if (personalScheduleTable.getJSONObject(i).getString("startTime").equals(String.valueOf(timestamp))){
scheduleId = personalScheduleTable.getJSONObject(i).getString("scheduleId");
break;
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：课次学员是否包含该会员
......@@ -260,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"};
......@@ -271,6 +275,235 @@ public class TestReservePerson extends BaseTestImpl {
}
@Test(description = "预约1VN课次，其他学员可再次进行预约",priority = 2)
public void testReservePerson_1VN() {
// 第一步：查询存量的约课课程
// 查询存量的课程分类
String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
courseId = courseTools.getPersonalOrGroupCourseId("PERSONAL", "普拉提器械1V3私教课程", categoryId, "STUDIO", "ONE_TO_MANY", 3, 1).getString(0);
String courseName = courseTools.getPersonalOrGroupCourseId("PERSONAL", "普拉提器械1V3私教课程", categoryId, "STUDIO", "ONE_TO_MANY", 3, 1).getString(1);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 第二步：查询存量的学员，如果没有则新建
member1 = createMember("1V3私教约课学员李萌");
// 第三步：查询存量的私教教练，并将教练添加到课程中
// 获取到员工
// 获取教练列表
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
int total = pageStudioPersonalCoach.getInteger("total");
Random rand = new Random();
// 随机取1个教练
coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(rand.nextInt(total>10?10:total)).getString("id");
// 编辑私教课程教练添加到课程中
courseTools.editPersonalCourse(categoryId,courseId,courseName,10,coachedId,"3");
// 第四步：创建私教特殊可约时间
JSONObject specialTimeInfoRequest = new JSONObject();
// 可约时间类型
specialTimeInfoRequest.put("dutyType", "ON_DUTY");
// 设置特定日期
JSONArray selectedDates = new JSONArray();
selectedDates.add(TimeUtils.getTodayTime());
specialTimeInfoRequest.put("selectedDates", selectedDates);
// 如果是可约时间非全天休息，则传可约时间段
// 时间段 00:00 ~ 23:59
JSONArray timePeriodInfos = new JSONArray();
JSONObject timeInfo = new JSONObject();
timeInfo.put("minuteOffset", 60);
timeInfo.put("spanMinutes", 1380);
timePeriodInfos.add(timeInfo);
specialTimeInfoRequest.put("timePeriodInfos", timePeriodInfos);
// 设置特殊可约时间
reserveTools.createSpecialDate(coachedId,"ON_DUTY",specialTimeInfoRequest);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 第五步：获取老师第一条可约时间
JSONArray personalCoachTime = reserveTools.getPersonalTimeBlocks(coachedId,courseId,TimeUtils.getTodayTime());
// 获取当前日期的Calendar实例
Calendar calendar = Calendar.getInstance();
// 获取第一条的步长 转换成时间戳
int minuteOffset = personalCoachTime.getJSONObject(0).getIntValue("minuteOffset")/60;
calendar.set(Calendar.HOUR_OF_DAY, minuteOffset);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
// 将Calendar对象转换为时间戳
timestamp = calendar.getTimeInMillis();
// 李萌预约生成课次
reserveId = reserveTools.addPersonalReserve("",courseId,coachedId,memberId,benefitId,10,1,"",timestamp,true);
member1.add(reserveId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 从课表查询scheduleId
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");
boolean success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getString(i).equals(member1.getString(3))){
success = true;
}
}
Assert.assertTrue(success,"约课后课次详情学员不在课次中");
// 学员2进行预约
member2 = createMember("1V3私教约课学员2程晨");
reserveId = reserveTools.addPersonalReserve("",courseId,coachedId,member2.getString(0),member2.getString(1),10,1,scheduleId,timestamp,true);
member2.add(reserveId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1：课次学员是否包含该会员
getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getString(i).equals(member2.getString(3))){
success = true;
}
}
Assert.assertTrue(success,"约课后课次详情学员不在课次中");
// check 2: 预约记录是否包含该预约
// check 2.1 学员详情预约记录
JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"SUCCESS","",coachedId, timestamp,todayEndDateTimeTamp,memberId,"PERSONAL");
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseId","courseType","scheduleStartTime","reserveState","scheduleId"};
String[] resultData = new String[] {member2.getString(3),member2.getString(1),"1",courseId,"PERSONAL",timestamp+"","SUCCESS",scheduleId};
success = false;
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(member2.getString(3))){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByMember.getJSONObject(i).getString(result[j]),resultData[j],"约课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
}
}
Assert.assertTrue(success,"约课后在会员详情页面未查询到相关信息");
// check 2.2 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"SUCCESS","",coachedId,timestamp,TimeUtils.getTodayEndTime(),member2.getString(0),"PERSONAL","");
success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(member2.getString(3))){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]),resultData[j],"约课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"),member2.getString(0),"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"约课后在约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(member2.getString(3));
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),resultData[j],"约课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"),member2.getString(0),"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录锁定
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),"RESERVE","-1.00"};
String[] message = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
@Test(description = "删除课次",priority = 3)
public void testReservePerson_del() {
// 课次中的一个会员取消预约
reserveTools.cancelMemberReserve(member1.getString(3),true);
// check 1:课次还存在 且课次中不包含该学员
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
boolean success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getString(i).equals(member1.getString(3))){
success = true;
}
}
Assert.assertFalse(success,"取消约课后课次详情学员还在课次中");
// 删除该课次
reserveTools.delPersonalScheduleItem(scheduleId);
// 课次学员取消预约
// check 1：课次已删除,课表没有该条数据
JSONArray personalScheduleTable = reserveTools.getPersonalScheduleTable(timestamp,TimeUtils.getTodayEndTime(),courseId);
boolean flag = true;
if (personalScheduleTable != null){
for (int i = 0; i < personalScheduleTable.size(); i++){
if (personalScheduleTable.getJSONObject(i).getString("scheduleId").equals(scheduleId)){
scheduleId = personalScheduleTable.getJSONObject(i).getString("scheduleId");
flag = false;
break;
}
}
}
Assert.assertTrue(flag,"取消约课后课次未删除");
// check 2：会员详情 - 预约记录已取消
JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"RESERVE_CANCEL","","", timestamp,TimeUtils.getTodayEndTime(),member2.getString(0),"GROUP_CLASS");
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(member2.getString(3))){
Assert.assertEquals(getPageByMember.getJSONObject(i).getString("reserveState"),"RESERVE_CANCEL","取消约课状态不是已取消");
}
}
// check 3：预约记录列表中已取消
JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"RESERVE_CANCEL","","",timestamp,TimeUtils.getTodayEndTime(),member2.getString(0),"GROUP_CLASS","");;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(member2.getString(3))){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("reserveState"),"RESERVE_CANCEL","取消约课状态不是已取消");
}
}
// 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"};
String[] message1 = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message1[i]);
}
}
/**
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestSignReservePerson.java 0 → 100644
package com.xiaomai.cases.polar.reserve.personal;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.course.CourseTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.cases.polar.reserve.ReserveTools;
import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
import com.xiaomai.cases.polar.setting.courseCategory.CourseCategoryTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Random;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.polar.reserve.personal
* @Author: xuyamei
* @CreateTime: 2024-07-29 17:22
* @Description: 私教签到 (团课签到和私教签到用的同一个接口)
* @Version: 1.0
*/
public class TestSignReservePerson extends BaseTestImpl {
@Resource(name = "courseCategoryTools")
CourseCategoryTools courseCategoryTools;
@Resource(name = "courseTools")
CourseTools courseTools;
@Resource(name = "reserveTools")
ReserveTools reserveTools;
@Resource(name = "groupScheduleTools")
GroupScheduleTools groupScheduleTools;
MemberTools memberTools = new MemberTools();
OrderTools orderTools = new OrderTools();
CardTools cardTools = new CardTools();
Tools tools = new Tools();
String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
//获取今天结束日期的时间戳
Long todayEndDateTimeTamp = TimeUtils.getTodayEndTime();
private Long timestamp;
private String scheduleId;
private String courseId;
private String coachedId;
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Reserve, "API_addPersonalReserve", LoginAccount.GYM_PROD, Terminal.B, "xym");
super.beforeTest();
}
@Test(description = "1v1约课签到")
public void testSignReservePerson() {
// 第一步：查询存量的约课课程
// 查询存量的课程分类
String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
courseId = courseTools.getPersonalOrGroupCourseId("PERSONAL", "普拉提一对一点名私教课程", categoryId, "STUDIO", "ONE_TO_ONE", 1, 1).getString(0);
String courseName = courseTools.getPersonalOrGroupCourseId("PERSONAL", "普拉提一对一点名私教课程", categoryId, "STUDIO", "ONE_TO_ONE", 1, 1).getString(1);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 第二步：查询存量的学员，如果没有则新建
JSONArray memberInfo = createMember("私教1v1点名学员卡卡");
// 第三步：查询存量的私教教练，并将教练添加到课程中
// 获取到员工
// 获取教练列表
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
int total = pageStudioPersonalCoach.getInteger("total");
Random rand = new Random();
// 随机取1个教练
coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(rand.nextInt(total > 10 ? 10 : total)).getString("id");
// 编辑私教课程教练添加到课程中
courseTools.editPersonalCourse(categoryId, courseId, courseName, 10, coachedId, "1");
// 第四步：创建私教特殊可约时间
JSONObject specialTimeInfoRequest = new JSONObject();
// 可约时间类型
specialTimeInfoRequest.put("dutyType", "ON_DUTY");
// 设置特定日期
JSONArray selectedDates = new JSONArray();
selectedDates.add(TimeUtils.getTodayTime());
specialTimeInfoRequest.put("selectedDates", selectedDates);
// 如果是可约时间非全天休息，则传可约时间段
// 时间段 00:00 ~ 23:59
JSONArray timePeriodInfos = new JSONArray();
JSONObject timeInfo = new JSONObject();
timeInfo.put("minuteOffset", 0);
timeInfo.put("spanMinutes", 1380);
timePeriodInfos.add(timeInfo);
specialTimeInfoRequest.put("timePeriodInfos", timePeriodInfos);
// 设置特殊可约时间
reserveTools.createSpecialDate(coachedId, "ON_DUTY", specialTimeInfoRequest);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 第五步：获取老师第一条可约时间
JSONArray personalCoachTime = reserveTools.getPersonalTimeBlocks(coachedId, courseId, TimeUtils.getTodayTime());
// 获取当前日期的Calendar实例
Calendar calendar = Calendar.getInstance();
// 获取第一条的步长 转换成时间戳
int minuteOffset = personalCoachTime.getJSONObject(0).getIntValue("minuteOffset") / 60;
calendar.set(Calendar.HOUR_OF_DAY, minuteOffset);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
// 将Calendar对象转换为时间戳
timestamp = calendar.getTimeInMillis();
String reserveId = reserveTools.addPersonalReserve("", courseId, coachedId, memberInfo.getString(0), memberInfo.getString(1), 10, 1, "", timestamp, true);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 从课表查询scheduleId
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;
}
}
}
reserveTools.signIn(true, reserveId, false);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1：课次学员是否包含该会员且会员状态为已签到
JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
JSONArray reserveIds = getScheduleItemDetail.getJSONArray("memberReserveList");
boolean success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
Assert.assertEquals(reserveIds.getJSONObject(i).getString("signInState"),"SIGNED","签到状态错误");
}
}
Assert.assertTrue(success,"约课后点名课次详情学员不在课次中");
// check 2: 预约记录是否包含该预约
// check 2.1 学员详情预约记录
JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"SUCCESS","SIGNED","", timestamp,TimeUtils.getTodayEndTime(), memberInfo.getString(0),"PERSONAL");
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseId","courseType","scheduleStartTime","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId, memberInfo.getString(1),"1",courseId,"PERSONAL",timestamp+"","SUCCESS",scheduleId,"SIGNED"};
success = false;
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByMember.getJSONObject(i).getString(result[j]),resultData[j],"约课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
}
}
Assert.assertTrue(success,"约课后在会员详情页面未查询到相关信息");
// check 2.2 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"SUCCESS","SIGNED","",timestamp,TimeUtils.getTodayEndTime(), memberInfo.getString(0),"PERSONAL","");
success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]),resultData[j],"约课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberInfo.getString(0),"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"约课后在约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(reserveId);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),resultData[j],"约课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberInfo.getString(0),"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(memberInfo.getString(1),memberInfo.getString(2)).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[] {"resourceId","consumeType","changeOfPurchaseBalance"};
String[] respect = new String[] {reserveId,"SIGN_IN","-1.00"};
String[] message = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
@Test(description = "预约1VN课次，点名后再次其他学员约课点名",priority = 2)
public void testReservePerson_1VN() {
// 第一步：查询存量的约课课程
// 查询存量的课程分类
String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
courseId = courseTools.getPersonalOrGroupCourseId("PERSONAL", "普拉提器械1V2点名私教课程", categoryId, "STUDIO", "ONE_TO_MANY", 2, 1).getString(0);
String courseName = courseTools.getPersonalOrGroupCourseId("PERSONAL", "普拉提器械1V2点名私教课程", categoryId, "STUDIO", "ONE_TO_MANY", 2, 1).getString(1);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 第二步：查询存量的学员，如果没有则新建
JSONArray memberInfo1 = createMember("1V2私教点名学员程程");
// 第三步：查询存量的私教教练，并将教练添加到课程中
// 获取到员工
// 获取教练列表
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
int total = pageStudioPersonalCoach.getInteger("total");
Random rand = new Random();
// 随机取1个教练
coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(rand.nextInt(total > 10 ? 10 : total)).getString("id");
// 编辑私教课程教练添加到课程中
courseTools.editPersonalCourse(categoryId, courseId, courseName, 10, coachedId, "2");
// 第四步：创建私教特殊可约时间
JSONObject specialTimeInfoRequest = new JSONObject();
// 可约时间类型
specialTimeInfoRequest.put("dutyType", "ON_DUTY");
// 设置特定日期
JSONArray selectedDates = new JSONArray();
selectedDates.add(TimeUtils.getTodayTime());
specialTimeInfoRequest.put("selectedDates", selectedDates);
// 如果是可约时间非全天休息，则传可约时间段
// 时间段 00:00 ~ 23:59
JSONArray timePeriodInfos = new JSONArray();
JSONObject timeInfo = new JSONObject();
timeInfo.put("minuteOffset", 60);
timeInfo.put("spanMinutes", 1380);
timePeriodInfos.add(timeInfo);
specialTimeInfoRequest.put("timePeriodInfos", timePeriodInfos);
// 设置特殊可约时间
reserveTools.createSpecialDate(coachedId, "ON_DUTY", specialTimeInfoRequest);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 第五步：获取老师第一条可约时间
JSONArray personalCoachTime = reserveTools.getPersonalTimeBlocks(coachedId, courseId, TimeUtils.getTodayTime());
// 获取当前日期的Calendar实例
Calendar calendar = Calendar.getInstance();
// 获取第一条的步长 转换成时间戳
int minuteOffset = personalCoachTime.getJSONObject(0).getIntValue("minuteOffset") / 60;
calendar.set(Calendar.HOUR_OF_DAY, minuteOffset);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
// 将Calendar对象转换为时间戳
timestamp = calendar.getTimeInMillis();
// 李萌预约生成课次
String reserveId = reserveTools.addPersonalReserve("", courseId, coachedId, memberInfo1.getString(0), memberInfo1.getString(1), 10, 1, "", timestamp, true);
memberInfo1.add(reserveId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 从课表查询scheduleId
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");
boolean success = false;
for (int i = 0; i < reserveIds.size(); i++) {
if (reserveIds.getString(i).equals(memberInfo1.getString(3))) {
success = true;
}
}
Assert.assertTrue(success, "约课后课次详情学员不在课次中");
reserveTools.signIn(true, reserveId, false);
// 学员2进行预约
JSONArray memberInfo2 = createMember("1V2私教点名学员2王菲");
reserveId = reserveTools.addPersonalReserve("", courseId, coachedId, memberInfo2.getString(0), memberInfo2.getString(1), 10, 1, scheduleId, timestamp, true);
memberInfo2.add(reserveId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
reserveTools.signIn(true, memberInfo2.getString(3), false);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check ：两个学员的状态
for (int j = 0; j < 2; j++){
JSONArray memberInfo = j==0 ? memberInfo1 : memberInfo2;
// check 1：课次学员是否包含该会员且会员状态为已签到
getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
reserveIds = getScheduleItemDetail.getJSONArray("memberReserveList");
success = false;
for (int i = 0; i < reserveIds.size(); i++){
if(reserveIds.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
Assert.assertEquals(reserveIds.getJSONObject(i).getString("signInState"),"SIGNED","签到状态错误");
}
}
Assert.assertTrue(success,"约课后点名课次详情学员不在课次中");
// check 2: 预约记录是否包含该预约
// check 2.1 学员详情预约记录
JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"SUCCESS","SIGNED","", timestamp,TimeUtils.getTodayEndTime(), memberInfo.getString(0),"PERSONAL");
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseId","courseType","scheduleStartTime","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {memberInfo.getString(3), memberInfo.getString(1),"1",courseId,"PERSONAL",timestamp+"","SUCCESS",scheduleId,"SIGNED"};
success = false;
for(int i =0;i<getPageByMember.size();i++){
if (getPageByMember.getJSONObject(i).getString("id").equals(memberInfo.getString(3))){
success = true;
for(int f = 0;f<result.length;f++){
Assert.assertEquals(getPageByMember.getJSONObject(i).getString(result[f]),resultData[f],"约课产生的数据与实际数据不符合"+result[f]+"："+resultData[f]);
}
}
}
Assert.assertTrue(success,"约课后在会员详情页面未查询到相关信息");
// check 2.2 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"SUCCESS","SIGNED","",timestamp,TimeUtils.getTodayEndTime(), memberInfo.getString(0),"PERSONAL","");
success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(memberInfo.getString(3))){
success = true;
for(int f = 0;f<result.length;f++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[f]),resultData[f],"约课产生的数据与实际数据不符合"+result[f]+"："+resultData[f]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberInfo.getString(0),"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"约课后在约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(memberInfo.getString(3));
for(int i = 0;i<result.length;i++){
Assert.assertEquals(getDetailById.getString(result[i]),resultData[i],"约课产生的数据与实际数据不符合"+result[i]+"："+resultData[i]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberInfo.getString(0),"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(memberInfo.getString(1),memberInfo.getString(2)).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[] {"resourceId","consumeType","changeOfPurchaseBalance"};
String[] respect = new String[] {memberInfo.getString(3),"SIGN_IN","-1.00"};
String[] message = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
}
/**
* @description:查询学员
* @author: xuyamei
* @date: 2024/7/26 16:41
* @param memberName
* @return: com.alibaba.fastjson.JSONArray
**/
public JSONArray createMember(String memberName){
String memberId;
// 查询存量的学员没有则创建学员，
if (tools.commonSearch(memberName,"NORMAL").getJSONArray("result").size()>0){
memberId = tools.commonSearch(memberName,"NORMAL").getJSONArray("result").getJSONObject(0).getString("id");
}else if (tools.commonSearch(memberName,"HISTORY").getJSONArray("result").size()>0){
memberId = tools.commonSearch(memberName,"HISTORY").getJSONArray("result").getJSONObject(0).getString("id");
}else if (tools.commonSearch(memberName,"POTENTIAL").getJSONArray("result").size()>0){
memberId = tools.commonSearch(memberName,"POTENTIAL").getJSONArray("result").getJSONObject(0).getString("id");
}else{
memberId = memberTools.create(memberName, RandomStringUtil.randomMobile("203")).getString("result");
}
try {
Thread.sleep(1500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 查询是否有可用的会员卡，没有则购买
JSONArray listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "PERSONAL", "MEMBER", memberId, Long.parseLong(todayStartTimeTamp));
if (listUserReservableBenefit.size() == 0) {
// 购买适用的会员卡
signOrder(courseId, memberId);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "PERSONAL", "MEMBER", memberId, Long.parseLong(todayStartTimeTamp));
}
// 查询权益
String benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
String memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
JSONArray members = new JSONArray();
members.add(memberId);
members.add(benefitId);
members.add(memberCardId);
return members;
}
// 买卡
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0) ;
float price = 0;
int validPeriod = 0;
if (total == 0) {
cardId = cardTools.memberCardCreate("私教约课使用会员卡"+ TimeUtils.getCurrentTime()).getString("result");
}
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
//获取签单要用的卡快照id
String latestSnapshotId = orderTools.fetchDetailById(cardId,xmAppApi.getLoginInfo().getBrandId(),xmAppApi.getLoginInfo().getStudioId(),xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("latestSnapshotId");
//检查会员对该卡是否超出购买上限
boolean limitResult= orderTools.checkAllowPurchase("MEMBER_CARD",cardId,cardId,"1",xmAppApi.getLoginInfo().getBrandId(),xmAppApi.getLoginInfo().getStudioId(),xmAppApi.getLoginInfo().getAdminId()).getBoolean("success");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
if( limitResult == true){
//创建订单
JSONObject orderResult=orderTools.signOrder(cardId,latestSnapshotId,quantity,price,validPeriod,latestSnapshotId, price/2,"PURCHASE",
"MEMBER_CARD",memberId,price-price/2,price-price/2,"1");
}
}
}
src/main/java/com/xiaomai/cases/polar/schedule/camp/CampScheduleTools.java
......@@ -10,6 +10,7 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath;
import org.springframework.stereotype.Component;
import org.testng.Assert;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -74,7 +75,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("assistCoachIds", assistCoachIds); //设置助教，可设置为空 new ArrayList<>();
body.put("force", force); //是否有冲突 true，false
body.put("enableCustomerReserve", "NO"); //能否用户自己约课，不能
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
......@@ -115,7 +118,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("assistCoachIds", new ArrayList<>()); //设置助教，可设置为空 new ArrayList<>();
body.put("force", force); //是否有冲突 true，false
body.put("enableCustomerReserve", "NO"); //能否用户自己约课，不能
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -146,7 +151,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("coachId", coachId);
}*/
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -162,7 +169,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("force", true);//删除学员约课记录
body.put("ruleId", ruleId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -180,6 +189,35 @@ public class CampScheduleTools extends XMBaseTest {
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("startDate", startDate);
body.put("endDate", endDate);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
if (Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.totalCount")) > 0) {
return dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("timetableGroups").getJSONObject(0).getJSONArray("timetableList");
}
else {
return null;
}
}
/**
* @description: 查询训练营排课课表
* @author: xuyamei
* @date: 2024/7/31 10:48
* @param startDate 开始日期
* @param endDate 结束日期
* @param campId ：训练营活动id
* @return: com.alibaba.fastjson.JSONArray
**/
public JSONArray getCampScheduleTable(Long startDate, Long endDate,String campId) {
setUP("API_getCampScheduleTable");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("startDate", startDate);
body.put("endDate", endDate);
body.put("campId", campId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
if (Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.totalCount")) > 0) {
return dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("timetableGroups").getJSONObject(0).getJSONArray("timetableList");
......@@ -205,7 +243,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("startDate", startDate);
body.put("endDate", endDate);
body.put("weekdays", weekdaysList);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
return Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.result"));
}
......@@ -220,7 +260,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", ruldId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -235,7 +277,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", scheduleId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
......@@ -251,7 +295,9 @@ public class CampScheduleTools extends XMBaseTest {
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("scheduleId", scheduleId);
body.put("applyRestRule", applyRestRule);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
......@@ -283,7 +329,7 @@ public class CampScheduleTools extends XMBaseTest {
* @param ruldId
* @return
*/
public Set<String> getCampTableDate(int n,String ruldId) {
/* public Set<String> getCampTableDate(int n,String ruldId) {
//查看下周训练营课表
getCampScheduleTable(CommUtil.oneKeyGetNextWeekStartDay(), CommUtil.oneKeyGetNextWeekEndDay());
String date = CommUtil.oneKeyGetNextWeekXDay(n);//下周N 日期时间戳
......@@ -301,6 +347,26 @@ public class CampScheduleTools extends XMBaseTest {
}
return null;
}*/
public String getCampTableDate(int n,String ruldId) {
//查看下周训练营课表
getCampScheduleTable(CommUtil.oneKeyGetNextWeekStartDay(), CommUtil.oneKeyGetNextWeekEndDay());
String date = CommUtil.oneKeyGetNextWeekXDay(n);//下周N 日期时间戳
int count = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").size();
if (count > 0) {
JSONArray array = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups");
String scheduleId = array.toJavaList(JSONObject.class).stream()
.filter(e -> e.getString("date").equals(date))//过滤出日期等于下周N的数据
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(ruldId))
.map(e -> e.getString("scheduleId"))//获取scheduleId
.findFirst().orElse("");
return scheduleId; //如果当天没排课，
}
return "";
}
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestCreateCampRuleSchedule.java
......@@ -61,11 +61,11 @@ public class TestCreateCampRuleSchedule extends SelectTargetTrainingCampAndGetIn
@AfterTest(description = "删除此case创建的训练营排课日程和训练营活动")
public void delData() {
//直接删除训练营会的，对应的排课日程会被自动删除，校验其他case中已有
if (null!=campId||!campId.isEmpty()) {
this.getTrainingTools().deleteTraining(campId);
}
if (null!=this.campId||!this.campId.isEmpty()) {
this.getTrainingTools().deleteTraining(this.campId);
}
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestDelCampScheduleItem.java → src/main/java/com/xiaomai/cases/polar/schedule/camp/TestDelCurrentAndSubsequentCampSchedule.java
package com.xiaomai.cases.polar.schedule.camp;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
......@@ -15,21 +16,19 @@ import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
/**
* 删除训练营课次（单个/当前及后续）
* @author adu
* data 2024/7/12 17:05
* data 2024/8/1 11:16
*/
public class TestDelCampScheduleItem extends SelectTargetTrainingCampAndGetInfo{
public class TestDelCurrentAndSubsequentCampSchedule extends SelectTargetTrainingCampAndGetInfo {
@Resource(name = "campScheduleTools")
CampScheduleTools campScheduleTools;
String campId = "";
String chiefCoachId = "";
String ruldId = "";
int loopNum=0;
int loopNum = 0;
String[] weekDaysArray = {"TUESDAY", "THURSDAY", "SATURDAY", "SUNDAY"};
List<String> weekdaysList = Arrays.asList(weekDaysArray);
......@@ -55,75 +54,42 @@ public class TestDelCampScheduleItem extends SelectTargetTrainingCampAndGetInfo{
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 1, "排课创建成功后，日程中没查询到对应数据");
ruldId = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("ruleId");
}
@Test(description = "删除当前课次")
public void testDelCurrentCampScheduleItem(){
//获取下周日课次ID(只删除匹配到ruldId的课次)
Set<String> scheduleIds7 = campScheduleTools.getCampTableDate(13,ruldId);
if(scheduleIds7.size() != 0 && scheduleIds7 != null){
//删除本次规则创建的下周日所有的课次
scheduleIds7.stream().forEach(scheduleId -> {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", false);
body.put("scheduleId", scheduleId);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
});
//删除成功后check 下周日课表是否包含删除的课次
String startDate = CommUtil.oneKeyGetNextWeekXDay(13);//下周日00点时间
String endDate = CommUtil.oneKeyGetNextWeekEndXDay(7);//下周日23：59
campScheduleTools.getCampScheduleTable(startDate,endDate);
Long goalCount= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(ruldId))
.map(e -> e.getString("scheduleId")).count();//获取scheduleId 的数量
Assert.assertTrue(goalCount==0,"删除当前课次后，再去课表中查看，后端仍然返回数据");
}
}
@Test(description = "删除当前及后续课次", priority = 1)
@Test(description = "删除当前及后续课次")
public void testDelCurrentAndSubsequentCampSchedule() {
//获取下周六课次ID
Set<String> scheduleIds6 = campScheduleTools.getCampTableDate(12,ruldId);
if(scheduleIds6.size() != 0 && scheduleIds6 != null){
String scheduleIds6 = campScheduleTools.getCampTableDate(12, ruldId);
if (!StringUtils.isEmpty(scheduleIds6)) {
//删除下周六即后续所有的课次
scheduleIds6.stream().forEach(scheduleId -> {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);
body.put("scheduleId", scheduleId);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
});
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);
body.put("scheduleId", scheduleIds6);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"));
//删除成功后check从下周六到排课结束日期课表是否有数据
String startDate = CommUtil.oneKeyGetNextWeekXDay(12);//下周六00点时间
campScheduleTools.getCampScheduleTable(startDate, super.openEndDate);
if(Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.totalCount"))>0){
Long goalCount= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
if (Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.totalCount")) > 0) {
Long goalCount = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(ruldId)).count();
Assert.assertTrue(goalCount==0,"删除当前课次后，再去课表中查看，后端仍然返回数据");
.filter(e -> e.getString("ruleId").equals(ruldId)).count();
Assert.assertTrue(goalCount == 0, "删除当前课次后，再去课表中查看，后端仍然返回数据");
}
else {
} else {
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.totalCount"), "0");
}
//删除成功后，check对应训练营活动的已排课次数是否同步变更
int delLoopNum=campScheduleTools.queryExpectedLoopNum(startDate, super.openEndDate, weekdaysList);
int delLoopNum = campScheduleTools.queryExpectedLoopNum(startDate, super.openEndDate, weekdaysList);
//查看日程，获取原规则中展示的训练营已排课课次数,原来已排课课次数-删除的已排课课次数
campScheduleTools.getCampRuleScheduleDetail(ruldId);
Assert.assertTrue(XMJSONPath.getJSONObjectByReadPath(dataApi.getApi_response(),"$.result.campVO").getIntValue("scheduleClassHour")==(loopNum-delLoopNum));
Assert.assertTrue(XMJSONPath.getJSONObjectByReadPath(dataApi.getApi_response(), "$.result.campVO").getIntValue("scheduleClassHour") == (loopNum - delLoopNum));
}
......@@ -132,14 +98,14 @@ public class TestDelCampScheduleItem extends SelectTargetTrainingCampAndGetInfo{
@AfterTest(description = "删除此case创建的训练营排课日程")
public void delData() {
//先删除规则，再操作删除对应的训练营活动，此处顺序不能换，如果先删除训练营活动，对应的排课会自动删除，所以就不用删除排课日程了，这个场景其他case中会体现
if (null!=ruldId||!ruldId.isEmpty()) {
if (null != ruldId || !ruldId.isEmpty()) {
campScheduleTools.delCampRuleSchedule(ruldId);
//删除日程后check 日程列表数据是否还能搜索到，期望搜索结果数据为空
campScheduleTools.getCampRuleScheduleList(campId,super.courseId,"");
campScheduleTools.getCampRuleScheduleList(campId, super.courseId, "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "日程被删除后，对应的排课日程列表还可以查到相关数据");
}
if (null!=campId||!campId.isEmpty()) {
if (null != campId || !campId.isEmpty()) {
this.getTrainingTools().deleteTraining(campId);
}
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestDelCurrentCampScheduleItem.java 0 → 100644
package com.xiaomai.cases.polar.schedule.camp;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
/**
* 删除训练营课次（单个/当前及后续）
*
* @author adu
* data 2024/7/12 17:05
*/
public class TestDelCurrentCampScheduleItem extends SelectTargetTrainingCampAndGetInfo {
@Resource(name = "campScheduleTools")
CampScheduleTools campScheduleTools;
String campId = "";
String chiefCoachId = "";
String ruldId = "";
int loopNum = 0;
String[] weekDaysArray = {"TUESDAY", "THURSDAY", "SATURDAY", "SUNDAY"};
List<String> weekdaysList = Arrays.asList(weekDaysArray);
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Schedule, "API_delCampScheduleItem", LoginAccount.ADU_PROD, Terminal.B, "adu");
super.beforeTest();
// 获取选择的训练营ID
campId = super.campId;
//1.2获取训练营活动的指定教练ID
chiefCoachId = super.chiefCoachId;
//获取目标时间段内 最大有效课时数
loopNum = campScheduleTools.queryExpectedLoopNum(CommUtil.oneKeyGetAddDay(3), super.openEndDate, weekdaysList);
//创建训练营排课：按次数 星期：2，4，6，7
campScheduleTools.oneKeyCreateCampRuleSchedule(campId, chiefCoachId, super.courseId,
super.traineeLowerLimit, super.traineeUpperLimit,
"1140", super.openEndDate, true,
String.valueOf(loopNum));
//查询排课日程:根据训练营和关联课程查询
campScheduleTools.getCampRuleScheduleList(campId, super.courseId, "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 1, "排课创建成功后，日程中没查询到对应数据");
ruldId = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("ruleId");
}
@Test(description = "删除当前课次")
public void testDelCurrentCampScheduleItem() {
//获取下周日课次ID(只删除匹配到ruldId的课次)
String scheduleId7 = campScheduleTools.getCampTableDate(13, ruldId);
if (!StringUtils.isEmpty(scheduleId7)) {
//删除本次规则创建的下周日所有的课次
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", false);
body.put("scheduleId", scheduleId7);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//删除成功后check 下周日课表是否包含删除的课次
String startDate = CommUtil.oneKeyGetNextWeekXDay(13);//下周日00点时间
String endDate = CommUtil.oneKeyGetNextWeekEndXDay(7);//下周日23：59
campScheduleTools.getCampScheduleTable(startDate, endDate);
Long goalCount = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e -> e.getString("ruleId").equals(ruldId))
.map(e -> e.getString("scheduleId")).count();//获取scheduleId 的数量
Assert.assertTrue(goalCount == 0, "删除当前课次后，再去课表中查看，后端仍然返回数据");
}
}
@AfterTest(description = "删除此case创建的训练营排课日程")
public void delData() {
//先删除规则，再操作删除对应的训练营活动，此处顺序不能换，如果先删除训练营活动，对应的排课会自动删除，所以就不用删除排课日程了，这个场景其他case中会体现
if (null != ruldId || !ruldId.isEmpty()) {
campScheduleTools.delCampRuleSchedule(ruldId);
//删除日程后check 日程列表数据是否还能搜索到，期望搜索结果数据为空
campScheduleTools.getCampRuleScheduleList(campId, super.courseId, "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "日程被删除后，对应的排课日程列表还可以查到相关数据");
}
if (null != campId || !campId.isEmpty()) {
this.getTrainingTools().deleteTraining(campId);
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestEditCampRuleSchedule.java
......@@ -88,7 +88,7 @@ public class TestEditCampRuleSchedule extends SelectTargetTrainingCampAndGetInfo
memberId = tools.create("晨晨爸爸", phone).getString("result");
}
//给会员报名
trainingTools.doSignCampOrder(memberId, this.price, this.campId);
trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
orderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
Thread.sleep(2000);
......@@ -124,7 +124,9 @@ public class TestEditCampRuleSchedule extends SelectTargetTrainingCampAndGetInfo
body.put("endDate", CommUtil.getNDayEndTimeTamp(22)); //结束日期缩短了20天，
body.put("force", true);
body.put("retainBooking", true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//查询训练营日程详情，check修改项是否被同步修改
campScheduleTools.getCampRuleScheduleDetail(ruldId);
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestEditCampScheduleItem.java → src/main/java/com/xiaomai/cases/polar/schedule/camp/TestEditCurrentAndSubsequentCampSchedule.java
package com.xiaomai.cases.polar.schedule.camp;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
......@@ -10,6 +11,7 @@ import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
......@@ -24,10 +26,10 @@ import java.util.stream.Collectors;
* data 2024/7/12 17:08
*/
public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo {
public class TestEditCurrentAndSubsequentCampSchedule extends SelectTargetTrainingCampAndGetInfo {
public static Date now = new Date();
Set<String> scheduleIdsN;
//String scheduleIdsN;
@Resource(name = "groupScheduleTools")
GroupScheduleTools groupScheduleTools;
@Resource(name = "campScheduleTools")
......@@ -44,7 +46,7 @@ public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo
public int scheduleClassHourEditBefore = 0;
public int scheduleClassHourEditAfter = 0;
public List<String> venueAreaIdsEditAfter;
// public List<String> venueAreaIdsEditAfter;
public Boolean flag;
@BeforeClass
......@@ -67,7 +69,7 @@ public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo
"1140", super.openEndDate, true,
String.valueOf(loopNum));
//查询排课日程:根据训练营和关联课程查询
campScheduleTools.getCampRuleScheduleList(campId, super.courseId, "");
campScheduleTools.getCampRuleScheduleList(super.campId, super.courseId, "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 1, "排课创建成功后，日程中没查询到对应数据");
ruldId = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("ruleId");
//获取训练营活动已排课课次数
......@@ -75,49 +77,9 @@ public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo
}
@Test(description = "编辑当前课次")
public void testEditCurrentCampSchedule() {
//获取本次创建规则中下周日课次ID
scheduleIdsN = campScheduleTools.getCampTableDate(13,ruldId);
if (scheduleIdsN.size() != 0 && scheduleIdsN != null) {
scheduleIdsN.stream().forEach(scheduleId -> {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", false);
body.put("scheduleId", scheduleId);
body.put("startTime", startStamp);//修改上课时间
body.put("chiefCoachId", chiefCoachId);
body.put("minMemberNum", super.traineeLowerLimit);
body.put("maxMemberNum", super.traineeUpperLimit);
body.put("venueAreaIds", new ArrayList<>());
body.put("assistCoachIds", super.assistCoachIds);//有空改为有数据2个教练
body.put("spanMinutes", 50);
body.put("force", true);//有冲突时忽略冲突
body.put("retainBooking", true);//保留学员预约
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//编辑成功后check对应课次详情修改内容是否同步成功
campScheduleTools.getCampScheduleItemDetail(scheduleId);
String detailResult = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.chiefCoachId"), chiefCoachId);
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.startTime"), startStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 2, "助教修改后添加2个教练没生效");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "课次创建时场地为空，查看课次详情不为空");
});
}
}
@Test(description = "编辑当前及后续课次", priority = 1)
public void testEditCurrentAndSubsequentCampSchedule() {
@Test(description = "编辑当前及后续课次")
public void testEditCurrentAndSubsequentCampSchedule() throws InterruptedException {
//获取存量场地
List<String> venueAreaIds = groupScheduleTools.getStockArea("流星花园秘密基地");
//获取下下周二的课次ID
......@@ -132,7 +94,7 @@ public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo
scheduleId22 = array.toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(ruldId))
.filter(e -> e.getString("ruleId").equals(ruldId))
.map(e -> e.getString("scheduleId"))//获取scheduleId
.collect(Collectors.toSet());
if (scheduleId22.size() != 0 && scheduleId22 != null) {
......@@ -144,43 +106,45 @@ public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo
}
//获取下周六的课次ID
Set<String> scheduleIds6 = campScheduleTools.getCampTableDate(12,ruldId);
if (scheduleIds6.size() != 0 && scheduleIds6 != null) {
scheduleIds6.stream().forEach(scheduleId -> {
//编辑下周六及后续课次
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);
body.put("scheduleId", scheduleId);
//获取下周六某个时间点的开始时间戳
String startStamp = CommUtil.getWholeHourTimeStamp(12, "19:00");
body.put("startTime", startStamp);//上课时间不做修改
body.put("chiefCoachId", chiefCoachId);
body.put("minMemberNum", super.traineeLowerLimit);
body.put("maxMemberNum", super.traineeUpperLimit);
body.put("venueAreaIds", venueAreaIds);//场地有空改为有数据
body.put("assistCoachIds", new ArrayList<>());
body.put("spanMinutes", 50);
body.put("force", true);//有冲突时忽略冲突
body.put("retainBooking", true);//保留学员预约
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//check当前课次信息是否被同步修改
campScheduleTools.getCampScheduleItemDetail(scheduleId);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.startTime"), startStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.venueAreaIds").containsAll(venueAreaIds), "场地有空改为有数据，但是课次详情中显示不正确哦");
});
String scheduleIds6 = campScheduleTools.getCampTableDate(12, ruldId);
if (!StringUtils.isEmpty(scheduleIds6)) {
//编辑下周六及后续课次
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);
body.put("scheduleId", scheduleIds6);
//获取下周六某个时间点的开始时间戳
String startStamp = CommUtil.getWholeHourTimeStamp(12, "19:00");
body.put("startTime", startStamp);//上课时间不做修改
body.put("chiefCoachId", chiefCoachId);
body.put("minMemberNum", super.traineeLowerLimit);
body.put("maxMemberNum", super.traineeUpperLimit);
body.put("venueAreaIds", venueAreaIds);//场地有空改为有数据
body.put("assistCoachIds", new ArrayList<>());
body.put("spanMinutes", 50);
body.put("force", true);//有冲突时忽略冲突
body.put("retainBooking", true);//保留学员预约
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"));
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//check当前课次信息是否被同步修改
campScheduleTools.getCampScheduleItemDetail(scheduleIds6);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.startTime"), startStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.venueAreaIds").containsAll(venueAreaIds), "场地有空改为有数据，但是课次详情中显示不正确哦");
}
//后续检查点check
Thread.sleep(1000);
//1.查询排课日程:根据训练营查询，应该对应训练营可以查到2条数据，原日程和修改后生成的日程
campScheduleTools.getCampRuleScheduleList(campId, "", "");
campScheduleTools.getCampRuleScheduleList(super.campId, super.courseId, "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 2, "编辑当前及后续课次成功后，日程中没查询到2条对应数据");
//1.1获取到新生成的排课日程ID
//过滤出刚创建的日程
......@@ -199,83 +163,64 @@ public class TestEditCampScheduleItem extends SelectTargetTrainingCampAndGetInfo
}
});
Assert.assertTrue(flag == true, "新规则的场地数据为空了");
//编辑当前及后续课次后，已排课次数量变更check
Assert.assertTrue(scheduleClassHourEditBefore + 1 == scheduleClassHourEditAfter, "编辑当前及后续课次后，训练营已排课次数+1（独立出去的课次 又生成新的一个课次；之前删除的课次，也生成新的课次了）");
//编辑当前及后续课次后，已排课次数量变更check 【独立出去的课次 又生成新的一个课次本次没造该场景】
Assert.assertTrue(scheduleClassHourEditBefore == scheduleClassHourEditAfter, "编辑当前及后续课次后，训练营已排课次数不变（之前删除的课次，也生成新的课次了）");
//新日程的开始日期check
Assert.assertEquals(sDateBefore, CommUtil.getXStartOfDateNextXWeek(5, 1), "新规则的开始日期不对，应该是下周六的时间");
//Assert.assertEquals(eDateBefore.substring(0, 9), super.openEndDate.substring(0, 9), "新规则的结束日期不对");
//2.断言check：获取下周四的课次，check是否还是原来的数据（不会受到影响）
Set<String> scheduleIds4 = campScheduleTools.getCampTableDate(10, ruldId);
if (scheduleIds4.size() != 0 && scheduleIds4 != null) {
scheduleIds4.stream().forEach(scheduleId -> {
campScheduleTools.getCampScheduleItemDetail(scheduleId);
String detailResult = dataApi.getApi_response();
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 0, "课次创建时助教为空，查看课次详情不为空");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "课次创建时场地为空，查看课次详情不为空");
});
}
String scheduleIds4 = campScheduleTools.getCampTableDate(10, ruldId);
if (!StringUtils.isEmpty(scheduleIds4)) {
campScheduleTools.getCampScheduleItemDetail(scheduleIds4);
String detailResult = dataApi.getApi_response();
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 0, "课次创建时助教为空，查看课次详情不为空");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "课次创建时场地为空，查看课次详情不为空");
// 3.check下周日的课次（以独立出去的课次是否受到影响:不受影响）
if (scheduleIdsN.size() != 0 && scheduleIdsN != null) {
scheduleIdsN.stream().forEach(scheduleId -> {
campScheduleTools.getCampScheduleItemDetail(scheduleId);
String detailResult = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.startTime"), startStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 2, "助教修改后添加2个教练没生效");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "课次创建时为空，查看课次详情不为空");
}
//因为编辑单个课次 移除了本类，所以独立出去的课次 再本case中不设计了
/*// 3.check下周日的课次（以独立出去的课次是否受到影响:不受影响）
if (!StringUtils.isEmpty(scheduleIdsN)) {
campScheduleTools.getCampScheduleItemDetail(scheduleIdsN);
String detailResult = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.startTime"), startStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 2, "助教修改后添加2个教练没生效");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "课次创建时为空，查看课次详情不为空");
});
}
//4.check 下周日是否又生成一条新的课次
Set<String> scheduleIds77 = campScheduleTools.getCampTableDate(13,newRuldId);
Assert.assertTrue(scheduleIds77.size() == 1);
//scheduleIds77.removeAll(scheduleIdsN);
// System.out.println(JSON.toJSONString(scheduleIds77));
if (scheduleIds77.size() != 0 && scheduleIds77 != null) {
scheduleIds77.stream().forEach(scheduleId -> {
campScheduleTools.getCampScheduleItemDetail(scheduleId);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.venueAreaIds").containsAll(venueAreaIds), "场地有空改为有数据，但是课次详情中显示不正确哦");
});
}
String scheduleIds77 = campScheduleTools.getCampTableDate(13, newRuldId);
Assert.assertTrue(!StringUtils.isEmpty(scheduleIds77), "下周日没有生成一条新的数据");
campScheduleTools.getCampScheduleItemDetail(scheduleIds77);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.venueAreaIds").containsAll(venueAreaIds), "场地有空改为有数据，但是课次详情中显示不正确哦");*/
//5.check 下下周二是否生成一条新的课次
campScheduleTools.getCampScheduleTable(targetStartDate, targetendDate);
List<String> ruleIdIds22 = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result.timetableGroups").toJavaList(JSONObject.class).stream()
List<String> ruleIdIds22 = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.filter(e -> e.getString("date").equals(targetStartDate))//过滤出日期等于下周日的数据
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(newRuldId))
.filter(e -> e.getString("ruleId").equals(newRuldId))
.map(e -> e.getString("ruleId"))//获取ruleId
.collect(Collectors.toList());
Assert.assertTrue(ruleIdIds22.size() == 1, "课次被删除后，编辑当前及后续，后续删除的课次没重新生成新的课次");
}
//删除数据
this.getTrainingTools().deleteTraining(campId);
//训练营被删除后，对应的排课日程会被自动删除check
campScheduleTools.getCampRuleScheduleList(campId, "", "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").toJavaList(JSONObject.class).stream().filter(e -> e.getString("ruleId").equals(ruldId)).count()==0, "训练营被删除后，对应的排课日程会被自动删除，目前还有相关数据ruldId请检查");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").toJavaList(JSONObject.class).stream().filter(e -> e.getString("ruleId").equals(newRuldId)).count()==0, "训练营被删除后，对应的排课日程会被自动删除，目前还有相关数据newRuldId请检查");
@Test(description = "删除此case创建的训练营排课日程", priority = 2)
public void delData() {
/* if (null != ruldId || !ruldId.isEmpty()) {
campScheduleTools.delCampRuleSchedule(ruldId);
}
if (null != newRuldId || !newRuldId.isEmpty()) {
campScheduleTools.delCampRuleSchedule(newRuldId);
}*/
}
if (null != campId || !campId.isEmpty()) {
this.getTrainingTools().deleteTraining(campId);
//训练营被删除后，对应的排课日程会被自动删除check
campScheduleTools.getCampRuleScheduleList(campId, "", "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "训练营被删除后，对应的排课日程会被自动删除，目前还有相关数据请检查");
}
}
}
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestEditCurrentCampSchedule.java 0 → 100644
package com.xiaomai.cases.polar.schedule.camp;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author adu
* data 2024/8/1 11:19
*/
public class TestEditCurrentCampSchedule extends SelectTargetTrainingCampAndGetInfo {
public static Date now = new Date();
String scheduleIdsN;
@Resource(name = "groupScheduleTools")
GroupScheduleTools groupScheduleTools;
@Resource(name = "campScheduleTools")
CampScheduleTools campScheduleTools;
String campId = "";
String chiefCoachId = "";
String ruldId = "";
//获取下周日某个时间点的开始时间戳
String startStamp = CommUtil.getWholeHourTimeStamp(13, "13:30");
public int scheduleClassHourEditBefore = 0;
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Schedule, "API_editCampSchedule", LoginAccount.ADU_PROD, Terminal.B, "adu");
super.beforeTest();
// 获取选择的训练营ID
campId = super.campId;
//1.2获取训练营活动的指定教练ID
chiefCoachId = super.chiefCoachId;
//获取目标时间段内 最大有效课时数
String[] weekDaysArray = {"TUESDAY", "THURSDAY", "SATURDAY", "SUNDAY"};
List<String> weekdaysList = Arrays.asList(weekDaysArray);
int loopNum = campScheduleTools.queryExpectedLoopNum(CommUtil.oneKeyGetAddDay(3), super.openEndDate, weekdaysList);
//创建训练营排课：按次数 星期：2，4，6，7
campScheduleTools.oneKeyCreateCampRuleSchedule(campId, chiefCoachId, super.courseId,
super.traineeLowerLimit, super.traineeUpperLimit,
"1140", super.openEndDate, true,
String.valueOf(loopNum));
//查询排课日程:根据训练营和关联课程查询
campScheduleTools.getCampRuleScheduleList(super.campId, super.courseId, "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 1, "排课创建成功后，日程中没查询到对应数据");
ruldId = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("ruleId");
//获取训练营活动已排课课次数
scheduleClassHourEditBefore = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getJSONObject("campVO").getIntValue("scheduleClassHour");
}
@Test(description = "编辑当前课次")
public void testEditCurrentCampSchedule() {
//获取本次创建规则中下周日课次ID
scheduleIdsN = campScheduleTools.getCampTableDate(13, ruldId);
if (!StringUtils.isEmpty(scheduleIdsN)) {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", false);
body.put("scheduleId", scheduleIdsN);
body.put("startTime", startStamp);//修改上课时间
body.put("chiefCoachId", chiefCoachId);
body.put("minMemberNum", super.traineeLowerLimit);
body.put("maxMemberNum", super.traineeUpperLimit);
body.put("venueAreaIds", new ArrayList<>());
body.put("assistCoachIds", super.assistCoachIds);//有空改为有数据2个教练
body.put("spanMinutes", 50);
body.put("force", true);//有冲突时忽略冲突
body.put("retainBooking", true);//保留学员预约
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"));
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//编辑成功后check对应课次详情修改内容是否同步成功
campScheduleTools.getCampScheduleItemDetail(scheduleIdsN);
String detailResult = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.chiefCoachId"), chiefCoachId);
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.startTime"), startStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 2, "助教修改后添加2个教练没生效");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "课次创建时场地为空，查看课次详情不为空");
}
}
@AfterTest(description = "删除此case创建的训练营排课日程")
public void delData() {
if (null != campId || !campId.isEmpty()) {
this.getTrainingTools().deleteTraining(campId);
//训练营被删除后，对应的排课日程会被自动删除check
campScheduleTools.getCampRuleScheduleList(campId, "", "");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "训练营被删除后，对应的排课日程会被自动删除，目前还有相关数据请检查");
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestGetCampScheduleItemDetail.java
package com.xiaomai.cases.polar.schedule.camp;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.finance.order.OrderTools;
......@@ -64,7 +65,7 @@ public class TestGetCampScheduleItemDetail extends SelectTargetTrainingCampAndGe
memberId = tools.create("阿杜", phone).getString("result");
}
//给会员报名
trainingTools.doSignCampOrder(memberId, this.price, this.campId);
trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
orderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
String memberCardId = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("memberCardId");
......@@ -81,8 +82,8 @@ public class TestGetCampScheduleItemDetail extends SelectTargetTrainingCampAndGe
ruldId = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("ruleId");
//查看下周5的日课表，期望值无数据
Set<String> scheduleIds5 = campScheduleTools.getCampTableDate(11,ruldId);
Assert.assertTrue(scheduleIds5.size() == 0 || scheduleIds5 == null, "周五没排课，但是检查出有课次");
String scheduleIds5 = campScheduleTools.getCampTableDate(11,ruldId);
Assert.assertTrue(StringUtils.isEmpty(scheduleIds5), "周五没排课，但是检查出有课次");
//查看下周日的日课表，有数据，并查看课次详情
String startDate = CommUtil.oneKeyGetNextWeekXDay(13);//下周日00点时间
......@@ -104,7 +105,9 @@ public class TestGetCampScheduleItemDetail extends SelectTargetTrainingCampAndGe
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("id", scheduleId);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//断言check
//课次中有1个学员check
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestGetCampScheduleTable.java
......@@ -104,7 +104,9 @@ public class TestGetCampScheduleTable extends SelectTargetTrainingCampAndGetInfo
body.put("coachId", coachId);
body.put("statusSet", statusSet);
body.put("venueAreaId", venueAreaId);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
int resultCount = Integer.parseInt(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.result.totalCount"));
Assert.assertTrue(resultCount >= total, "查询到的课表数据和预期不一致");
}
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestTrainingSign.java 0 → 100644
package com.xiaomai.cases.polar.schedule.camp;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.cases.polar.reserve.ReserveTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.polar.training
* @Author: xuyamei
* @CreateTime: 2024-07-31 10:39
* @Description: 训练营签到、请假、补签到、无需补课、请假已补
* @Version: 1.0
*/
public class TestTrainingSign extends BaseTestImpl {
@Resource(name = "campScheduleTools")
CampScheduleTools campScheduleTools;
@Resource(name = "reserveTools")
ReserveTools reserveTools;
CardTools cardTools = new CardTools();
private String scheduleId;
@BeforeMethod
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Reserve,"API_remedial", LoginAccount.GYM_PROD, Terminal.B,"xuyamei");
super.beforeTest();
}
@Test(description = "训练营签到")
public void testTrainingSign() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1818220193259798530");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
campScheduleTools.getCampScheduleItemDetail(scheduleId);
JSONArray memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
String reserveId = ""; // 约课id
String memberId = "";
String benefitId = ""; // 权益id
String memberCardId = ""; // 卡id
// 查到需要操作签到的学员id
boolean hasData = false; // 是否找到需要操作的学员
for (int i = 0; i < memberRserveList.size(); i++) {
System.out.println("-------------i"+i);
System.out.println("-------------i"+i);
if (memberRserveList.getJSONObject(i).getJSONObject("member").getString("name").contains("微信用户") && memberRserveList.getJSONObject(i).getString("signInState").equals("UN_SIGNED")) {
reserveId = memberRserveList.getJSONObject(i).getString("id");
memberId = memberRserveList.getJSONObject(i).getString("memberId");
benefitId = memberRserveList.getJSONObject(i).getString("benefitId");
memberCardId = memberRserveList.getJSONObject(i).getString("memberCardId");
hasData = true;
break;
}
}
Assert.assertTrue(hasData, "没有找到需要操作的学员,课次今日可能没有可操作的学员，请手动在页面回归签到");
// 操作签到
reserveTools.signIn(true, reserveId, false);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1: 课次详情到课状态为签到
campScheduleTools.getCampScheduleItemDetail(scheduleId);
memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
for (int i = 0; i < memberRserveList.size(); i++) {
if (memberRserveList.getJSONObject(i).getString("id").equals(reserveId)) {
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("signInState"), "SIGNED");
}
}
// check 2: 预约记录是否包含该预约
String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"};
String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1818220193259798530");
boolean success = false;
for (int i = 0; i < getPageByStudio.size(); i++) {
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) {
success = true;
for (int j = 0; j < result.length; j++) {
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]), resultData[j], "训练营签到产生的数据与实际数据不符合" + result[j] + "：" + resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberId, "查询的训练营签到产生数据不是同一个会员");
}
}
Assert.assertTrue(success, "训练营签到产生约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(reserveId);
for (int j = 0; j < result.length; j++) {
Assert.assertEquals(getDetailById.getString(result[j]), resultData[j], "训练营签到产生的数据与实际数据不符合" + result[j] + "：" + resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberId, "查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId, memberCardId).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[]{"resourceId", "consumeType", "changeOfPurchaseBalance"};
String[] respect = new String[]{reserveId, "SIGN_IN", "-1.00"};
String[] message = new String[]{"训练营消耗记录中记录的资源id与实际约课记录id不符合", "训练营消耗记录中记录的资源id与实际约课记录类型不符合", "训练营消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++) {
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]), respect[i], message[i]);
}
}
@Test(description = "训练营请假", priority = 1)
public void testTrainingSign_Leave() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
campScheduleTools.getCampScheduleItemDetail(scheduleId);
JSONArray memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
String reserveId = ""; // 约课id
String memberId = "";
String benefitId = ""; // 权益id
String memberCardId = ""; // 卡id
// 查到需要操作签到的学员id
boolean hasData = false; // 是否找到需要操作的学员
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getJSONObject("member").getString("name").contains("训练营请假学员") && memberRserveList.getJSONObject(i).getString("signInState").equals("UN_SIGNED")){
reserveId = memberRserveList.getJSONObject(i).getString("id");
memberId = memberRserveList.getJSONObject(i).getString("memberId");
benefitId = memberRserveList.getJSONObject(i).getString("benefitId");
memberCardId = memberRserveList.getJSONObject(i).getString("memberCardId");
hasData = true;
break;
}
}
Assert.assertTrue(hasData, "没有找到需要操作的学员,课次今日可能没有可操作的学员，请手动在页面回归请假");
// 操作请假
reserveTools.signIn(true,reserveId,true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1: 课次详情到课状态为签到
campScheduleTools.getCampScheduleItemDetail(scheduleId);
memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getString("id").equals(reserveId)){
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("signInState"),"LEAVE");
}
}
// check 2: 预约记录是否包含该预约
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]),resultData[j],"训练营请假产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberId,"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"训练营请假产生约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(reserveId);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),resultData[j],"训练营请假产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberId,"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[] {"resourceId","consumeType","changeOfPurchaseBalance"};
String[] respect = new String[] {reserveId,"LEAVE","-1.00"};
String[] message = new String[] {"训练营消耗记录中记录的资源id与实际约课记录id不符合","训练营消耗记录中记录的资源id与实际约课记录类型不符合","训练营消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
@Test(description = "训练营请假补签到", priority = 2)
public void testTrainingSign_SIGNED() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
campScheduleTools.getCampScheduleItemDetail(scheduleId);
JSONArray memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
String reserveId = ""; // 约课id
String memberId = "";
String benefitId = ""; // 权益id
String memberCardId = ""; // 卡id
// 查到需要操作签到的学员id
boolean hasData = false; // 是否找到需要操作的学员
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getJSONObject("member").getString("name").contains("训练营请假补签到") && memberRserveList.getJSONObject(i).getString("signInState").equals("UN_SIGNED")){
reserveId = memberRserveList.getJSONObject(i).getString("id");
memberId = memberRserveList.getJSONObject(i).getString("memberId");
benefitId = memberRserveList.getJSONObject(i).getString("benefitId");
memberCardId = memberRserveList.getJSONObject(i).getString("memberCardId");
hasData = true;
break;
}
}
Assert.assertTrue(hasData, "没有找到需要操作的学员,课次今日可能没有可操作的学员，请手动在页面回归请假补签到");
// 操作请假
reserveTools.signIn(true,reserveId,true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 操作补签到
reserveTools.signIn(true,reserveId,false);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1: 课次详情到课状态为签到
campScheduleTools.getCampScheduleItemDetail(scheduleId);
memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getString("id").equals(reserveId)){
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("signInState"),"SIGNED");
}
}
// check 2: 预约记录是否包含该预约
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]),resultData[j],"训练营补签到产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberId,"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"约课后在约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(reserveId);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),resultData[j],"训练营补签到产生产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberId,"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗还是请假，请假已经扣除补签到不会再扣
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[] {"resourceId","consumeType","changeOfPurchaseBalance"};
String[] respect = new String[] {reserveId,"LEAVE","-1.00"};
String[] message = new String[] {"训练营消耗记录中记录的资源id与实际约课记录id不符合","训练营消耗记录中记录的资源id与实际约课记录类型不符合","训练营消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
@Test(description = "训练营请假标记已补", priority = 3)
public void testTrainingSign_MARK_REMEDIAL() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
campScheduleTools.getCampScheduleItemDetail(scheduleId);
JSONArray memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
String reserveId = ""; // 约课id
String memberId = "";
String benefitId = ""; // 权益id
String memberCardId = ""; // 卡id
// 查到需要操作签到的学员id
boolean hasData = false; // 是否找到需要操作的学员
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getJSONObject("member").getString("name").contains("训练营请假标记已补") && memberRserveList.getJSONObject(i).getString("signInState").equals("UN_SIGNED")){
reserveId = memberRserveList.getJSONObject(i).getString("id");
memberId = memberRserveList.getJSONObject(i).getString("memberId");
benefitId = memberRserveList.getJSONObject(i).getString("benefitId");
memberCardId = memberRserveList.getJSONObject(i).getString("memberCardId");
hasData = true;
break;
}
}
Assert.assertTrue(hasData, "没有找到需要操作的学员,课次今日可能没有可操作的学员，请手动在页面回归请假标记已补");
// 操作请假
reserveTools.signIn(true,reserveId,true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 操作标记已补
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("remedialSignState", "MARK_REMEDIAL");
body.put("reserveId", reserveId);
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
xmAppApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1: 课次详情到课状态为请假 标记已补
campScheduleTools.getCampScheduleItemDetail(scheduleId);
memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getString("id").equals(reserveId)){
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("signInState"),"LEAVE");
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("remedialSignState"),"MARK_REMEDIAL");
}
}
// check 2: 预约记录是否包含该预约
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]),resultData[j],"训练营请假标记已补产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberId,"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"约课后在约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(reserveId);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),resultData[j],"训练营请假标记已补产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberId,"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗还是请假，请假已经扣除不会再扣
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[] {"resourceId","consumeType","changeOfPurchaseBalance"};
String[] respect = new String[] {reserveId,"LEAVE","-1.00"};
String[] message = new String[] {"训练营消耗记录中记录的资源id与实际约课记录id不符合","训练营消耗记录中记录的资源id与实际约课记录类型不符合","训练营消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
@Test(description = "训练营请假无需补课", priority = 3)
public void testTrainingSign_NEED_NOT_REMEDIAL() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
campScheduleTools.getCampScheduleItemDetail(scheduleId);
JSONArray memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
String reserveId = ""; // 约课id
String memberId = "";
String benefitId = ""; // 权益id
String memberCardId = ""; // 卡id
// 查到需要操作签到的学员id
boolean hasData = false; // 是否找到需要操作的学员
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getJSONObject("member").getString("name").contains("训练营请假无需") && memberRserveList.getJSONObject(i).getString("signInState").equals("UN_SIGNED")){
reserveId = memberRserveList.getJSONObject(i).getString("id");
memberId = memberRserveList.getJSONObject(i).getString("memberId");
benefitId = memberRserveList.getJSONObject(i).getString("benefitId");
memberCardId = memberRserveList.getJSONObject(i).getString("memberCardId");
hasData = true;
break;
}
}
Assert.assertTrue(hasData, "没有找到需要操作的学员,课次今日可能没有可操作的学员，请手动在页面回归请假无需补课");
// 操作请假
reserveTools.signIn(true,reserveId,true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 操作标记已补
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("remedialSignState", "NEED_NOT_REMEDIAL");
body.put("reserveId", reserveId);
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
xmAppApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
try {
Thread.sleep(2500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// check 1: 课次详情到课状态为请假-无需补课
campScheduleTools.getCampScheduleItemDetail(scheduleId);
memberRserveList = dataApi.getBodyInJSON().getJSONObject("result").getJSONArray("memberReserveList");
for (int i = 0; i < memberRserveList.size(); i++){
if (memberRserveList.getJSONObject(i).getString("id").equals(reserveId)){
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("signInState"),"LEAVE");
Assert.assertEquals(memberRserveList.getJSONObject(i).getString("remedialSignState"),"NEED_NOT_REMEDIAL");
}
}
// check 2: 预约记录是否包含该预约
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
success = true;
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString(result[j]),resultData[j],"训练营请假无需补课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getPageByStudio.getJSONObject(i).getString("memberId"), memberId,"查询的约课数据不是同一个会员");
}
}
Assert.assertTrue(success,"约课后在约课记录没有查询到相关信息");
// check 2.3 预约记录详情
JSONObject getDetailById = reserveTools.getDetailById(reserveId);
for(int j = 0;j<result.length;j++){
Assert.assertEquals(getDetailById.getString(result[j]),resultData[j],"训练营请假无需补课产生的数据与实际数据不符合"+result[j]+"："+resultData[j]);
}
Assert.assertEquals(getDetailById.getString("memberId"), memberId,"查询的约课数据不是同一个会员");
// check 3： 会员卡消耗记录中包含该记录签到消耗还是请假，请假已经扣除不会再扣
JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records");
String[] result2 = new String[] {"resourceId","consumeType","changeOfPurchaseBalance"};
String[] respect = new String[] {reserveId,"LEAVE","-1.00"};
String[] message = new String[] {"训练营消耗记录中记录的资源id与实际约课记录id不符合","训练营消耗记录中记录的资源id与实际约课记录类型不符合","训练营消耗记录中记录的资源id与实际约课记录余额不符合"};
for (int i = 0; i < result2.length; i++){
Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message[i]);
}
}
}
src/main/java/com/xiaomai/cases/polar/schedule/group/GroupScheduleTools.java
......@@ -12,6 +12,7 @@ import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.testng.Assert;
import javax.annotation.Resource;
import java.util.ArrayList;
......@@ -74,7 +75,9 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("endDate", CommUtil.getNDayEndTimeTamp(60)); //排课结束日期，这里就设置自动延顺60天，结束日期会覆盖你传的endDate
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -98,7 +101,8 @@ public class GroupScheduleTools extends XMBaseTest {
if (coachId != null && coachId.length() != 0) {
body.put("coachId", coachId);
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
return XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result");
}
......@@ -144,7 +148,9 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("force", force);
body.put("ruleId", ruleId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -228,7 +234,9 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", ruldId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -248,7 +256,9 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", scheduleId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
return dataApi.getBodyInJSON().getJSONObject("result");
}
......@@ -309,7 +319,9 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("assistCoachIds", new ArrayList());
body.put("spanMinutes", 60);
body.put("force", false);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
......@@ -331,7 +343,9 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("scheduleId", scheduleId);
body.put("applyRestRule", false);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
......@@ -367,7 +381,7 @@ public class GroupScheduleTools extends XMBaseTest {
* @param ruldId
* @return
*/
public Set<String> getTableDate(int n,String ruldId) {
public String getTableDate(int n,String ruldId) {
//查看团课课表
getGroupScheduleTable(Long.valueOf(CommUtil.oneKeyGetNextWeekStartDay()), Long.valueOf(CommUtil.oneKeyGetNextWeekEndDay()),"");
//获取下周周N及后续的课次
......@@ -375,16 +389,17 @@ public class GroupScheduleTools extends XMBaseTest {
int count = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").size();
if (count > 0) {
JSONArray array = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups");
Set<String> scheduleIds = array.toJavaList(JSONObject.class).stream()
String scheduleIds = array.toJavaList(JSONObject.class).stream()
.filter(e -> e.getString("date").equals(date))//过滤出日期等于下周N的数据
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())//对过滤出的数据再次取目标数据重新组合成一个新的数据流
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(ruldId))
.map(e -> e.getString("scheduleId"))//获取scheduleId
.collect(Collectors.toSet());
return scheduleIds; //如果当天没排课，则scheduleIds.size()==0
.findFirst().orElse("");
return scheduleIds;
}
return null;
return "";
}
......
src/main/java/com/xiaomai/cases/polar/schedule/group/TestCreateGroupRuleSchedule.java
package com.xiaomai.cases.polar.schedule.group;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
......@@ -79,7 +80,7 @@ public class TestCreateGroupRuleSchedule extends BaseTestImpl {
List<String> assistCoachIdS = groupScheduleTools.getStudioAdminId(assistCoachIds);
//1-创建排课日程
groupScheduleTools.createGroupRuleSchedule(courseId, chiefCoachIdS, todayStartTimeTamp, endDateTimeTamp, venueAreaIds, assistCoachIdS, false, 1, 480);
groupScheduleTools.createGroupRuleSchedule(courseId, chiefCoachIdS, todayStartTimeTamp, endDateTimeTamp, venueAreaIds, assistCoachIdS, true, 1, 480);
//2-查询排课日程
JSONArray result = groupScheduleTools.getGroupRuleScheduleList(courseId, chiefCoachIdS);
String ruldId = XMJSONPath.readPath(result.getJSONObject(0), "$.ruleId");
......@@ -97,7 +98,10 @@ public class TestCreateGroupRuleSchedule extends BaseTestImpl {
.map(e -> e.getString("scheduleId"))//获取scheduleId
.findFirst().orElse(null);
Assert.assertTrue(scheduleId!=null||!scheduleId.isEmpty(),"刚创建的规则中，没查询到今天对应的课次");
// Assert.assertTrue(scheduleId!=null||!scheduleId.isEmpty(),"刚创建的规则中，没查询到今天对应的课次");//你这个判断，如果scheduleID != null 不成立，就会走到 !scheduleId.isEmpty(),此时shcdueId是null，使用.isEmpry就空指针了
Assert.assertTrue(!StringUtils.isEmpty(scheduleId),"刚创建的规则中，没查询到今天对应的课次");
//创建今日待上课的排课后查询今日待上课的数据
long num= homeTools.queryTodaySchedule().getJSONArray("result").toJavaList(JSONObject.class).stream()
......
src/main/java/com/xiaomai/cases/polar/schedule/group/TestDelGroupScheduleItem.java → src/main/java/com/xiaomai/cases/polar/schedule/group/TestDelCurrentAndSubsequentGroupSchedule.java
package com.xiaomai.cases.polar.schedule.group;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
......@@ -13,11 +13,6 @@ import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 删除课次（删除当前课次/删除当前及后续课次）
*
......@@ -25,7 +20,7 @@ import java.util.stream.Collectors;
* data 2024/6/30 17:02
*/
public class TestDelGroupScheduleItem extends UniversalDataScheduling {
public class TestDelCurrentAndSubsequentGroupSchedule extends UniversalDataScheduling {
@BeforeClass
@Override
......@@ -35,79 +30,41 @@ public class TestDelGroupScheduleItem extends UniversalDataScheduling {
}
@Test(description = "删除当前课次")
public void testDelCurrentGroupSchedule() {
//获取下周四的课次ID(匹配到刚创建的规则ID)
Set<String> scheduleIds = groupScheduleTools.getTableDate(10,groupRuldId);
//如果课次ID有值则继续走删除的case
if (!scheduleIds.isEmpty()) {
scheduleIds.stream().forEach(scheduleId -> {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", false);
body.put("scheduleId", scheduleId);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
//删除成功后check 下周四课表是否有数据
groupScheduleTools.getGroupScheduleTable(Long.valueOf(CommUtil.oneKeyGetNextWeekXDay(10)), Long.valueOf(CommUtil.oneKeyGetNextWeekEndXDay(4)),courseId);
Long countA=XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())
.filter(e ->e.getString("scheduleId").equals(scheduleId)).count();
Assert.assertTrue(countA==0,"删除课次后，课表中后端返回数据有问题，目前还能发现数据");
});
}
}
@Test(description = "删除当前及后续课次", priority = 1)
@Test(description = "删除当前及后续课次")
public void testDelCurrentAndSubsequentGroupSchedule() {
//获取下周三的课次ID(匹配到对应的规则ID)
Set<String> scheduleIds = groupScheduleTools.getTableDate(9,groupRuldId);
String scheduleIdsG = groupScheduleTools.getTableDate(9, groupRuldId);
//如果课次ID有值则继续走删除的case
if (!scheduleIds.isEmpty()) {
scheduleIds.stream().forEach(scheduleId -> {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);
body.put("scheduleId", scheduleId);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
//删除成功后check 从下周三到下周日课表是否有数据
groupScheduleTools.getGroupScheduleTable(Long.valueOf(CommUtil.oneKeyGetNextWeekXDay(9)), Long.valueOf(CommUtil.oneKeyGetNextWeekEndDay()),courseId);
Long countB=XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())
.filter(e -> null != e.getString("ruleId"))
.filter(e ->e.getString("ruleId").equals(groupRuldId)).count();
Assert.assertTrue(countB==0,"删除当前及后续课次后，课表中后端返回数据有问题，目前还能发现数据"); });
if (!StringUtils.isEmpty(scheduleIdsG)) {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);
body.put("scheduleId", scheduleIdsG);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"));
//删除成功后check 从下周三到下周日课表是否有数据
groupScheduleTools.getGroupScheduleTable(Long.valueOf(CommUtil.oneKeyGetNextWeekXDay(9)), Long.valueOf(CommUtil.oneKeyGetNextWeekEndDay()), courseId);
Long countB = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())
.filter(e -> null != e.getString("ruleId"))
.filter(e -> e.getString("ruleId").equals(groupRuldId)).count();
Assert.assertTrue(countB == 0, "删除当前及后续课次后，课表中后端返回数据有问题，目前还能发现数据");
}
}
@AfterTest(description = "删除此case创建的日程")
public void delData(){
List<String> ruleIdIds = new ArrayList<>();
//查询这个case创建的相关日程
JSONArray result = groupScheduleTools.getGroupRuleScheduleList(courseId, chiefCoachIdS);
int count = result.size();
if (count > 0) {//如果有数据，则获取对应日程ID
ruleIdIds = result.stream().map(obj -> {
JSONObject ruldIdInfo = (JSONObject) obj;
return ruldIdInfo.getString("ruleId");
}
).collect(Collectors.toList());
}
if (ruleIdIds != null) {//获取到的日程ID不为空时，则逐个删除相关日程
ruleIdIds.stream().forEach(ruleId -> {
public void delData() {
if (!StringUtils.isEmpty(groupRuldId)) {//获取到的日程ID不为空时，则逐个删除相关日程
//删除对应日程
groupScheduleTools.delGroupRuleSchedule(ruleId, true);
});
groupScheduleTools.delGroupRuleSchedule(groupRuldId, true);
}
}
......@@ -115,6 +72,5 @@ public class TestDelGroupScheduleItem extends UniversalDataScheduling {
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/group/TestDelCurrentSingleGroupSchedule.java 0 → 100644
package com.xiaomai.cases.polar.schedule.group;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author adu
* data 2024/8/1 10:00
*/
public class TestDelCurrentSingleGroupSchedule extends UniversalDataScheduling{
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Schedule, "API_delGroupScheduleItem", LoginAccount.ADU_PROD, Terminal.B, "adu");
super.beforeTest();
}
@Test(description = "删除当前课次")
public void testDelCurrentSingleGroupSchedule() {
//获取下周四的课次ID(匹配到刚创建的规则ID)
String scheduleId = groupScheduleTools.getTableDate(10, groupRuldId);
//如果课次ID有值则继续走删除的case
if (!StringUtils.isEmpty(scheduleId)) {
JSONObject body1 = new JSONObject();
body1.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body1.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body1.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body1.put("applyRestRule", false);
body1.put("scheduleId", scheduleId);
xmAppApi.doRequest(RequestType.JSON, params, body1.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"));
//删除成功后check 下周四课表是否有数据
groupScheduleTools.getGroupScheduleTable(Long.valueOf(CommUtil.oneKeyGetNextWeekXDay(10)), Long.valueOf(CommUtil.oneKeyGetNextWeekEndXDay(4)), courseId);
Long countA = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.timetableGroups").toJavaList(JSONObject.class).stream()
.flatMap(e -> e.getJSONArray("timetableList").toJavaList(JSONObject.class).stream())
.filter(e -> e.getString("scheduleId").equals(scheduleId)).count();
Assert.assertTrue(countA == 0, "删除课次后，课表中后端返回数据有问题，目前还能发现数据");
}
}
@AfterTest(description = "删除此case创建的日程")
public void delData() {
if (!StringUtils.isEmpty(groupRuldId)) {//获取到的日程ID不为空时，则逐个删除相关日程
//删除对应日程
groupScheduleTools.delGroupRuleSchedule(groupRuldId, true);
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/group/TestEditCurrentAndSubsequentGroupSchedule.java 0 → 100644
package com.xiaomai.cases.polar.schedule.group;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.Date;
/**
* @author adu
* data 2024/8/1 11:09
*/
public class TestEditCurrentAndSubsequentGroupSchedule extends UniversalDataScheduling{
public static Date now = new Date();
String newGroupRuldId="";
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Schedule, "API_editGroupSchedule", LoginAccount.ADU_PROD, Terminal.B, "adu");
super.beforeTest();
}
@Test(description = "编辑当前及后续课次")
public void testEditCurrentAndSubsequentGroupSchedule() {
//获取下周二的课次ID(匹配到刚创建的规则ID)
String scheduleId = groupScheduleTools.getTableDate(8, groupRuldId);
//如果课次ID有值则继续走编辑的case
if (!StringUtils.isEmpty(scheduleId)) {
{
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);//改的时日程当前及后续
body.put("scheduleId", scheduleId);
//获取下周二某个时间点的开始时间戳
String startStamp1 = CommUtil.getWholeHourTimeStamp(8, "13:00");
body.put("startTime", startStamp1);
body.put("chiefCoachId", chiefCoachIdS);
body.put("minMemberNum", 6);//修改开课人数
body.put("maxMemberNum", 999);
body.put("venueAreaIds", venueAreaIds);
body.put("assistCoachIds", new ArrayList<>());//修改教练
body.put("spanMinutes", 50);
body.put("force", true);//有冲突时忽略冲突
//body.put("retainBooking", true);//保留学员预约，无改动到时间，教练，场地则不需要传此字段
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//编辑成功后check对应课次详情修改内容是否同步成功
checkData(scheduleId, startStamp1);
//通过课次详情，活动课次对应的ruldId
newGroupRuldId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.ruleId");
//查看下周三课次是否同步被修改
String scheduleIdX = groupScheduleTools.getTableDate(9, newGroupRuldId);
String startStamp2 = CommUtil.getWholeHourTimeStamp(9, "13:00");
if (!StringUtils.isEmpty(scheduleIdX)) {
//编辑成功后check同规则中下周三课次详情修改内容是否同步成功
checkData(scheduleIdX, startStamp2);
}
}
//获取下周一的课次ID，查看下周一课次是否还是原来的（没被修改，还是原来的规则）
String scheduleId1 = groupScheduleTools.getTableDate(7, groupRuldId);
String startStamp3 = CommUtil.getWholeHourTimeStamp(7, "13:00");
if (!StringUtils.isEmpty(scheduleId1)) {
//编辑成功后check同规则中下周一课次详情
groupScheduleTools.getScheduleItemDetail(scheduleId1);
String detailResult1 = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.chiefCoachId"), chiefCoachIdS);
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.minMemberNum"), "2");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.maxMemberNum"), "999");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.startTime"), startStamp3);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.assistCoachIds").containsAll(assistCoachIdS), "助教无修改，但是却变动了");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.venueAreaIds").containsAll(venueAreaIds), "场地无修改，但是却变动了");
}
}
}
/**
* 编辑后通过查看课次详情check数据是否同步被修改
* @param scheduleId
*/
public void checkData (String scheduleId, String tiemStamp){
groupScheduleTools.getScheduleItemDetail(scheduleId);
String detailResult1 = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.chiefCoachId"), chiefCoachIdS);
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.minMemberNum"), "6");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.maxMemberNum"), "999");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.startTime"), tiemStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.assistCoachIds").size() == 0, "助教修改后（置空）没生效");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.venueAreaIds").containsAll(venueAreaIds), "场地无修改，但是却变动了");
}
@AfterTest(description = "删除此case创建的日程")
public void delData () {
if (!StringUtils.isEmpty(groupRuldId)) {//获取到的日程ID不为空时，则逐个删除相关日程
//删除对应原日程
groupScheduleTools.delGroupRuleSchedule(groupRuldId, true);
}
if (!StringUtils.isEmpty(newGroupRuldId)) {
//删除编辑当前及后续生成的新规则
groupScheduleTools.delGroupRuleSchedule(newGroupRuldId, true);
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/group/TestEditGroupSchedule.java → src/main/java/com/xiaomai/cases/polar/schedule/group/TestEditCurrentGroupSchedule.java
package com.xiaomai.cases.polar.schedule.group;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
......@@ -16,7 +17,6 @@ import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
......@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
* data 2024/7/2 10:45
*/
public class TestEditGroupSchedule extends UniversalDataScheduling {
public class TestEditCurrentGroupSchedule extends UniversalDataScheduling {
public static Date now = new Date();
Set<String> scheduleIdsN;
String scheduleIdsN;
String newGroupRuldId="";
......@@ -44,14 +44,13 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
//获取下周四的课次ID(匹配到刚创建的规则ID)
scheduleIdsN = groupScheduleTools.getTableDate(10,groupRuldId);
//如果课次ID有值则继续走删除的case
if (!scheduleIdsN.isEmpty()) {
scheduleIdsN.stream().forEach(scheduleId -> {
if (!StringUtils.isEmpty(scheduleIdsN)) {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", false);
body.put("scheduleId", scheduleId);
body.put("scheduleId", scheduleIdsN);
//获取下周四某个时间点的开始时间戳
String startStamp = CommUtil.getWholeHourTimeStamp(10,"13:30");
body.put("startTime", startStamp);
......@@ -65,14 +64,16 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
body.put("force", true);//有冲突时忽略冲突
body.put("retainBooking", false);//不保留学员预约
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
try {
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//编辑成功后check对应课次详情修改内容是否同步成功
groupScheduleTools.getScheduleItemDetail(scheduleId);
groupScheduleTools.getScheduleItemDetail(scheduleIdsN);
String detailResult = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.chiefCoachId"), chiefCoachIdS);
Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.minMemberNum"), "1");
......@@ -82,136 +83,31 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "场地修改后（置空）没生效");
});
}
}
@Test(description = "编辑当前及后续课次", priority = 1)
public void testEditCurrentAndSubsequentGroupSchedule() {
//获取下周二的课次ID(匹配到刚创建的规则ID)
Set<String> scheduleIds = groupScheduleTools.getTableDate(8,groupRuldId);
//如果课次ID有值则继续走编辑的case
if (!scheduleIds.isEmpty()) {
scheduleIds.stream().forEach(scheduleId -> {
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("applyRestRule", true);//改的时日程当前及后续
body.put("scheduleId", scheduleId);
//获取下周二某个时间点的开始时间戳
String startStamp1 =CommUtil.getWholeHourTimeStamp(8,"13:00");
body.put("startTime", startStamp1);
body.put("chiefCoachId", chiefCoachIdS);
body.put("minMemberNum", 6);//修改开课人数
body.put("maxMemberNum", 999);
body.put("venueAreaIds", venueAreaIds);
body.put("assistCoachIds", new ArrayList<>());//修改教练
body.put("spanMinutes", 50);
body.put("force", true);//有冲突时忽略冲突
//body.put("retainBooking", true);//保留学员预约，无改动到时间，教练，场地则不需要传此字段
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//编辑成功后check对应课次详情修改内容是否同步成功
checkData(scheduleId,startStamp1);
//通过课次详情，活动课次对应的ruldId
newGroupRuldId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result.ruleId");
@AfterTest(description = "删除此case创建的日程")
public void delData () {
if (!StringUtils.isEmpty(groupRuldId)) {//获取到的日程ID不为空时，则逐个删除相关日程
//删除对应日程
groupScheduleTools.delGroupRuleSchedule(groupRuldId, true);
}
//查看下周三课次是否同步被修改
Set<String> scheduleIdX = groupScheduleTools.getTableDate(9,newGroupRuldId);
String startStamp2 = CommUtil.getWholeHourTimeStamp(9,"13:00");
if (!scheduleIdX.isEmpty()) {
scheduleIdX.stream().forEach(scheduleId1 -> {
//编辑成功后check同规则中下周三课次详情修改内容是否同步成功
checkData(scheduleId1,startStamp2);
});
}
if (!scheduleIdsN.isEmpty()) {
//删除case1中编辑独立出去的课次
groupScheduleTools.delGroupScheduleItem(scheduleIdsN);
}
});
}
//获取下周一的课次ID，查看下周一课次是否还是原来的（没被修改，还是原来的规则）
Set<String> scheduleId1 = groupScheduleTools.getTableDate(7,groupRuldId);
String startStamp3=CommUtil.getWholeHourTimeStamp(7,"13:00");
if (!scheduleId1.isEmpty()) {
scheduleId1.stream().forEach(scheduleId0 -> {
//编辑成功后check同规则中下周一课次详情
groupScheduleTools.getScheduleItemDetail(scheduleId0);
String detailResult1 = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.chiefCoachId"), chiefCoachIdS);
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.minMemberNum"), "2");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.maxMemberNum"), "999");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.startTime"), startStamp3);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.assistCoachIds").containsAll(assistCoachIdS), "助教无修改，但是却变动了");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.venueAreaIds").containsAll(venueAreaIds), "场地无修改，但是却变动了");
});
}
}
/**
* 编辑后通过查看课次详情check数据是否同步被修改
* @param scheduleId
*/
public void checkData(String scheduleId,String tiemStamp){
groupScheduleTools.getScheduleItemDetail(scheduleId);
String detailResult1 = dataApi.getApi_response();
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.chiefCoachId"), chiefCoachIdS);
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.minMemberNum"), "6");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.maxMemberNum"), "999");
Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.startTime"), tiemStamp);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.assistCoachIds").size() == 0, "助教修改后（置空）没生效");
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.venueAreaIds").containsAll(venueAreaIds), "场地无修改，但是却变动了");
}
@AfterTest(description = "删除此case创建的日程")
public void delData(){
List<String> ruleIdIds = new ArrayList<>();
//查询这个case创建的相关日程
JSONArray result = groupScheduleTools.getGroupRuleScheduleList(courseId, chiefCoachIdS);
int count = result.size();
if (count > 0) {//如果有数据，则获取对应日程ID
ruleIdIds = result.stream().map(obj -> {
JSONObject ruldIdInfo = (JSONObject) obj;
return ruldIdInfo.getString("ruleId");
}
).collect(Collectors.toList());
}
if (ruleIdIds != null) {//获取到的日程ID不为空时，则逐个删除相关日程
ruleIdIds.stream().forEach(ruleId -> {
//删除对应日程
groupScheduleTools.delGroupRuleSchedule(ruleId, true);
});
}
if (!scheduleIdsN.isEmpty()) {
scheduleIdsN.stream().forEach(scheduleId -> {
//删除case1中编辑独立出去的课次
groupScheduleTools.delGroupScheduleItem(scheduleId);
});
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/schedule/group/TestEditGroupRuleSchedule.java
......@@ -83,10 +83,12 @@ public class TestEditGroupRuleSchedule extends BaseTestImpl {
body.put("assistCoachIds", new ArrayList<>()); //有数据AB改成空
body.put("ruleId", ruldId);
body.put("spanMinutes", 50);
body.put("endDate", CommUtil.getNDayEndTimeTamp(0)); //结束日期缩短了，改成当天结束
body.put("endDate", todayEndDateTimeTamp); //结束日期缩短了，改成当天结束
body.put("force", false);
body.put("retainBooking", true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//4-查看日程详情，check修改内容是否同步变更
groupScheduleTools.getGroupRuleScheduleDetail(ruldId);
......
src/main/java/com/xiaomai/cases/polar/schedule/group/TestGetGroupScheduleTable.java
......@@ -126,7 +126,9 @@ public class TestGetGroupScheduleTable extends BaseTestImpl {
body.put("coachId", coachId);
body.put("venueAreaId", venueAreaId);
body.put("statusSet", statusSet);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
int resultCount=Integer.parseInt(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.result.totalCount"));
Assert.assertTrue(resultCount>=totalCount,"查询到的课表数据和预期不一致");
......
src/main/java/com/xiaomai/cases/polar/setting/rules/RuleTools.java
......@@ -116,20 +116,47 @@ public class RuleTools extends XMBaseTest {
* 获取训练营签到规则
* @return
*/
public JSONObject getCampBookingRules(){
public JSONObject getCampBookingRules(DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_getCampBookingRules")
.setTerminal(Terminal.B);
super.beforeDataRequest();
super.beforeDataRequest(dataUserInfos);
JSONObject body= new JSONObject();
body.put("brandId",dataApi.getLoginInfo().getBrandId());
body.put("studioId",dataApi.getLoginInfo().getStudioId());
body.put("operatorId",dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result");
}
/**
* @description:保存训练营签到规则
* @author: xuyamei
* @date: 2024/8/1 10:16
* @param id
* @param xcxAutoSignIn
* @param scanSignIn
* @param signInBeforeMinutes
* @return: void
**/
public void saveCampBookingRules(String id,boolean xcxAutoSignIn,boolean scanSignIn,int signInBeforeMinutes,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_saveCampBookingRules")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", id);
body.put("xcxAutoSignIn", xcxAutoSignIn);
body.put("scanSignIn", scanSignIn);
body.put("signInBeforeMinutes",signInBeforeMinutes);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
}
}
src/main/java/com/xiaomai/cases/polar/training/TestDoForceOpenTraining.java
......@@ -5,6 +5,7 @@ import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
......@@ -13,6 +14,8 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 对报名中的活动操作立即成营
......@@ -38,10 +41,10 @@ public class TestDoForceOpenTraining extends BaseCreateTrainingData {
public void testForceOpenTraining() throws InterruptedException {
//1.创建训练营活动：保存并发布
id = trainingTools.createThenPublishTraining(String.valueOf(currentTimestamp + 30000), applyEndTime, courseId, openStartDate,
id = trainingTools.createThenPublishTraining(CommUtil.getTodayGoalTime(20), applyEndTime, courseId, openStartDate,
openEndDate, 0.01, trainingTitle, 2, 1, trainerListIdS, "YES");
if (id.isEmpty()) {
id = trainingTools.createThenPublishTraining(String.valueOf(currentTimestamp + 30000), applyEndTime, courseId, openStartDate,
id = trainingTools.createThenPublishTraining(CommUtil.getTodayGoalTime(20), applyEndTime, courseId, openStartDate,
openEndDate, 0.01, trainingTitle + RandomStringUtil.randomString(3), 2, 1, trainerListIdS, "YES");
}
//2.查看活动详情，check 活动状态
......@@ -51,9 +54,9 @@ public class TestDoForceOpenTraining extends BaseCreateTrainingData {
if (status.equals("APPLY_NOT_START")) {
//对报名未开始的活动操作立即成营
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("id", id);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"), "只有报名中的训练营能【立即成营】");
......@@ -66,14 +69,27 @@ public class TestDoForceOpenTraining extends BaseCreateTrainingData {
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() > 0, "活动创建后，根据活动名称全局搜索没有数据");
Thread.sleep(20000);//延迟20秒后，活动达到报名时间（可能状态没同步，定时任务没到时间执行，但是数据库中已是报名中）
//4.对报名中的活动操作立即成营
JSONObject body1 = new JSONObject();
body1.put("operatorId", dataApi.getLoginInfo().getAdminId());
body1.put("studioId", dataApi.getLoginInfo().getStudioId());
body1.put("brandId", dataApi.getLoginInfo().getBrandId());
body1.put("id", id);
xmAppApi.doRequest(RequestType.JSON, params, body1.toString(), headers).assetsSuccess(true);
//搜索列表中有没有报名中APPLYING的训练营，如果有，就操作立即成营
List<String> statuApplying = new ArrayList<>();
statuApplying.add("APPLYING");//报名中
trainingTools.searchTrainingList("","",statuApplying);
String goalId="";
int goalN= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result.records").size();
if(goalN>0){
goalId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].id");
JSONObject body1 = new JSONObject();
body1.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body1.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body1.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body1.put("id", goalId);
xmAppApi.doRequest(RequestType.JSON, params, body1.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
}
}
......
src/main/java/com/xiaomai/cases/polar/training/TestDoSignCampOrder.java
......@@ -31,11 +31,7 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo {
TrainingTools trainingTools;
@Resource(name = "tools")
Tools tools;
@Resource(name = "orderTools")
OrderTools orderTools;
String memberId = "";
String memberId2 = "";
String orderId = "";
@BeforeClass
@Override
......@@ -52,8 +48,9 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo {
if (memberId.isEmpty()) {
memberId = tools.create("阿杜", phone).getString("result");
}
//给会员报名
trainingTools.doSignCampOrder(memberId, this.price, this.campId);
//给会员报名，报名前先等待3秒，防止上一个case中有创建订单的接口，这样不会报错（创建订单接口做了3秒的重复调用限制）
Thread.sleep(3000);
trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
Thread.sleep(1000);
//报名成功后根据会员手机号，在报名会员列表搜索报名数据
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
......@@ -82,7 +79,7 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo {
//退单后再搜索报名记录check
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "给学员退单后，在报名列表中还能查询到数据");
Thread.sleep(1000);
Thread.sleep(2000);
//退单后check训练营报名记录(入口：报名记录)：根据训练营，报名记录状态，来源
List<String> cardState=new ArrayList<>();
......@@ -123,47 +120,6 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo {
Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"), "签单失败，已报名该训练营无需重复操作");
}
@Test(description = "给学员报名训练营活动构造待支付订单",priority = 1)
public void testUnpaidOrder() throws InterruptedException {
//搜索目标会员
String phone = "15658063769";
memberId2 = trainingTools.searchTargerMember(phone);
if (memberId2.isEmpty()) {
memberId2 = tools.create("晨晨爸爸", phone).getString("result");
}
Thread.sleep(3000);
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("salesmanId", xmAppApi.getLoginInfo().getAdminId());
body.put("operationTime", TimeUtils.getCurrentTime());
body.put("objectId", RandomStringUtil.randomString(20));
body.put("memberId", memberId2);
body.put("receivableAmount", this.price);
JSONObject campInfo = new JSONObject();
campInfo.put("campId", this.campId);
body.put("camp", campInfo);
body.put("paymentWays", new JSONArray());//支付方式传空
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
orderId = XMJSONPath.readPath(xmAppApi.getApi_response(), "$.result");
//报名成功后根据会员手机号，在报名会员列表搜索报名数据
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 1, "给学员报名后，在报名列表没查询到数据");
//check订单 待支付状态
Assert.assertEquals(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("state"), "WAITING");
//操作取消订单
orderTools.cancel(orderId);
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "取消学员订单后，在报名列表中还能查询到数据");
}
@AfterTest(description = "删除此case创建的训练营活动-退单/取消订单后可以删除活动")
public void delData() {
......
src/main/java/com/xiaomai/cases/polar/training/TestEditTraining.java → src/main/java/com/xiaomai/cases/polar/training/TestEditNoPublishTraining.java
......@@ -13,9 +13,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 编辑训练营活动
......@@ -26,11 +23,10 @@ import java.util.stream.Collectors;
* data 2024/7/3 20:51
*/
public class TestEditTraining extends BaseCreateTrainingData {
public class TestEditNoPublishTraining extends BaseCreateTrainingData {
@Resource(name = "trainingTools")
TrainingTools trainingTools;
String trainingId = "";
String oneKeytTrainingId = "";
@BeforeClass
@Override
......@@ -40,7 +36,7 @@ public class TestEditTraining extends BaseCreateTrainingData {
}
@Test(description = "测试编辑未发布的训练营活动")
public void testEditTraining() {
public void testEditNoPublishTraining() {
//1创建未发布的训练营活动
String title = "杭州减肥训练营-未发布" + RandomStringUtil.randomString(3);
trainingId = trainingTools.createTrainingNoPublish(title, courseId, trainerListIdS);
......@@ -86,64 +82,7 @@ public class TestEditTraining extends BaseCreateTrainingData {
}
@Test(description = "编辑已发布训练营活动",priority = 1)
public void editPublishTraining() throws InterruptedException {
//1.查询关联对应课程的活动数据
trainingTools.searchTrainingList(courseId, "",new ArrayList<>());
int listCountBefore = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
//2.创建已发布的训练营活动
oneKeytTrainingId = trainingTools.oneKeyCreateTraining(courseId, trainerListIdS);
Thread.sleep(2000);
//3.列表搜索数据check
trainingTools.searchTrainingList(courseId,"", new ArrayList<>());
int listCountAfter = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
Assert.assertEquals(listCountAfter, (listCountBefore + 1), "训练营活动创建成功列表数据没增加");
/* List<JSONObject> list=XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream()
.filter(object -> object.getString("id").equals(oneKeytTrainingId)).collect(Collectors.toList()); */
JSONObject goalObject = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream()
.filter(object -> object.getString("id").equals(oneKeytTrainingId)).findFirst().orElse(null);//返回第一个对象，没有就返回空
if(goalObject!=null){
String title=goalObject.getString("title");
String applyEndTime=goalObject.getString("applyEndTime");
String applyStartTime=goalObject.getString("applyStartTime");
String openStartDate=goalObject.getString("openStartDate");
String openEndDate=goalObject.getString("openEndDate");
//4.编辑已发布的活动（训练营名称，关联课程，开营时间，总课次数，售价，报名开始时间，报名结束时间不能修改）check不能修改的传值后也不会改变
JSONObject editBody = new JSONObject();
editBody.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
editBody.put("studioId", xmAppApi.getLoginInfo().getStudioId()); // 场馆
editBody.put("brandId", xmAppApi.getLoginInfo().getBrandId());
editBody.put("applyEndTime", applyEndTime);//报名结束时间
editBody.put("applyStartTime",applyStartTime );//报名开始时间
editBody.put("courseId", courseId); //关联课程ID
editBody.put("creatorId", xmAppApi.getLoginInfo().getAdminId()); // 创建人即操作者
editBody.put("openEndDate", openEndDate); //开营结束时间
editBody.put("openStartDate", openStartDate); //开营开始时间
editBody.put("price", 10); //售卖价格
editBody.put("surfaceUrl", "https://xiaomai-res.oss-cn-hangzhou.aliyuncs.com/xmfit/course_cover/training_camp_0.png"); // 默认活动封面图
editBody.put("title","title" );//名称不能修改，这里故意修改了，等保存后check数据
editBody.put("totalClassHour", 20); // 总课时数，不能修改，这里故意修改了，等保存后check数据
editBody.put("traineeLowerLimit", 1); // 开营人数
editBody.put("traineeUpperLimit", 99); // 人数上限
editBody.put("trainerList", trainerListIdS); // 上课教练
editBody.put("xcxSaleStatus", "YES"); //开启小程序售卖
editBody.put("underlinePrice", 29.9);//可以修改
editBody.put("id",oneKeytTrainingId); //活动ID
xmAppApi.doRequest(RequestType.JSON, params, editBody.toString(), headers).assetsSuccess(true);
//5.查看活动详情，check 不能修改项和一修改项是否被同步修改
trainingTools.findTrainingDetailById(oneKeytTrainingId);
//5.1不能修改的字段check（修改后和修改前比对）
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.title"),title);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.totalClassHour"),"2");
Assert.assertEquals(Double.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.price")), 0.00);
//5.2可以修改字段check是否被同步修改
Assert.assertEquals(Double.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.underlinePrice")), 29.90);
}
}
@AfterTest(description = "删除此case创建的训练营")
......@@ -151,9 +90,6 @@ public class TestEditTraining extends BaseCreateTrainingData {
if (!trainingId.isEmpty()) {
trainingTools.deleteTraining(trainingId);
}
if (!oneKeytTrainingId.isEmpty()) {
trainingTools.deleteTraining(oneKeytTrainingId);
}
}
......
src/main/java/com/xiaomai/cases/polar/training/TestEditPublishTraining.java 0 → 100644
package com.xiaomai.cases.polar.training;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.util.ArrayList;
/**
* @author adu
* data 2024/8/1 09:45
*/
public class TestEditPublishTraining extends BaseCreateTrainingData{
@Resource(name = "trainingTools")
TrainingTools trainingTools;
String oneKeytTrainingId = "";
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Training, "API_editTraining", LoginAccount.ADU_PROD, Terminal.B, "adu");
super.beforeTest();
}
@Test(description = "编辑已发布训练营活动")
public void editPublishTraining() throws InterruptedException {
//1.查询关联对应课程的活动数据
trainingTools.searchTrainingList(courseId, "", new ArrayList<>());
int listCountBefore = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
//2.创建已发布的训练营活动,报名开始时间晚于当前时间半小时
oneKeytTrainingId = trainingTools.oneKeyCreateTraining(courseId, trainerListIdS, CommUtil.getTodayGoalTime(30));
Thread.sleep(2000);
//3.列表搜索数据check
trainingTools.searchTrainingList(courseId, "", new ArrayList<>());
Long list = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream()
.filter(object -> object.getString("id").equals(oneKeytTrainingId)).count();
Assert.assertTrue(list == 1, "训练营活动创建成功列表数据没增加");
JSONObject goalObject = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").toJavaList(JSONObject.class).stream()
.filter(object -> object.getString("id").equals(oneKeytTrainingId)).findFirst().orElse(null);//返回第一个对象，没有就返回空
if (goalObject != null) {
String title = goalObject.getString("title");
String applyEndTime = goalObject.getString("applyEndTime");
String applyStartTime = goalObject.getString("applyStartTime");
String openStartDate = goalObject.getString("openStartDate");
String openEndDate = goalObject.getString("openEndDate");
//4.编辑已发布的活动（训练营名称，关联课程，开营时间，总课次数，售价，报名开始时间，报名结束时间不能修改）check不能修改的传值后也不会改变
JSONObject editBody = new JSONObject();
editBody.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
editBody.put("studioId", xmAppApi.getLoginInfo().getStudioId()); // 场馆
editBody.put("brandId", xmAppApi.getLoginInfo().getBrandId());
editBody.put("applyEndTime", applyEndTime);//报名结束时间
editBody.put("applyStartTime", applyStartTime);//报名开始时间
editBody.put("courseId", courseId); //关联课程ID
editBody.put("creatorId", xmAppApi.getLoginInfo().getAdminId()); // 创建人即操作者
editBody.put("openEndDate", openEndDate); //开营结束时间
editBody.put("openStartDate", openStartDate); //开营开始时间
editBody.put("price", 10); //售卖价格
editBody.put("surfaceUrl", "https://xiaomai-res.oss-cn-hangzhou.aliyuncs.com/xmfit/course_cover/training_camp_0.png"); // 默认活动封面图
editBody.put("title", "title");//名称不能修改，这里故意修改了，等保存后check数据
editBody.put("totalClassHour", 20); // 总课时数，不能修改，这里故意修改了，等保存后check数据
editBody.put("traineeLowerLimit", 1); // 开营人数
editBody.put("traineeUpperLimit", 99); // 人数上限
editBody.put("trainerList", trainerListIdS); // 上课教练
editBody.put("xcxSaleStatus", "YES"); //开启小程序售卖
editBody.put("underlinePrice", 29.9);//可以修改
editBody.put("id", oneKeytTrainingId); //活动ID
xmAppApi.doRequest(RequestType.JSON, params, editBody.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//5.查看活动详情，check 不能修改项和一修改项是否被同步修改
trainingTools.findTrainingDetailById(oneKeytTrainingId);
//5.1不能修改的字段check（修改后和修改前比对）
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.title"), title);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.totalClassHour"), "2");
Assert.assertEquals(Double.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.price")), 0.00);
//5.2可以修改字段check是否被同步修改
Assert.assertEquals(Double.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.underlinePrice")), 29.90);
}
}
@AfterTest(description = "删除此case创建的训练营")
public void delData() {
if (!oneKeytTrainingId.isEmpty()) {
trainingTools.deleteTraining(oneKeytTrainingId);
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/training/TestSearchTrainingAccountRecordsList.java
......@@ -46,7 +46,7 @@ public class TestSearchTrainingAccountRecordsList extends SelectTargetTrainingCa
memberId = tools.create("自动化报名训练营的潜在学员", phone).getString("result");
}
//给会员报名
trainingTools.doSignCampOrder(memberId, this.price, this.campId);
trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
orderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
}
......@@ -99,7 +99,9 @@ public class TestSearchTrainingAccountRecordsList extends SelectTargetTrainingCa
}
body.put("memberCardStateList", memberCardState);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//有存量数据，理论上每个查询都会至少有1条数据
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(xmAppApi.getApi_response(), "$.result.records").size() >= flag, "没有搜索到相关数据");
......
src/main/java/com/xiaomai/cases/polar/training/TestSearchTrainingList.java
......@@ -86,7 +86,9 @@ public class TestSearchTrainingList extends BaseCreateTrainingData {
body.put("courseId", courseId);
body.put("stateList", stateList);
body.put("title", title);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
//有存量数据，理论上每个查询都会至少有1条数据
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(xmAppApi.getApi_response(),"$.result.records").size()>=1,"没有搜索到相关数据");
......
src/main/java/com/xiaomai/cases/polar/training/TestSignWaitingCampOrder.java
......@@ -85,7 +85,7 @@ public class TestSignWaitingCampOrder extends SelectTargetTrainingCampAndGetInfo
Thread.sleep(3000);
//再次报名该训练营活动-报名成功
trainingTools.doSignCampOrder(memberId, this.price, this.campId);
trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
String orderId1 = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
//报名成功后根据会员手机号，在报名会员列表搜索报名数据
......@@ -98,7 +98,7 @@ public class TestSignWaitingCampOrder extends SelectTargetTrainingCampAndGetInfo
//订单作废后，学员还能继续报名check
Thread.sleep(3000);
trainingTools.doSignCampOrder(memberId, this.price, this.campId);
trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
String orderId2 = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
//继续作废订单，然后删除训练营活动
......
src/main/java/com/xiaomai/cases/polar/training/TestUnpaidCampOrder.java 0 → 100644
package com.xiaomai.cases.polar.training;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.schedule.camp.SelectTargetTrainingCampAndGetInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @author adu
* data 2024/8/1 13:55
*/
public class TestUnpaidCampOrder extends SelectTargetTrainingCampAndGetInfo {
@Resource(name = "trainingTools")
TrainingTools trainingTools;
@Resource(name = "tools")
Tools tools;
@Resource(name = "orderTools")
OrderTools orderTools;
String memberId2 = "";
String orderId = "";
@BeforeClass
@Override
public void beforeTest() {
setTestInfo(ApiModule.Polar_Training, "API_signOrderCamp", LoginAccount.ADU_PROD, Terminal.B, "adu");
super.beforeTest();
}
@Test(description = "给学员报名训练营活动构造待支付订单")
public void testUnpaidOrder() throws InterruptedException {
//搜索目标会员
String phone = "15658063769";
memberId2 = trainingTools.searchTargerMember(phone);
if (memberId2.isEmpty()) {
memberId2 = tools.create("晨晨爸爸", phone).getString("result");
}
//报名接口做了重复调用限制，间隔3000秒，否则提示：调用过于频繁，请稍后重试
Thread.sleep(3000);
JSONObject body = new JSONObject();
body.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("salesmanId", xmAppApi.getLoginInfo().getAdminId());
body.put("operationTime", TimeUtils.getCurrentTime());
body.put("objectId", RandomStringUtil.randomString(20));
body.put("memberId", memberId2);
body.put("receivableAmount", this.price);
JSONObject campInfo = new JSONObject();
campInfo.put("campId", this.campId);
body.put("camp", campInfo);
body.put("paymentWays", new JSONArray());//支付方式传空
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(xmAppApi.getApi_response(),"$.message"));
orderId = XMJSONPath.readPath(xmAppApi.getApi_response(), "$.result");
//报名成功后根据会员手机号，在报名会员列表搜索报名数据
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 1, "给学员报名后，在报名列表没查询到数据");
//check订单 待支付状态
Assert.assertEquals(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").getJSONObject(0).getString("state"), "WAITING");
//操作取消订单
orderTools.cancel(orderId);
trainingTools.getTrainingApplyRecordsList(this.campId, phone);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size() == 0, "取消学员订单后，在报名列表中还能查询到数据");
}
@AfterTest(description = "删除此case创建的训练营活动-退单/取消订单后可以删除活动")
public void delData() {
if (!this.campId.isEmpty()) {
trainingTools.deleteTraining(this.campId);
}
}
}
\ No newline at end of file
src/main/java/com/xiaomai/cases/polar/training/TrainingTools.java
......@@ -9,6 +9,7 @@ import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.*;
import org.springframework.stereotype.Component;
import org.testng.Assert;
import org.testng.Reporter;
import java.util.List;
......@@ -87,20 +88,20 @@ public class TrainingTools extends XMBaseTest {
if (XMJSONPath.readPath(dataApi.getApi_response(), "$.message").equals("训练营名称不能重复")) {
return "";
}
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.success"), "true");
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
return XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
}
/**
* 引用时可以继承 BaseCreateTrainingData 这个类，然后直接传值就可以
* 价格0元，一键创建已发布且报名中的训练营活动
*
* @param courseId 需要传入课程ID
* @param trainerList 需要传入教练
* @param applyStartTime 报名开始时间，要早于第二天的0点，最好是晚于当前时间半个小时
* @param courseId 需要传入课程ID
* @param trainerList 需要传入教练
* @return 活动ID
*/
public String oneKeyCreateTraining(String courseId, List<String> trainerList) {
public String oneKeyCreateTraining(String courseId, List<String> trainerList, String applyStartTime) {
setUP("API_createThenPublishTraining");
String courseName = "训练营课程-感统课";
String trainingTitle = "三期36天训练营感统课" + RandomStringUtil.randomString(5);
......@@ -109,7 +110,7 @@ public class TrainingTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId()); // 场馆
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("applyEndTime", applyEndTime1);//报名结束时间
body.put("applyStartTime", futureTimestampS);//报名开始时间，晚于当前时间10分钟
body.put("applyStartTime", applyStartTime);//报名开始时间
body.put("courseId", courseId); //关联课程ID
body.put("creatorId", dataApi.getLoginInfo().getAdminId()); // 创建人即操作者
body.put("openEndDate", openEndDate0); //开营结束时间
......@@ -124,12 +125,14 @@ public class TrainingTools extends XMBaseTest {
body.put("xcxSaleStatus", "YES"); //开启小程序售卖
body.put("underlinePrice", 19.9); //划线价
//图文介绍不设置，所以回归时check下 图文介绍
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
return XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
}
/**
* 提供训练营活动名称，课程ID和教练ID 快速创建未发布的活动
*
......@@ -164,7 +167,8 @@ public class TrainingTools extends XMBaseTest {
body.put("xcxSaleStatus", "YES"); //开启小程序售卖
body.put("underlinePrice", 99999.99); //划线价
//图文介绍不设置，所以回归时check下 图文介绍
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
return XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
}
......@@ -180,11 +184,14 @@ public class TrainingTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", id);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
* 训练营活动有报名订单时操作删除时会删除失败，就用这个方法
*
* @param id
*/
public void delTrainingFail(String id) {
......@@ -209,7 +216,9 @@ public class TrainingTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("title", title);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
......@@ -240,7 +249,9 @@ public class TrainingTools extends XMBaseTest {
body.put("title", trainingName);
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
......@@ -256,7 +267,8 @@ public class TrainingTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("title", title);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
return Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result"));
}
......@@ -272,84 +284,100 @@ public class TrainingTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id", id);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.success"))==true,"调用接口返回结果："+XMJSONPath.readPath(dataApi.getApi_response(),"$.message"));
}
/**
* 训练营详情：查看 报名会员
*
* @param trainingCampId 训练营ID
* @param content 根据手机号/会员姓名搜索
* @param content 根据手机号/会员姓名搜索
*/
public void getTrainingApplyRecordsList(String trainingCampId,String content){
public void getTrainingApplyRecordsList(String trainingCampId, String content) {
setUP("API_getTrainingApplyRecordsList");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("trainingCampId", trainingCampId);
if (null!=content||!content.isEmpty()){
body.put("content", content);
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
if (null != content || !content.isEmpty()) {
body.put("content", content);
}
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
* B 端操作：在训练营活动详情-报名学员-给学员报名
* @param memberId 会员ID
*
* @param memberId 会员ID
* @param receivableAmount 支付金额
* @param campId 训练营活动ID
* @param campId 训练营活动ID
* @param userCouponId 已发放给学员的优惠券记录ID
*/
public void doSignCampOrder(String memberId,Double receivableAmount,String campId){
public void doSignCampOrder(String memberId, Double receivableAmount, String campId, String userCouponId) {
setUP("API_signOrderCamp");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
if (userCouponId != null || !userCouponId.isEmpty()) {
body.put("userCouponId", userCouponId);
}
body.put("salesmanId",dataApi.getLoginInfo().getAdminId());
body.put("salesmanId", dataApi.getLoginInfo().getAdminId());
body.put("operationTime", TimeUtils.getCurrentTime());
body.put("objectId", RandomStringUtil.randomString(20));
body.put("memberId", memberId);
body.put("receivableAmount", receivableAmount);
JSONObject campInfo = new JSONObject();
campInfo.put("campId",campId);
body.put("camp",campInfo);
JSONArray paymentWays=new JSONArray();
JSONObject payObject=new JSONObject();
payObject.put("amount",receivableAmount);
payObject.put("paymentWay","1");
payObject.put("voucherResourceIds",new JSONArray());
campInfo.put("campId", campId);
body.put("camp", campInfo);
JSONArray paymentWays = new JSONArray();
JSONObject payObject = new JSONObject();
payObject.put("amount", receivableAmount);
payObject.put("paymentWay", "1");
payObject.put("voucherResourceIds", new JSONArray());
paymentWays.add(payObject);
body.put("paymentWays",paymentWays);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
body.put("paymentWays", paymentWays);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Reporter.log(XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
*查看训练营活动-报名会员-报名详情
* 查看训练营活动-报名会员-报名详情
*
* @param trainingAccountId 即memberCardId，从查看报名会员列表返回数据中获取对应学员的报名数据（memberCardId）
*/
public void getTrainingAccountDetailById(String trainingAccountId){
public void getTrainingAccountDetailById(String trainingAccountId) {
setUP("API_getTrainingAccountDetailById");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("id",trainingAccountId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
body.put("id", trainingAccountId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
* 退单训练营活动报名详情-退款
* @param memberId 会员ID
*
* @param memberId 会员ID
* @param refundAmount 退出金额
* @param memberCampId 会员的训练营账户ID
* @param quantity 退出购买数量
* @param quantity 退出购买数量
*/
public void refundCampOrder(String memberId,Double refundAmount,String memberCampId,int quantity){
public void refundCampOrder(String memberId, Double refundAmount, String memberCampId, int quantity) {
setUP("API_refundCampOrder");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
......@@ -360,31 +388,34 @@ public class TrainingTools extends XMBaseTest {
body.put("objectId", RandomStringUtil.randomString(20));
body.put("memberId", memberId);
body.put("receivableAmount", refundAmount);
//退单内容
//退单内容
JSONObject campInfo = new JSONObject();
campInfo.put("memberCampId",memberCampId);
campInfo.put("giftQuantity",0);
campInfo.put("quantity",quantity);
campInfo.put("refundAmount",refundAmount);
body.put("camp",campInfo);
campInfo.put("memberCampId", memberCampId);
campInfo.put("giftQuantity", 0);
campInfo.put("quantity", quantity);
campInfo.put("refundAmount", refundAmount);
body.put("camp", campInfo);
//结算方式
JSONArray paymentWays=new JSONArray();
JSONObject payObject=new JSONObject();
payObject.put("amount",refundAmount);
payObject.put("paymentWay","1");
payObject.put("voucherResourceIds",new JSONArray());
JSONArray paymentWays = new JSONArray();
JSONObject payObject = new JSONObject();
payObject.put("amount", refundAmount);
payObject.put("paymentWay", "1");
payObject.put("voucherResourceIds", new JSONArray());
paymentWays.add(payObject);
body.put("paymentWays",paymentWays);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
body.put("paymentWays", paymentWays);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
* 根据会员姓名/手机号搜索会员
*
* @param content 手机号/姓名
* @return 返回搜索的的目标数据第一条的会员ID
*/
public String searchTargerMember(String content){
public String searchTargerMember(String content) {
dataApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_searchMember")
.setTerminal(Terminal.B);
......@@ -393,14 +424,15 @@ public class TrainingTools extends XMBaseTest {
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("content",content);
body.put("searchType","COMMON");
body.put("current",0);
body.put("size",20);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
int tatal= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result.records").size();
if(tatal>0){
return XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result.records").getJSONObject(0).getString("id");
body.put("content", content);
body.put("searchType", "COMMON");
body.put("current", 0);
body.put("size", 20);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
int tatal = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
if (tatal > 0) {
return XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").getJSONObject(0).getString("id");
}
return "";
......@@ -408,11 +440,12 @@ public class TrainingTools extends XMBaseTest {
/**
* 查看训练营报名记录
* @param tenantMemberCardId 训练营对应ID
* @param purchaseChannel 来源即购买渠道 ：线下办理（B_OFF_LINE） 和 上线购买（C_ON_LINE），线上购买的case要等小程序买了之后check
*
* @param tenantMemberCardId 训练营对应ID
* @param purchaseChannel 来源即购买渠道 ：线下办理（B_OFF_LINE） 和 上线购买（C_ON_LINE），线上购买的case要等小程序买了之后check
* @param memberCardStateList 报名记录状态：生效中["NORMAL"]，已结束 ["EXPIRED"]，已用尽["USED_UP"]，已退费["REFUNDED"]，已作废["DISCARD"]
*/
public void searchTrainingAccountRecordsList(String tenantMemberCardId,String purchaseChannel,List<String> memberCardStateList){
public void searchTrainingAccountRecordsList(String tenantMemberCardId, String purchaseChannel, List<String> memberCardStateList) {
setUP("API_searchTrainingAccountRecordsList");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
......@@ -427,16 +460,19 @@ public class TrainingTools extends XMBaseTest {
if (!purchaseChannel.isEmpty()) {
body.put("purchaseChannel", purchaseChannel);
}
body.put("memberCardStateList",memberCardStateList);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
body.put("memberCardStateList", memberCardStateList);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
/**
* 训练营报名记录页面中 -全局搜索（根据学员手机号/姓名）-点击目标学员-进入学员购买的训练营相关记录
*
* @param memberId 会员ID
*/
public void fetchUserTrainingCardList(String memberId){
public void fetchUserTrainingCardList(String memberId) {
setUP("API_getMemberTrainingCardRecords");
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
......@@ -446,10 +482,11 @@ public class TrainingTools extends XMBaseTest {
body.put("current", 0);
body.put("size", 20);
body.put("memberId", memberId);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
}
}
}
......
src/main/java/com/xiaomai/enums/ApiModule.java
......@@ -33,6 +33,7 @@ public class ApiModule {
public static String Polar_Data ="polar_data";//数据中心
public static String Lunar_Order="lunar_order";//C端订单
public static String Lunar_Training="lunar_training";//C端订单
......
src/main/java/com/xiaomai/utils/CommUtil.java
......@@ -279,7 +279,7 @@ public class CommUtil {
}
/**
*
*获取指定时间的整点
* @param n 整数
* @param time 整点时间 比如13：00
* @return
......@@ -346,9 +346,20 @@ public class CommUtil {
return getStringTimestamp(getNextXWeekEndXDayDataS, "yyyy-MM-dd HH:mm:ss");
}
/**
* 晚于当前时间 多少分钟
* @param minutes 分钟
* @return
*/
public static String getTodayGoalTime(int minutes){
Date getNextXWeekStartDayData= new DateTime(now).plusMinutes(minutes).toDate();
String getNextXWeekStartXDayDataS = getFormatTimeStr(getNextXWeekStartDayData, "yyyy-MM-dd HH:mm:ss");//时间格式转化为string
return getStringTimestamp(getNextXWeekStartXDayDataS, "yyyy-MM-dd HH:mm:ss");
}
public static void main(String[] args) {
getWholeHourTimestamp();
/* getWholeHourTimestamp();
Date getWeekStartDayData = getStartOfDateWeek(now);//获取本周的第一天
Date getNextWeekXDayData=addNDays(getWeekStartDayData,9);
String getNextWeekXDayDataS = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData.getTime());
......@@ -372,7 +383,11 @@ public class CommUtil {
LocalDateTime future = now.plusSeconds(2);
System.out.println("未来2秒时间: " + future);
System.out.println("%%%%%"+getXEndOfDateNextXWeek(-1,2));
System.out.println("%%%%%"+getXEndOfDateNextXWeek(-1,2));*/
Date getNextXWeekStartDayData= new DateTime(now).plusMinutes(30).toDate();
String getNextXWeekStartXDayDataS = getFormatTimeStr(getNextXWeekStartDayData, "yyyy-MM-dd HH:mm:ss");//时间格式转化为string
System.out.println( "((((((("+getStringTimestamp(getNextXWeekStartXDayDataS, "yyyy-MM-dd HH:mm:ss"));
......
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