Skip to content

X
xm-sportstest
Commit 484456ed by yangfangfang
Options

Merge remote-tracking branch 'origin/master'

parents 538f40f6 3d36e3df
Showing with 78 additions and 27 deletions
src/main/java/com/xiaomai/cases/lunar/reserve/TestAddMemberReserve.java
......@@ -19,7 +19,6 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
......@@ -217,7 +216,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,dataUserInfo);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD",dataUserInfo);
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0);
......@@ -227,7 +226,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
}
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java
......@@ -20,7 +20,6 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
......@@ -303,7 +302,7 @@ public class TestAddToQueue extends BaseTestImpl {
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,dataUserInfo);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD",dataUserInfo);
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0);
......@@ -313,7 +312,7 @@ public class TestAddToQueue extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
}
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/lunar/reserve/TestXCXSignIn.java
......@@ -19,7 +19,6 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
......@@ -241,7 +240,7 @@ public class TestXCXSignIn extends BaseTestImpl {
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,dataUserInfo);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD",dataUserInfo);
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0);
......@@ -251,7 +250,7 @@ public class TestXCXSignIn extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
}
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/polar/experienceCard/TestCreateExperienceCard.java 0 → 100644
package com.xiaomai.cases.polar.experienceCard;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMBaseTest;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
* @Author zxy
* @Description
* @Date 2024/7/13 09:48
*/
public class TestCreateExperienceCard extends XMBaseTest {
Tools tools = new Tools();
String id;
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_tenantMemberCard_create")
.setLoginUser(LoginAccount.ZYX1_DEV)
.setTerminal(Terminal.B);
dal.setCase_owner("zyx")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
@Test(description = "创建体验卡")
public void testCreateExperienceCard() {
String title = "自动化脚本创建体验卡" + RandomStringUtil.randomString(3);
//check是否存在同名的体验卡，不存在则新建
Boolean duplicate = tools.checkTitleDuplicate(title, "EXPERIENCE_CARD").getBoolean("result");
if (duplicate == false) {
id = tools.create("EXPERIENCE_CARD",title,"全部","NO","课程次数_入场期限权益").getString("result");
}
//新建后校验体验卡第一条数据是新建的那条数据
String id1 = tools.fetchPageOfMemberCard("EXPERIENCE_CARD","","","","").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
Assert.assertEquals(id,id1);
}
}
src/main/java/com/xiaomai/cases/polar/member/TestAppointCoach.java
......@@ -111,7 +111,7 @@ public class TestAppointCoach extends XMBaseTest {
// 买卡
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD");
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0);
......@@ -121,7 +121,7 @@ public class TestAppointCoach extends XMBaseTest {
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"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/polar/memberCard/CardTools.java
......@@ -151,7 +151,16 @@ public class CardTools extends XMBaseTest {
return response;
}
public JSONObject fetchPageOfMemberCard(String courseId, DataUserInfo... dataUserInfos) {
/**
* @description:获取会员卡列表
* @author: xuyamei
* @date: 2024/8/7 09:18
* @param courseId 课程id
* @param commodityCardType 会员卡类型
* @param dataUserInfos
* @return: com.alibaba.fastjson.JSONObject
**/
public JSONObject fetchPageOfMemberCard(String courseId,String commodityCardType,DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchPageOfMemberCard")
.setTerminal(Terminal.B);
......@@ -161,6 +170,7 @@ public class CardTools extends XMBaseTest {
//jsonObject.put("shelfState",shelfState);//启用状态
//jsonObject.put("xcxSaleStatus",xcxSaleStatus);//售卖状态
jsonObject.put("courseId", courseId);
jsonObject.put("commodityCardType", commodityCardType);
jsonObject.put("current", 0);
jsonObject.put("size", 20);
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
......
src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java
......@@ -19,9 +19,7 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.springframework.core.annotation.Order;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
......@@ -355,7 +353,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
// 买卡
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD");
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0) ;
......@@ -365,7 +363,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
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"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddToQueue.java
......@@ -20,7 +20,6 @@ import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
......@@ -241,7 +240,7 @@ public class TestAddToQueue extends BaseTestImpl {
**/
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD");
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0);
......@@ -251,7 +250,7 @@ public class TestAddToQueue extends BaseTestImpl {
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"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/polar/reserve/group/TestSignIn.java
......@@ -19,7 +19,6 @@ import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
......@@ -204,7 +203,7 @@ public class TestSignIn extends BaseTestImpl {
**/
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD");
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0);
......@@ -214,7 +213,7 @@ public class TestSignIn extends BaseTestImpl {
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"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestReservePerson.java
......@@ -11,7 +11,6 @@ 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.cases.polar.setting.rules.RuleTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal;
......@@ -557,7 +556,7 @@ public class TestReservePerson extends BaseTestImpl {
// 买卡
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD");
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0) ;
......@@ -567,7 +566,7 @@ public class TestReservePerson extends BaseTestImpl {
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"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestSignReservePerson.java
......@@ -459,7 +459,7 @@ public class TestSignReservePerson extends BaseTestImpl {
// 买卡
public void signOrder(String courseId,String memberId){
// 查询存量的卡
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,"MEMBER_CARD");
int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = "";
BigDecimal quantity = new BigDecimal(0) ;
......@@ -469,7 +469,7 @@ public class TestSignReservePerson extends BaseTestImpl {
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"));
quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
......
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