Skip to content

X
xm-sportstest
Commit d0ff59be by xuyamei
Options

1、增加配置 

2、更换账号
parent f3d2da9f
Showing with 224 additions and 54 deletions
module/lunar/C端约课.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="约课case"> <!-- 起一个好听且唯一的名字-->
<test name="约课模块测试" preserve-order="true" verbose="3"> <!-- 再起一个听且唯一的名字 -->
<packages>
<package name="com.xiaomai.cases.lunar.reserve.*"></package> <!-- 添加自己想要集成测试的case 范围自己定 -->
</packages>
</test>
<listeners>
<listener class-name="com.xiaomai.client.RetryListener" />
<listener class-name="com.xiaomai.client.TestListener" />
<listener class-name="com.xiaomai.client.ExtentTestNGIReporterListener"/>
</listeners>
</suite>
\ No newline at end of file
src/main/java/com/xiaomai/cases/lunar/reserve/TestMemberTimetable.java 0 → 100644
package com.xiaomai.cases.lunar.reserve;
import com.alibaba.fastjson.JSONObject;
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.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.reserve
* @Author: xuyamei
* @CreateTime: 2024-06-25 11:55
* @Description:
* @Version: 1.0
*/
public class TestMemberTimetable extends BaseTestImpl {
@Resource(name = "userTools")
UserTools userTools;
@BeforeClass
public void beforeTest(){
setTestInfo(ApiModule.Lunar_Reserve,"API_memberTimetable", LoginAccount.XYM_MINIAPPC, Terminal.minApp,"xym");
super.beforeTest();
}
@Test
public void testMemberTimetable() {
String memberId = userTools.getMemberInfo().getString("memberId");
JSONObject body = new JSONObject();
body.put("brandId", xmAppApi.getLoginInfo().getBrandId());
body.put("studioId", xmAppApi.getLoginInfo().getStudioId());
body.put("startDate", TimeUtils.getTodayTime());
body.put("endDate",TimeUtils.getTodayEndTime());
body.put("courseChooseEnum","ALL");
body.put("memberId",memberId);
xmAppApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
}
}
src/main/java/com/xiaomai/cases/lunar/user/UserTools.java 0 → 100644
package com.xiaomai.cases.lunar.user;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.XMBaseTest;
import org.springframework.stereotype.Component;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.lunar.reserve.user
* @Author: xuyamei
* @CreateTime: 2024-06-25 13:42
* @Description: TODO
* @Version: 1.0
*/
@Component("userTools")
public class UserTools extends XMBaseTest {
public void setUP(String apiName, DataUserInfo... userInfo) {
dataApi.setApiModule(ApiModule.Lunar_User)
.setApiName(apiName)
.setTerminal(Terminal.minApp);
super.beforeDataRequest(userInfo);
}
/**
* @description: 获取会员信息
* @author: xuyamei
* @date: 2024/6/25 13:50
* @param userInfo
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject getMemberInfo(DataUserInfo... userInfo) {
setUP("API_getMemberInfo", userInfo);
JSONObject body = new JSONObject();
body.put("userId",dataApi.getLoginInfo().getUser());
body.put("brandId",dataApi.getLoginInfo().getBrandId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getJSONObject("result");
}
}
src/main/java/com/xiaomai/cases/polar/course/CourseTools.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.course;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
......@@ -31,11 +32,11 @@ public class CourseTools extends XMBaseTest {
* @param minCapacity：开课人数
* @return: 课程id
**/
public String createPersonalCourse(String courseName,String categoryId,String sourceType,String sizeType,int capacity,int minCapacity){
public String createPersonalCourse(String courseName,String categoryId,String sourceType,String sizeType,int capacity,int minCapacity,DataUserInfo...dataUserInfo){
dataApi.setApiModule(ApiModule.Polar_Course)
.setApiName("API_personalCreate")
.setTerminal(Terminal.B);
super.beforeDataRequest();
super.beforeDataRequest(dataUserInfo);
JSONObject body= new JSONObject();
body.put("courseName", courseName);
......@@ -61,7 +62,7 @@ public class CourseTools extends XMBaseTest {
}
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getString("result");
}
/**
......@@ -73,11 +74,11 @@ public class CourseTools extends XMBaseTest {
* @param sourceType：课程来源类型 1：品牌BRAND 2：场馆STUDIO
* @return: java.lang.String
**/
public String createGroupCourse(String courseName,String categoryId,String sourceType){
public String createGroupCourse(String courseName,String categoryId,String sourceType,DataUserInfo...dataUserInfo){
dataApi.setApiModule(ApiModule.Polar_Course)
.setApiName("API_createGroupCourse")
.setTerminal(Terminal.B);
super.beforeDataRequest();
super.beforeDataRequest(dataUserInfo);
String introduction = "{\"items\":[{\"content\":\"花花世界的\",\"aspect\":\"\",\"type\":\"TEXT\"}]}";
JSONObject body= new JSONObject();
body.put("courseName", courseName);
......@@ -95,7 +96,7 @@ public class CourseTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId()); // 场馆
body.put("calorie", 0); // 卡路里 传0对于后端是未设置
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getString("result");
}
......@@ -112,25 +113,25 @@ public class CourseTools extends XMBaseTest {
* @param minCapacity:开课人数（团课无需传）
* @return: 返回课程id和姓名数组
**/
public JSONArray getPersonalOrGroupCourseId(String courseType,String courseName,String categoryId,String sourceType,String sizeType,int capacity,int minCapacity) {
public JSONArray getPersonalOrGroupCourseId(String courseType, String courseName, String categoryId, String sourceType, String sizeType, int capacity, int minCapacity, DataUserInfo...dataUserInfo) {
JSONObject result = new JSONObject();
JSONArray getNameAndId = new JSONArray();
// 查询存量的课程
if (courseType.equals("GROUP")) { // 查询的是团课
result = getGroupClassPage("", 0, courseName, "");
result = getGroupClassPage("", 0, courseName, "",dataUserInfo);
String total = result.getString("total");
if (Integer.parseInt(total) > 0) {
result = getGroupClassPage("", 0, courseName, "").getJSONArray("records").getJSONObject(0);
result = getGroupClassPage("", 0, courseName, "", dataUserInfo).getJSONArray("records").getJSONObject(0);
String courseId = result.getString("brandCourseId");
getNameAndId.add(courseId);
getNameAndId.add(result.getString("courseName"));
} else {
getNameAndId.add(createGroupCourse(courseName, categoryId, sourceType));
getNameAndId.add(createGroupCourse(courseName, categoryId, sourceType,dataUserInfo));
getNameAndId.add(courseName);
}
} else if (courseType.equals("PERSONAL")) { // 查询的是私教课
result = getPersonalPage("", 0, courseName, "", "", "");
result = getPersonalPage("", 0, courseName, "", "", "",dataUserInfo);
String total = result.getString("total");
if (Integer.parseInt(total) > 0) {
result = getPersonalPage("", 0, courseName, "", sizeType, "").getJSONArray("records").getJSONObject(0);
......@@ -138,7 +139,7 @@ public class CourseTools extends XMBaseTest {
getNameAndId.add(courseId);
getNameAndId.add(result.getString("courseName"));
} else {
getNameAndId.add(createPersonalCourse(courseName, categoryId, sourceType, sizeType, capacity, minCapacity));
getNameAndId.add(createPersonalCourse(courseName, categoryId, sourceType, sizeType, capacity, minCapacity,dataUserInfo));
getNameAndId.add(courseName);
}
}
......@@ -168,7 +169,7 @@ public class CourseTools extends XMBaseTest {
body.put("courseState",courseState);
body.put("checkOnly",checkOnly); // 是否只校验
body.put("brandId", dataApi.getLoginInfo().getBrandId());
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").getString("resultCode");
}
......@@ -191,7 +192,7 @@ public class CourseTools extends XMBaseTest {
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
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");
}
......@@ -205,11 +206,11 @@ public class CourseTools extends XMBaseTest {
* @param categoryId：课程分类id
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject getGroupClassPage(String courseState,int current,String courseNameLike,String categoryId){
public JSONObject getGroupClassPage(String courseState,int current,String courseNameLike,String categoryId,DataUserInfo...dataUserInfo){
dataApi.setApiModule(ApiModule.Polar_Course)
.setApiName("API_getGroupClassPage")
.setTerminal(Terminal.B);
super.beforeDataRequest();
super.beforeDataRequest(dataUserInfo);
JSONObject body= new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
......@@ -226,7 +227,7 @@ public class CourseTools extends XMBaseTest {
categoryIds.add(categoryId);
body.put("categoryIds",categoryIds);
}
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");
}
......@@ -242,11 +243,11 @@ public class CourseTools extends XMBaseTest {
* @param coachId：教练id
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject getPersonalPage(String courseState,int current,String courseNameLike,String categoryId,String sizeType,String coachId){
public JSONObject getPersonalPage(String courseState,int current,String courseNameLike,String categoryId,String sizeType,String coachId,DataUserInfo...dataUserInfo){
dataApi.setApiModule(ApiModule.Polar_Course)
.setApiName("API_getPersonalPage")
.setTerminal(Terminal.B);
super.beforeDataRequest();
super.beforeDataRequest(dataUserInfo);
JSONObject body= new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
......@@ -269,7 +270,7 @@ public class CourseTools extends XMBaseTest {
if(!coachId.equals("")){
body.put("coachId",coachId);
}
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");
}
......@@ -292,7 +293,7 @@ public class CourseTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("courseName",courseName);
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON().getBoolean("result");
}
......
src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java
......@@ -336,7 +336,7 @@ public class OrderTools extends XMBaseTest {
super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject=new JSONObject();
jsonObject.put("salesmanId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("salesmanId",dataApi.getLoginInfo().getAdminId());
jsonObject.put("operationTime", TimeUtils.getCurrentTime());
JSONObject card=new JSONObject();
......@@ -355,10 +355,10 @@ public class OrderTools extends XMBaseTest {
jsonObject.put("objectId", RandomStringUtil.randomString(20));
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("studioId",dataApi.getLoginInfo().getStudioId());
jsonObject.put("memberId",memberId);
jsonObject.put("receivableAmount",receivableAmount);
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("operatorId",dataApi.getLoginInfo().getAdminId());
JSONArray paymentWays=new JSONArray();
......@@ -371,7 +371,7 @@ public class OrderTools extends XMBaseTest {
paymentWays.add(object);
jsonObject.put("paymentWays",paymentWays);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON();
......
src/main/java/com/xiaomai/cases/polar/reserve/ReserveTools.java
......@@ -63,7 +63,7 @@ public class ReserveTools extends XMBaseTest {
body.put("reserveMemberNum", reserveMemberNum); // 预约人数
body.put("scheduleId", scheduleId); // 课次id
body.put("scheduleStartTime", scheduleStartTime); // 课次id
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(success);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(success);
if (success){
return dataApi.getBodyInJSON().getJSONObject("result").getString("reserveId");
}
......@@ -122,7 +122,7 @@ public class ReserveTools extends XMBaseTest {
body.put("operatorId", dataApi.getLoginInfo().getAdminId()); // 操作人id
body.put("studioId", dataApi.getLoginInfo().getStudioId());
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").getJSONArray("records");
}
......@@ -175,7 +175,7 @@ public class ReserveTools extends XMBaseTest {
body.put("operatorId", dataApi.getLoginInfo().getAdminId()); // 操作人id
body.put("studioId", dataApi.getLoginInfo().getStudioId());
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").getJSONArray("records");
}
......@@ -199,7 +199,7 @@ public class ReserveTools extends XMBaseTest {
body.put("operatorId", dataApi.getLoginInfo().getAdminId()); // 操作人id
body.put("studioId", dataApi.getLoginInfo().getStudioId());
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");
}
......@@ -225,7 +225,7 @@ public class ReserveTools extends XMBaseTest {
body.put("operatorId", dataApi.getLoginInfo().getAdminId()); // 操作人id
body.put("studioId", dataApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(success);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(success);
}
......@@ -271,7 +271,7 @@ public class ReserveTools extends XMBaseTest {
body.put("reserveMemberNum", reserveMemberNum); // 预约人数
body.put("scheduleId", scheduleId); // 课次id
body.put("scheduleStartTime", scheduleStartTime); // 课次id
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(success);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(success);
if (success){
return dataApi.getBodyInJSON().getJSONObject("result").getString("reserveId");
}
......@@ -299,7 +299,7 @@ public class ReserveTools extends XMBaseTest {
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("leave",leave);
body.put("reserveId",reserveId);
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(success);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(success);
}
......
src/main/java/com/xiaomai/cases/polar/reserve/TestAddToQueue.java
......@@ -105,7 +105,7 @@ public class TestAddToQueue extends BaseTestImpl {
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,true,random.nextInt(100)+10,random.nextInt(5)+1,true,random.nextInt(100)+10,"minutes",true,random.nextInt(100)+10,"minutes");
ruleTools.saveGroupBookingRules(id,true,bookingSeatCount,true,true,random.nextInt(30)+10,true,random.nextInt(100)+10,random.nextInt(5)+1,false,random.nextInt(100)+10,"minutes",false,random.nextInt(100)+10,"minutes");
try {
Thread.sleep(1000);
......
src/main/java/com/xiaomai/cases/polar/schedule/group/GroupScheduleTools.java
......@@ -49,8 +49,8 @@ public class GroupScheduleTools extends XMBaseTest {
* @param force 是否冲突
* @param endType 排课结束方式：1 按日期，2 按次数
*/
public void createGroupRuleSchedule(String courseId, String chiefCoachId, String startDate, String endDate, List<String> venueAreaIds, List<String> assistCoachIds, Boolean force, int endType,int minuteOffset) {
setUP("API_createGroupRuleSchedule");
public void createGroupRuleSchedule(String courseId, String chiefCoachId, String startDate, String endDate, List<String> venueAreaIds, List<String> assistCoachIds, Boolean force, int endType,int minuteOffset,DataUserInfo... userInfo) {
setUP("API_createGroupRuleSchedule", userInfo);
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId()); // 场馆
......@@ -73,7 +73,7 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("endDate", CommUtil.getNDayEndTimeTamp(60)); //排课结束日期，这里就设置自动延顺60天，结束日期会覆盖你传的endDate
}
dataApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
}
......@@ -84,8 +84,8 @@ public class GroupScheduleTools extends XMBaseTest {
* @return
*/
public JSONArray getGroupRuleScheduleList(String courseId, String coachId){
setUP("API_getGroupRuleScheduleList");
public JSONArray getGroupRuleScheduleList(String courseId, String coachId,DataUserInfo... userInfo){
setUP("API_getGroupRuleScheduleList",userInfo);
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
......@@ -96,7 +96,7 @@ public class GroupScheduleTools extends XMBaseTest {
if(coachId!=null&&coachId.length()!=0){
body.put("coachId", coachId);
}
dataApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
return XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result");
}
......@@ -119,7 +119,7 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("current", 0);
body.put("size", 50);
body.put("courseNameLike", courseName);
dataApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
if(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records").length()==0){
return "";
}
......@@ -133,15 +133,15 @@ public class GroupScheduleTools extends XMBaseTest {
* 删除团课排课日程
* @param ruleId
*/
public void delGroupRuleSchedule(String ruleId, Boolean force){
setUP("API_delGroupRuleSchedule");
public void delGroupRuleSchedule(String ruleId, Boolean force, DataUserInfo... userInfo){
setUP("API_delGroupRuleSchedule",userInfo);
JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId());
body.put("studioId", dataApi.getLoginInfo().getStudioId());
body.put("brandId", dataApi.getLoginInfo().getBrandId());
body.put("force", force);
body.put("ruleId", ruleId);
dataApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
}
......@@ -163,7 +163,7 @@ public class GroupScheduleTools extends XMBaseTest {
body.put("size", 50);
body.put("state", "DUTY");
body.put("teachingType", "LEAGUE_CLASS");
dataApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
int count=Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.total"));
List<String> adminIds = new ArrayList<>();
......@@ -223,7 +223,7 @@ 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, params, body.toString(), headers).assetsSuccess(true);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
}
......@@ -268,7 +268,7 @@ public class GroupScheduleTools extends XMBaseTest {
}
/**
* @description:TODO
* @description:编辑课次
* @author: xuyamei
* @date: 2024/6/23 20:45
* @param scheduleId:课次id
......
src/main/java/com/xiaomai/cases/polar/setting/courseCategory/CourseCategoryTools.java
......@@ -39,7 +39,7 @@ public class CourseCategoryTools extends XMBaseTest {
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();
}
......@@ -83,7 +83,7 @@ public class CourseCategoryTools extends XMBaseTest {
if (oldCategoryId.equals("")){
body.put("oldCategoryId",oldCategoryId);
}
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
return dataApi.getBodyInJSON().getBoolean("result");
}
......@@ -108,7 +108,7 @@ public class CourseCategoryTools extends XMBaseTest {
body.put("categoryName",categoryName);
body.put("operatorId",dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
return dataApi.getBodyInJSON().getJSONObject("result").getString("id");
}
......@@ -131,7 +131,7 @@ public class CourseCategoryTools extends XMBaseTest {
body.put("studioId",dataApi.getLoginInfo().getStudioId());
body.put("categoryId",categoryId);
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);
}
/**
......@@ -153,7 +153,7 @@ public class CourseCategoryTools extends XMBaseTest {
body.put("categoryId",categoryId);
body.put("del",del);
body.put("operatorId",dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON,params,body.toString(),headers);
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
return dataApi.getBodyInJSON().getBoolean("result");
}
......
src/main/java/com/xiaomai/client/ApiTest.java
......@@ -151,13 +151,19 @@ public class ApiTest extends AbstractTestNGSpringContextTests {
executionApi.getHeadrs().put("brandId", loginInfo.getBrandId());
executionApi.getHeadrs().put("studioId", loginInfo.getStudioId());
executionApi.getHeadrs().put("usertype", "B");
executionApi.getHeadrs().put("domain", "FITNESS_ADMIN");
}else if ("minApp".equals(executionApi.getTerminal())) {
executionApi.getHeadrs().put("domain", "FITNESS_MEMBER");
executionApi.getHeadrs().put("appId", loginInfo.getWechatAppId());
executionApi.getHeadrs().put("user", loginInfo.getUser());
executionApi.getHeadrs().put("xmToken", loginInfo.getToken());
}
executionApi.getHeadrs().put("xm_request_source", "TestGetAdmin");
executionApi.getHeadrs().put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0");
executionApi.getHeadrs().put("Accept", "*/*");
executionApi.getHeadrs().put("Connection", "Keep-Alive");
executionApi.getHeadrs().put("domain", "FITNESS_ADMIN");
// 接口未设置请求头，则默认为 application/json
if (api.containsKey("apiContentType") || StringUtils.isEmpty(api.getString("apiContentType"))) {
executionApi.getHeadrs().put("Content-type", "application/json;charset=utf-8");
......
src/main/java/com/xiaomai/client/BaseTest.java
......@@ -174,13 +174,18 @@ public class BaseTest extends AbstractTestNGSpringContextTests {
executionHeaders.put("brandId", loginInfo.getBrandId());
executionHeaders.put("studioId", loginInfo.getStudioId());
executionHeaders.put("usertype", "B");
executionHeaders.put("domain", "FITNESS_ADMIN");
}else if ("minApp".equals(executionApi.getTerminal())) {
executionHeaders.put("domain", "FITNESS_MEMBER");
executionHeaders.put("appId", loginInfo.getWechatAppId());
executionHeaders.put("user", loginInfo.getUser());
executionHeaders.put("token", loginInfo.getToken());
}
executionHeaders.put("xm_request_source", "TestGetAdmin");
executionHeaders.put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0");
executionHeaders.put("Accept", "*/*");
executionHeaders.put("domain", "FITNESS_ADMIN");
executionHeaders.put("Connection", "Keep-Alive");
// 接口未设置请求头，则默认为 application/json
/* if (api.containsKey("apiContentType") || StringUtils.isEmpty(api.getString("apiContentType"))) {
......
src/main/java/com/xiaomai/enums/ApiModule.java
......@@ -18,6 +18,8 @@ public class ApiModule {
public static String Polar_Schedule="polar_schedule";//课程排期
public static String Polar_Reserve="polar_reserve";//预约
public static String Lunar_Reserve="lunar_reserve";//预约
public static String Lunar_User="lunar_user";//预约
......
src/main/java/com/xiaomai/enums/LoginAccount.java
......@@ -13,6 +13,7 @@ public class LoginAccount {
public static String ADU_PROD = "gym_prod_du";
public static String GYM_PROD = "gym_prod";
public static String XYM_PROD = "xym_prod";
public static String XYM_MINIAPPC = "xym_miniAppC";
}
src/main/java/com/xiaomai/utils/CommonLogin.java
......@@ -87,7 +87,27 @@ public class CommonLogin {
.setStudioId(studioId);
loginInfoMap.add(loginUser,loginInfo);
} else {
} else if (Terminal.minApp.equals(loginTerminal)) {
String appId = userInfo.getApp_id();
String openId = userInfo.getOpen_id();
String brandId = userInfo.getBrandId();
String studioId = userInfo.getStudioId();
String token = userInfo.getXm_token();
String user = userInfo.getUser();
CommonRequestParameters loginIofo = new CommonRequestParameters()
.setUser(user)
.setDomain("FITNESS_MEMBER")
.setToken(token)
.setAccountNo(accountNo)
.setOpenId(openId)
.setToken(token)
.setWechatAppId(appId)
.setBrandId(brandId)
.setStudioId(studioId);
loginInfoMap.add(loginUser, loginIofo);
} else {
logger.warn(env + "环境" + loginTerminal + "端:" + loginUser + "登陆失败:" + body.getString("message"));
}
} else {
......
src/main/java/com/xiaomai/utils/CommonRequestParameters.java
......@@ -20,10 +20,16 @@ public class CommonRequestParameters {
private String accountNo;
private String domain;
private String wechatAppId;
private String openId;
public String getCommonParam(String userType) {
if ("B".equals(userType)) {
return "?build=1&user="+user+"&tenant="+tenant+"&adminId="+adminId+"&domain="+domain+"&sft=20.0&sfr=0.0&token="+token+"&brandId="+brandId+"&studioId="+studioId+"&sfb=0.0&version=1.0&sfl=0.0&platform=iOS";
}else if (Terminal.minApp.equals(userType)) {
return "?domain="+domain + "&appId=" + wechatAppId + "&token=" + token + "&openId=" + openId +"&brandId="+brandId+"&studioId="+studioId;
} else {
return "?";
}
......@@ -109,4 +115,19 @@ public class CommonRequestParameters {
this.domain = domain;
return this;
}
public String getWechatAppId() {
return wechatAppId;
}
public CommonRequestParameters setWechatAppId(String wechatAppId) {
this.wechatAppId = wechatAppId;
return this;
}
public String getOpenId() {
return openId;
}
public CommonRequestParameters setOpenId(String openId) {
this.openId = openId;
return this;
}
}
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