Skip to content

X
xm-sportstest
Commit 484456ed by yangfangfang
Options

Merge remote-tracking branch 'origin/master'

parents 538f40f6 3d36e3df
Showing with 319 additions and 27 deletions
src/main/java/com/xiaomai/cases/lunar/reserve/TestAddMemberReserve.java
...@@ -19,7 +19,6 @@ import com.xiaomai.utils.CommUtil; ...@@ -19,7 +19,6 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -217,7 +216,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -217,7 +216,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD); 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0); BigDecimal quantity = new BigDecimal(0);
...@@ -227,7 +226,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -227,7 +226,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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; ...@@ -20,7 +20,6 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -303,7 +302,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -303,7 +302,7 @@ public class TestAddToQueue extends BaseTestImpl {
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD); 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0); BigDecimal quantity = new BigDecimal(0);
...@@ -313,7 +312,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -313,7 +312,7 @@ public class TestAddToQueue extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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; ...@@ -19,7 +19,6 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -241,7 +240,7 @@ public class TestXCXSignIn extends BaseTestImpl { ...@@ -241,7 +240,7 @@ public class TestXCXSignIn extends BaseTestImpl {
dataUserInfo.setLoginUser(LoginAccount.GYM_PROD); 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0); BigDecimal quantity = new BigDecimal(0);
...@@ -251,7 +250,7 @@ public class TestXCXSignIn extends BaseTestImpl { ...@@ -251,7 +250,7 @@ public class TestXCXSignIn extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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/experienceCard/Tools.java 0 → 100644
package com.xiaomai.cases.polar.experienceCard;
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;
import com.xiaomai.utils.XMBaseTest;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.UUID;
/**
* @Author zxy
* @Description
* @Date 2024/7/12 16:45
*/
public class Tools extends XMBaseTest {
//是否存在相同名称的卡
public JSONObject checkTitleDuplicate(String title, String commodityCardType, DataUserInfo... userInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_checkTitleDuplicate")
.setTerminal(Terminal.B);
super.beforeDataRequest(userInfos);
JSONObject object = new JSONObject();
object.put("brandId", dataApi.getLoginInfo().getBrandId());
object.put("studioId", dataApi.getLoginInfo().getStudioId());
object.put("operatorId", dataApi.getLoginInfo().getAdminId());
object.put("title", title);
object.put("commodityCardType", commodityCardType);
dataApi.doRequest(RequestType.JSON, dataparams, object.toString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
//创建体验卡 卡类型commodityCardType；卡名称：title；允许购买体验卡的会员类型：memberStatus；体验卡购买条件限制：purchaseRestriction；使用权益：benefit
public JSONObject create(String commodityCardType,String title, String memberStatus, String purchaseRestriction,String benefit, DataUserInfo... userInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_tenantMemberCard_create")
.setTerminal(Terminal.B);
super.beforeDataRequest(userInfos);
JSONArray activatePatternList = new JSONArray();//生效方式
activatePatternList.add("PURCHASE");//即时生效
activatePatternList.add("FIRST_USED");//首次使用生效
activatePatternList.add("SPECIFIC_DATE");//指定日期生效
JSONArray purchaseMemberStateList = new JSONArray();//允许购买的会员状态
switch (memberStatus) {
case "全部":
purchaseMemberStateList.add("POTENTIAL");
purchaseMemberStateList.add("NORMAL");
purchaseMemberStateList.add("HISTORY");
break;
case "潜在":
purchaseMemberStateList.add("POTENTIAL");
break;
case "正式":
purchaseMemberStateList.add("NORMAL");
break;
case "流失":
purchaseMemberStateList.add("HISTORY");
break;
}
JSONArray entrancePeriodList = new JSONArray();//入场时间段
entrancePeriodList.add("0~1435");
int course_price = 10;//课程权益售价
int venue_price = 20;//入场权益售价
int price = 0;//卡的售价
//课程权益-次数
JSONObject benefit_course_balance = new JSONObject();
benefit_course_balance.put("identifier", UUID.randomUUID().toString().replace("-", ""));
benefit_course_balance.put("benefitType", "BALANCE");//次数
benefit_course_balance.put("targetScope", "GROUP_CLASS_AND_PERSONAL_COURSE");
benefit_course_balance.put("balance", "10");
benefit_course_balance.put("reserveLimitType", "UN_LIMIT");
benefit_course_balance.put("reserveLimitNumber", 0);
benefit_course_balance.put("defaultConsumeBalance", 1);
benefit_course_balance.put("targetType", "COURSE");
benefit_course_balance.put("price", course_price);//课程权益售价
//课程权益-期限
JSONObject benefit_course_period = new JSONObject();
benefit_course_period.put("identifier", UUID.randomUUID().toString().replace("-", ""));
benefit_course_period.put("benefitType", "PERIOD");//期限
benefit_course_period.put("targetScope", "GROUP_CLASS_AND_PERSONAL_COURSE");
benefit_course_period.put("reserveLimitType", "UN_LIMIT");
benefit_course_period.put("reserveLimitNumber", 0);
benefit_course_period.put("targetType", "COURSE");
benefit_course_period.put("price", course_price);//课程权益售价
//入场权益-次数
JSONObject benefit_venue_balance = new JSONObject();
benefit_venue_balance.put("identifier", UUID.randomUUID().toString().replace("-", ""));
benefit_venue_balance.put("benefitType", "BALANCE");//次数
benefit_venue_balance.put("balance", "10");
benefit_venue_balance.put("defaultConsumeBalance", 1);
benefit_venue_balance.put("entrancePeriodList", entrancePeriodList);//入场时间段
benefit_venue_balance.put("targetType", "VENUE");
benefit_venue_balance.put("targetScope", "VENUE_ENTRANCE_PERIOD");
benefit_venue_balance.put("price", venue_price);//入场权益售价
//入场权益-期限
JSONObject benefit_venue_period = new JSONObject();
benefit_venue_period.put("identifier", UUID.randomUUID().toString().replace("-", ""));
benefit_venue_period.put("benefitType", "PERIOD");//期限
benefit_venue_period.put("entrancePeriodList", entrancePeriodList);//入场时间段
benefit_venue_period.put("targetType", "VENUE");
benefit_venue_period.put("targetScope", "VENUE_ENTRANCE_PERIOD");
benefit_venue_period.put("price", venue_price);//入场权益售价
//需要创建的权益类型，可以组合也可以单个权益
List benefitList = new ArrayList();
switch (benefit) {
case "课程次数_入场次数权益":
benefitList.add(benefit_course_balance);
benefitList.add(benefit_venue_balance);
price = course_price + venue_price;
break;
case "课程期限_入场期限权益":
benefitList.add(benefit_course_period);
benefitList.add(benefit_venue_period);
price = course_price + venue_price;
break;
case "课程次数_入场期限权益":
benefitList.add(benefit_course_balance);
benefitList.add(benefit_venue_period);
price = course_price + venue_price;
break;
case "课程期限_入场次数权益":
benefitList.add(benefit_course_period);
benefitList.add(benefit_venue_balance);
price = course_price + venue_price;
break;
case "课程期限权益":
benefitList.add(benefit_course_period);
price = course_price;
break;
case "课程次数权益":
benefitList.add(benefit_course_balance);
price = course_price;
break;
case "入场期限权益":
benefitList.add(benefit_venue_period);
price = venue_price;
break;
case "入场次数权益":
benefitList.add(benefit_venue_balance);
price = venue_price;
break;
}
String description = "{\"items\":[{\"aspect\":\"\",\"type\":\"TEXT\",\"content\":\"自动化测试脚本创建\"}]}";
Random random = new Random();
String stock[] = {"","1","100"};
JSONObject object = new JSONObject();
object.put("brandId", dataApi.getLoginInfo().getBrandId());
object.put("studioId", dataApi.getLoginInfo().getStudioId());
object.put("operatorId", dataApi.getLoginInfo().getAdminId());
object.put("creatorId", dataApi.getLoginInfo().getAdminId());
object.put("maxIdlePeriod", "7");//首次使用生效方式的最晚生效天数
object.put("surfaceCornerMark", "自动化测试");//封面标签
object.put("title", title);
object.put("validPeriod", "30");//有效期
object.put("activatePatternList", activatePatternList);//生效方式
object.put("price", price);//售价
object.put("underlinePrice", "35");//划线价
object.put("purchaseNumberLimit", "100");//最大购买数量
object.put("xcxSaleStatus", "YES");//开启小程序售卖
object.put("shelfState", "YES");//启用体验卡
object.put("description", description);//描述
object.put("benefitList", benefitList);//权益信息
switch (commodityCardType){
case "MEMBER_CARD":
object.put("commodityCardType", "MEMBER_CARD");//卡类型：会员卡
object.put("sharePeopleLimit","2");//共享人数
object.put("surfaceUrl", "https://image.xiaomaiketang.com/xm/internal/GKH7tWJTXX.png");//封面
break;
case "EXPERIENCE_CARD":
object.put("stock",stock[random.nextInt(3)]);//剩余库存
object.put("purchaseMemberStateList", purchaseMemberStateList);//可购卡的会员状态
object.put("surfaceUrl", "https://image.xiaomaiketang.com/xm/internal/AHZTicf2k7.png");//封面
object.put("commodityCardType", "EXPERIENCE_CARD");//卡类型：体验卡
object.put("purchaseRestriction",purchaseRestriction);//购买限制：YES表示限制 NO表示不限制；限制即：不允许购买过其他卡的会员再购买本张卡
break;
}
dataApi.doRequest(RequestType.JSON, dataparams, object.toString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
//卡列表
public JSONObject fetchPageOfMemberCard(String commodityCardType,String filter,String courseId,String shelfState,String xcxSaleStatus,DataUserInfo...dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchPageOfMemberCard")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject = new JSONObject();
jsonObject.put("current",0);
jsonObject.put("size",20);
jsonObject.put("studioId", xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("brandId", xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("commodityCardType",commodityCardType);
switch (filter){
case "启用状态":
jsonObject.put("shelfState",shelfState);
break;
case "线上售卖":
jsonObject.put("xcxSaleStatus",xcxSaleStatus);
break;
case "适用课程":
jsonObject.put("courseId",courseId);
break;
default:
jsonObject.put("courseId",null);
}
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON();
return response;
}
}
src/main/java/com/xiaomai/cases/polar/member/TestAppointCoach.java
...@@ -111,7 +111,7 @@ public class TestAppointCoach extends XMBaseTest { ...@@ -111,7 +111,7 @@ public class TestAppointCoach extends XMBaseTest {
// 买卡 // 买卡
public void signOrder(String courseId,String memberId){ 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0); BigDecimal quantity = new BigDecimal(0);
...@@ -121,7 +121,7 @@ public class TestAppointCoach extends XMBaseTest { ...@@ -121,7 +121,7 @@ public class TestAppointCoach extends XMBaseTest {
cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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 { ...@@ -151,7 +151,16 @@ public class CardTools extends XMBaseTest {
return response; 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) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchPageOfMemberCard") .setApiName("API_fetchPageOfMemberCard")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
...@@ -161,6 +170,7 @@ public class CardTools extends XMBaseTest { ...@@ -161,6 +170,7 @@ public class CardTools extends XMBaseTest {
//jsonObject.put("shelfState",shelfState);//启用状态 //jsonObject.put("shelfState",shelfState);//启用状态
//jsonObject.put("xcxSaleStatus",xcxSaleStatus);//售卖状态 //jsonObject.put("xcxSaleStatus",xcxSaleStatus);//售卖状态
jsonObject.put("courseId", courseId); jsonObject.put("courseId", courseId);
jsonObject.put("commodityCardType", commodityCardType);
jsonObject.put("current", 0); jsonObject.put("current", 0);
jsonObject.put("size", 20); jsonObject.put("size", 20);
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); 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; ...@@ -19,9 +19,7 @@ import com.xiaomai.utils.CommUtil;
import com.xiaomai.utils.RandomStringUtil; import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.springframework.core.annotation.Order;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -355,7 +353,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -355,7 +353,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
// 买卡 // 买卡
public void signOrder(String courseId,String memberId){ 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0) ; BigDecimal quantity = new BigDecimal(0) ;
...@@ -365,7 +363,7 @@ public class TestAddMemberReserve extends BaseTestImpl { ...@@ -365,7 +363,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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; ...@@ -20,7 +20,6 @@ import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -241,7 +240,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -241,7 +240,7 @@ public class TestAddToQueue extends BaseTestImpl {
**/ **/
public void signOrder(String courseId,String memberId){ 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0); BigDecimal quantity = new BigDecimal(0);
...@@ -251,7 +250,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -251,7 +250,7 @@ public class TestAddToQueue extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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; ...@@ -19,7 +19,6 @@ import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -204,7 +203,7 @@ public class TestSignIn extends BaseTestImpl { ...@@ -204,7 +203,7 @@ public class TestSignIn extends BaseTestImpl {
**/ **/
public void signOrder(String courseId,String memberId){ 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0); BigDecimal quantity = new BigDecimal(0);
...@@ -214,7 +213,7 @@ public class TestSignIn extends BaseTestImpl { ...@@ -214,7 +213,7 @@ public class TestSignIn extends BaseTestImpl {
cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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; ...@@ -11,7 +11,6 @@ import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.cases.polar.reserve.ReserveTools; import com.xiaomai.cases.polar.reserve.ReserveTools;
import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools; import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
import com.xiaomai.cases.polar.setting.courseCategory.CourseCategoryTools; 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.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
...@@ -557,7 +556,7 @@ public class TestReservePerson extends BaseTestImpl { ...@@ -557,7 +556,7 @@ public class TestReservePerson extends BaseTestImpl {
// 买卡 // 买卡
public void signOrder(String courseId,String memberId){ 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0) ; BigDecimal quantity = new BigDecimal(0) ;
...@@ -567,7 +566,7 @@ public class TestReservePerson extends BaseTestImpl { ...@@ -567,7 +566,7 @@ public class TestReservePerson extends BaseTestImpl {
cardId = cardTools.memberCardCreate("私教约课使用会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("私教约课使用会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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 { ...@@ -459,7 +459,7 @@ public class TestSignReservePerson extends BaseTestImpl {
// 买卡 // 买卡
public void signOrder(String courseId,String memberId){ 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")); int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
String cardId = ""; String cardId = "";
BigDecimal quantity = new BigDecimal(0) ; BigDecimal quantity = new BigDecimal(0) ;
...@@ -469,7 +469,7 @@ public class TestSignReservePerson extends BaseTestImpl { ...@@ -469,7 +469,7 @@ public class TestSignReservePerson extends BaseTestImpl {
cardId = cardTools.memberCardCreate("私教约课使用会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("私教约课使用会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id"); 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")); price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod")); 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