Skip to content

X
xm-sportstest
Commit 1a53dd1d by yangfangfang
Options

Merge remote-tracking branch 'origin/master'

parents d1dbff10 31fe2f55
Showing with 196 additions and 23 deletions
src/main/java/com/xiaomai/cases/lunar/reserve/ReserveCTools.java
...@@ -352,8 +352,8 @@ public class ReserveCTools extends XMBaseTest { ...@@ -352,8 +352,8 @@ public class ReserveCTools extends XMBaseTest {
body.put("scheduleId",scheduleId); body.put("scheduleId",scheduleId);
body.put("memberId",memberId); body.put("memberId",memberId);
body.put("studioId",dataApi.getLoginInfo().getStudioId()); body.put("studioId",dataApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
return dataApi.getBodyInJSON().getJSONObject("result").getBoolean("conflict"); return dataApi.getBodyInJSON().getBoolean("success");
} }
......
src/main/java/com/xiaomai/cases/lunar/reserve/TestSingleReserveSignIn.java
...@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl { ...@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
LocalDateTime currentDateTime = LocalDateTime.now(); LocalDateTime currentDateTime = LocalDateTime.now();
int hour = currentDateTime.getHour(); int hour = currentDateTime.getHour();
int minutes = currentDateTime.getMinute(); int minutes = currentDateTime.getMinute();
int minute = hour*60+minutes+10 ; int minute = hour*60+minutes+20 ;
createGroupSchedule(minute); createGroupSchedule(minute);
try { try {
...@@ -113,9 +113,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl { ...@@ -113,9 +113,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
// 校验会员加入课次是否有冲突 // 校验会员加入课次是否有冲突
boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId); boolean checkMemberConflict = reserveCTools.checkMemberConflict(memberId,scheduleId);
if (checkMemberConflict){ Assert.assertTrue(checkMemberConflict,"会员该时间段已预约其他课程");
Assert.assertTrue(true,"校验会员有课次冲突");
}
// 检查是否支持预约 // 检查是否支持预约
String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0); String checkAddSingleReserve = reserveCTools.checkAddSingleReserve(false,courseId,chiefCoachId,memberId,scheduleId,startTime,10,0);
......
src/main/java/com/xiaomai/cases/polar/brandMerchant/TestGetApply.java
...@@ -11,7 +11,6 @@ import com.xiaomai.utils.XMJSONPath; ...@@ -11,7 +11,6 @@ import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
...@@ -58,8 +57,8 @@ public class TestGetApply extends XMBaseTest { ...@@ -58,8 +57,8 @@ public class TestGetApply extends XMBaseTest {
//若有数据，检验详情里的场馆信息跟品牌信息匹配；若无返回报错 //若有数据，检验详情里的场馆信息跟品牌信息匹配；若无返回报错
if (total != 0) { if (total != 0) {
Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "操作成功!"); Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "操作成功!");
Assert.assertEquals(XMJSONPath.readPath(response, "$.result.brandId"), xmAppApi.getLoginInfo().getStudioId()); Assert.assertEquals(XMJSONPath.readPath(response, "$.result.companyType"), "PRIVATE");
Assert.assertEquals(XMJSONPath.readPath(response, "$.result.studioId"), xmAppApi.getLoginInfo().getStudioId()); Assert.assertEquals(XMJSONPath.readPath(response, "$.result.openState"), "SUCCESS");
} else { } else {
Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "数据不存在"); Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "数据不存在");
} }
......
src/main/java/com/xiaomai/cases/polar/experienceCard/TestCreateExperienceCard.java
...@@ -11,6 +11,7 @@ import org.testng.Assert; ...@@ -11,6 +11,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import java.util.List;
import java.util.Random; import java.util.Random;
/** /**
...@@ -57,6 +58,12 @@ public class TestCreateExperienceCard extends XMBaseTest { ...@@ -57,6 +58,12 @@ public class TestCreateExperienceCard extends XMBaseTest {
String id1 = tools.fetchPageOfMemberCard("EXPERIENCE_CARD","","","","").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); String id1 = tools.fetchPageOfMemberCard("EXPERIENCE_CARD","","","","").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
Assert.assertEquals(id,id1); Assert.assertEquals(id,id1);
JSONObject res = cardTools.fetchDetailById(id).getJSONObject("result");
List benefitList = res.getJSONArray("benefitList");
//全局搜索该体验卡
JSONObject res1 =cardTools.doMemberCardcommonSearch(title,"EXPERIENCE_CARD");
Assert.assertEquals(res1.getJSONArray("result").getJSONObject(0).getJSONArray("benefitList"),benefitList);
//停用体验卡 //停用体验卡
cardTools.modifyMemberCardShelfState(id,"NO"); cardTools.modifyMemberCardShelfState(id,"NO");
Assert.assertEquals(cardTools.fetchDetailById(id).getJSONObject("result").getString("shelfState"),"NO"); Assert.assertEquals(cardTools.fetchDetailById(id).getJSONObject("result").getString("shelfState"),"NO");
......
src/main/java/com/xiaomai/cases/polar/experienceCard/TestUpdateExperienceCard.java 0 → 100644
package com.xiaomai.cases.polar.experienceCard;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.memberCard.CardTools;
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.XMBaseTest;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.List;
/**
* @Author zxy
* @Description
* @Date 2024/8/8 14:04
*/
public class TestUpdateExperienceCard extends XMBaseTest {
Tools tools = new Tools();
CardTools cardTools = new CardTools();
String memberCardId;
String title;
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_tenantMemberCard_update")
.setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B);
dal.setCase_owner("zyx")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
@Test(description = "编辑体验卡")
public void testUpdateExperienceCard(){
//先检查次下列表有没有数据，有数据才会执行下面的点代码,无数据则新建一个
cardTools.fetchPageOfMemberCard("EXPERIENCE_CARD");
int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
if (listDatas > 0) {
memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
}
else {
for(int i=0;i<3;i++){
title = "课程次数入场次数"+ RandomStringUtil.randomString(3)+"-自动化创建";
//check是否存在同名的体验卡，不存在则新建
Boolean duplicate = tools.checkTitleDuplicate(title, "EXPERIENCE_CARD").getBoolean("result");
if (duplicate == false) {
memberCardId = tools.create("EXPERIENCE_CARD",title,"全部","YES","课程次数入场次数").getString("result");
break;
}
}
}
//编辑体验卡前的查看编辑记录列表的总数
int num = Integer.parseInt(cardTools.fetchPageOfHistory(memberCardId).getJSONObject("result").getString("total"));
//从体验卡详情获取部分字段信息
JSONObject res = cardTools.fetchDetailById(memberCardId).getJSONObject("result");
List activatePatternList = res.getJSONArray("activatePatternList");
List benefitList = res.getJSONArray("benefitList");
String price = res.getString("price");
//购买体验卡的会员状态：仅潜在会员
List purchaseMemberStateList = new ArrayList();
purchaseMemberStateList.add("POTENTIAL");
String description = "{\"items\":[{\"aspect\":\"\",\"type\":\"TEXT\",\"content\":\"自动化测试脚本编辑\"}]}";
//编辑体验卡
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", "10");//有效期
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);//权益信息
object.put("stock","");//剩余库存
object.put("purchaseMemberStateList", purchaseMemberStateList);//可购卡的会员状态
object.put("surfaceUrl", "https://image.xiaomaiketang.com/xm/internal/AHZTicf2k7.png");//封面
object.put("commodityCardType", "EXPERIENCE_CARD");//卡类型：体验卡
object.put("purchaseRestriction","NO");
object.put("memberCardId",memberCardId);
xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
JSONObject res1 = cardTools.fetchPageOfHistory(memberCardId).getJSONObject("result");
Assert.assertEquals(res1.getString("total"),String.valueOf(num+1));//编辑记录应该+1条
Assert.assertEquals(res1.getJSONArray("records").getJSONObject(0).getString("operateType"),"EDIT");//最新的一条应该是编辑的
JSONObject res2 = cardTools.findHistoryDetailById(res1.getJSONArray("records").getJSONObject(0).getString("snapshotId")).getJSONObject("result");
Assert.assertEquals(res2.getString("purchaseRestriction"),"NO");
Assert.assertEquals(res2.getJSONArray("purchaseMemberStateList"),purchaseMemberStateList);
}
}
src/main/java/com/xiaomai/cases/polar/experienceCard/Tools.java
...@@ -203,7 +203,7 @@ public class Tools extends XMBaseTest { ...@@ -203,7 +203,7 @@ public class Tools extends XMBaseTest {
} }
//卡列表 //卡列表 卡类型commodityCardType；筛选条件filter，有传传对应的类型及参数，无就传空；
public JSONObject fetchPageOfMemberCard(String commodityCardType,String filter,String courseId,String shelfState,String xcxSaleStatus,DataUserInfo...dataUserInfos) { public JSONObject fetchPageOfMemberCard(String commodityCardType,String filter,String courseId,String shelfState,String xcxSaleStatus,DataUserInfo...dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
......
src/main/java/com/xiaomai/cases/polar/memberCard/CardTools.java
...@@ -420,7 +420,7 @@ public class CardTools extends XMBaseTest { ...@@ -420,7 +420,7 @@ public class CardTools extends XMBaseTest {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("confirm", false); jsonObject.put("confirm", false);
jsonObject.put("expireDate", TimeUtils.getTodayTime()); jsonObject.put("expireDate", TimeUtils.getAfterDayDate(1));
jsonObject.put("memo", "自动化修改会员卡有效期"); jsonObject.put("memo", "自动化修改会员卡有效期");
jsonObject.put("benefitId", benefitId); jsonObject.put("benefitId", benefitId);
jsonObject.put("memberCardId", memberCardId); jsonObject.put("memberCardId", memberCardId);
......
src/main/java/com/xiaomai/cases/polar/memberCard/TestCancelSuspend.java
...@@ -5,8 +5,10 @@ import com.xiaomai.enums.ApiModule; ...@@ -5,8 +5,10 @@ import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -22,15 +24,33 @@ public class TestCancelSuspend extends XMBaseTest { ...@@ -22,15 +24,33 @@ public class TestCancelSuspend extends XMBaseTest {
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest(); super.beforeTest();
} }
@Test(description = "会员卡取消停用") @Test(description = "会员卡售卖记录详情-取消停用")
public void testcancelSuspend() { public void testcancelSuspend() {
CardTools Cardtools = new CardTools(); CardTools Cardtools = new CardTools();
Cardtools.membercardsearch("NORMAL"); Cardtools.membercardsearch("NORMAL");
String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID; String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");//拿售卖记录第一张【生效中】售卖的会员卡的ID;
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张【生效中】会员卡的ID;
Cardtools.modifyExpireDate(benefitId,memberCardId);//修改有效期 Cardtools.modifyExpireDate(benefitId,memberCardId);//修改有效期
Cardtools.membercard_suspend(benefitId,memberCardId);//会员卡停卡 Cardtools.getMemberCardAccountOperateRecord(memberCardId);//查看售卖记录变动记录
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].operateType").equals("CHANGE_EFFECTIVE_DATE"),"操作修改有效期，变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].remark").equals("自动化修改会员卡有效期"),"操作修改有效期，变动记录第一条的备注");
//Cardtools.membercardfindDetailById(memberCardId);//获取售卖记录详情
//long expireDate = TimeUtils.getAfterDayDate(1);
//System.out.println(expireDate);
//Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].expireDate").equals(expireDate));//校验售卖记录，有效期是否修改正确
//Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].expireDate")..equals(expireDate),substring(0, 5););
Cardtools.membercard_suspend(benefitId,memberCardId);//会员卡操作停卡
Cardtools.membercardfindDetailById(memberCardId);//获取售卖记录详情
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state").equals("SUSPEND"),"校验停卡后，售卖记录详情-状态变更为已停用");
Cardtools.getMemberCardAccountOperateRecord(memberCardId);//查看售卖记录变动记录
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].operateType").equals("SUSPEND_CARD"),"操作停卡，变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].remark").equals("自动化停卡"),"操作停卡，变动记录第一条的备注");
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -43,6 +63,9 @@ public class TestCancelSuspend extends XMBaseTest { ...@@ -43,6 +63,9 @@ public class TestCancelSuspend extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
Cardtools.getMemberCardAccountOperateRecord(memberCardId);//查看售卖记录变动记录
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].operateType").equals("CANCEL_SUSPEND_CARD"),"操作取消停卡，变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].remark").equals("自动化取消停卡"),"操作取消停卡，变动记录第一条的备注");
} }
} }
src/main/java/com/xiaomai/cases/polar/memberCard/TestDiscardManualDeduct.java
...@@ -8,6 +8,7 @@ import com.xiaomai.enums.Terminal; ...@@ -8,6 +8,7 @@ import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil; import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -27,14 +28,22 @@ public class TestDiscardManualDeduct extends XMBaseTest { ...@@ -27,14 +28,22 @@ public class TestDiscardManualDeduct extends XMBaseTest {
public void testDiscardManualDeduct() { public void testDiscardManualDeduct() {
CardTools Cardtools = new CardTools(); CardTools Cardtools = new CardTools();
Cardtools.membercardsearch("NORMAL"); Cardtools.membercardsearch("NORMAL");
String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id"); String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");//拿售卖记录第一张【生效中】售卖的会员卡的ID;
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID; String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张【生效中】会员卡的ID;
//JSONObject bodyJson1 =Cardtools.membercardfindDetailById(memberCardId);
//int num1 = Integer.parseInt(XMJSONPath.readPath(bodyJson1,"$.result.courseBenefit.leftPurchaseBalance"));
Cardtools.manualDeduct(benefitId,memberCardId);//手动扣次 Cardtools.manualDeduct(benefitId,memberCardId);//手动扣次
Cardtools.fetchPageOfConsumeRecord(benefitId,memberCardId); Cardtools.fetchPageOfConsumeRecord(benefitId,memberCardId);
String consumeRecordId=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");// String consumeRecordId=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿第一条消耗记录
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("MANUAL_DEDUCT"),"操作手动扣次，消耗记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].changeOfPurchaseBalance").equals("-1.00"),"操作手动扣次，消耗次数");
//JSONObject bodyJson2 =Cardtools.membercardfindDetailById(memberCardId);
//int num2 = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.courseBenefit.leftPurchaseBalance"));
//Assert.assertTrue(num1 == num2+1);//手动扣次后减少一次
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("consumeRecordId",consumeRecordId); jsonObject.put("consumeRecordId",consumeRecordId);
...@@ -43,6 +52,14 @@ public class TestDiscardManualDeduct extends XMBaseTest { ...@@ -43,6 +52,14 @@ public class TestDiscardManualDeduct extends XMBaseTest {
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
Cardtools.fetchPageOfConsumeRecord(benefitId,memberCardId);
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("DISCARD_MANUAL_DEDUCT"),"操作手动扣次，消耗记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].changeOfPurchaseBalance").equals("1.00"),"操作撤销手动扣次，消耗次数");
//JSONObject bodyJson3 =Cardtools.membercardfindDetailById(memberCardId);
//int num3 = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.courseBenefit.leftPurchaseBalance"));
//Assert.assertTrue(num1 == num3);//撤销后和原来一样的次数
} }
} }
src/main/java/com/xiaomai/cases/polar/memberCard/TestModifySharers.java
...@@ -8,6 +8,7 @@ import com.xiaomai.enums.RequestType; ...@@ -8,6 +8,7 @@ import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -46,6 +47,8 @@ public class TestModifySharers extends XMBaseTest { ...@@ -46,6 +47,8 @@ public class TestModifySharers extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
Cardtools.membercardfindDetailById(memberCardId);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.sharers.id"),"[\"1807334217474027521\"]","添加共享人后，核对会员卡有对应共享人");
} }
@Test(description = "移除移除共享人") @Test(description = "移除移除共享人")
...@@ -68,6 +71,8 @@ public class TestModifySharers extends XMBaseTest { ...@@ -68,6 +71,8 @@ public class TestModifySharers extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
Cardtools.membercardfindDetailById(memberCardId);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.sharers.id"),"[]","移除共享人后，核对会员卡下无共享人");
} }
} }
src/main/java/com/xiaomai/cases/polar/memberCard/TestTenantMemberCard_update.java
...@@ -9,6 +9,7 @@ import com.xiaomai.enums.Terminal; ...@@ -9,6 +9,7 @@ import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil; import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -30,6 +31,8 @@ public class TestTenantMemberCard_update extends XMBaseTest { ...@@ -30,6 +31,8 @@ public class TestTenantMemberCard_update extends XMBaseTest {
@Test(description = "编辑会员卡") @Test(description = "编辑会员卡")
public void testmodifySharers() { public void testmodifySharers() {
CardTools Cardtools = new CardTools(); CardTools Cardtools = new CardTools();
try { try {
Thread.sleep(2000); Thread.sleep(2000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
...@@ -40,6 +43,9 @@ public class TestTenantMemberCard_update extends XMBaseTest { ...@@ -40,6 +43,9 @@ public class TestTenantMemberCard_update extends XMBaseTest {
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id"); String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
JSONObject bodyJson2 =Cardtools.fetchPageOfHistory(memberCardId);
int count = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.total"));
JSONArray activatePatternList=new JSONArray(); JSONArray activatePatternList=new JSONArray();
activatePatternList.add("PURCHASE"); activatePatternList.add("PURCHASE");
...@@ -64,9 +70,6 @@ public class TestTenantMemberCard_update extends XMBaseTest { ...@@ -64,9 +70,6 @@ public class TestTenantMemberCard_update extends XMBaseTest {
benefitList.add(Object); benefitList.add(Object);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("surfaceUrl","https://image.xiaomaiketang.com/xm/internal/HpRiJpFnTC.png");//会员卡封面图片 jsonObject.put("surfaceUrl","https://image.xiaomaiketang.com/xm/internal/HpRiJpFnTC.png");//会员卡封面图片
jsonObject.put("surfaceCornerMark","自动化标签"); jsonObject.put("surfaceCornerMark","自动化标签");
...@@ -76,7 +79,7 @@ public class TestTenantMemberCard_update extends XMBaseTest { ...@@ -76,7 +79,7 @@ public class TestTenantMemberCard_update extends XMBaseTest {
jsonObject.put("sharePeopleLimit", "2");//共享人数 jsonObject.put("sharePeopleLimit", "2");//共享人数
jsonObject.put("benefitList", benefitList);//使用权益 jsonObject.put("benefitList", benefitList);//使用权益
jsonObject.put("price", "1");//价格 jsonObject.put("price", "1");//价格
jsonObject.put("underlinePrice", "10");//划线价 jsonObject.put("underlinePrice", "20");//划线价:从10到20
jsonObject.put("purchaseNumberLimit", "-1");//购买数量限制 jsonObject.put("purchaseNumberLimit", "-1");//购买数量限制
jsonObject.put("xcxSaleStatus", "YES");//小程序是否售卖 jsonObject.put("xcxSaleStatus", "YES");//小程序是否售卖
jsonObject.put("creatorId", xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("creatorId", xmAppApi.getLoginInfo().getAdminId());
...@@ -90,6 +93,11 @@ public class TestTenantMemberCard_update extends XMBaseTest { ...@@ -90,6 +93,11 @@ public class TestTenantMemberCard_update extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
JSONObject bodyJson1 =Cardtools.fetchPageOfHistory(memberCardId);
int count1 = Integer.parseInt(XMJSONPath.readPath(bodyJson1,"$.result.total"));
Assert.assertTrue(count1 == count+1);//编辑记录+1
Cardtools.fetchDetailById(memberCardId);
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.underlinePrice").equals("20.00"),"编辑会员卡，核对编辑的划线价是否改过来了");
} }
} }
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