Commit 0057fbb3 by yangjian

体验卡增加是否用于营销活动字段

parent 1729fa1e
......@@ -47,7 +47,7 @@ public class TestActiveExperienceCard extends XMBaseTest {
}
@Test(description = "操作体验卡开卡")
public void testActivateMemberCard() {
public void testActivateMemberCard() throws InterruptedException {
//先检查下列表有没有数据,有数据才会执行下面的点代码,无数据则新建一个
cardTools.doMemberCardcommonSearch("课程次数入场次数","EXPERIENCE_CARD");
int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
......@@ -59,7 +59,8 @@ public class TestActiveExperienceCard extends XMBaseTest {
//check是否存在同名的体验卡,不存在则新建
Boolean duplicate = tools.checkTitleDuplicate(title, "EXPERIENCE_CARD").getBoolean("result");
if (duplicate == false) {
memberCardId = tools.create("EXPERIENCE_CARD", title, "全部", "YES", "课程次数入场次数").getString("result");
Thread.sleep(2000);
memberCardId = tools.create("EXPERIENCE_CARD", title, "全部", "YES", "课程次数入场次数",false).getString("result");
break;
}
}
......
......@@ -38,7 +38,7 @@ public class TestCreateExperienceCard extends XMBaseTest {
}
@Test(description = "创建体验卡")
public void testCreateExperienceCard() {
public void testCreateExperienceCard() throws InterruptedException {
Random random = new Random();
String[] benefit_all = {"课程次数入场次数","课程期限入场期限","课程次数入场期限","课程期限入场次数","课程期限","课程次数","入场期限","入场次数"};//权益
......@@ -49,7 +49,8 @@ public class TestCreateExperienceCard extends XMBaseTest {
//check是否存在同名的体验卡,不存在则新建
Boolean duplicate = tools.checkTitleDuplicate(title, "EXPERIENCE_CARD").getBoolean("result");
if (duplicate == false) {
id = tools.create("EXPERIENCE_CARD",title,"全部","YES",benefit).getString("result");
Thread.sleep(2000);
id = tools.create("EXPERIENCE_CARD",title,"全部","YES",benefit,false).getString("result");
break;
}
}
......
......@@ -40,7 +40,7 @@ public class TestUpdateExperienceCard extends XMBaseTest {
}
@Test(description = "编辑体验卡")
public void testUpdateExperienceCard(){
public void testUpdateExperienceCard() throws InterruptedException {
//先检查下列表有没有数据,有数据才会执行下面的点代码,无数据则新建一个
cardTools.fetchPageOfMemberCard("EXPERIENCE_CARD");
......@@ -54,7 +54,8 @@ public class TestUpdateExperienceCard extends XMBaseTest {
//check是否存在同名的体验卡,不存在则新建
Boolean duplicate = tools.checkTitleDuplicate(title, "EXPERIENCE_CARD").getBoolean("result");
if (duplicate == false) {
memberCardId = tools.create("EXPERIENCE_CARD",title,"全部","YES","课程次数入场次数").getString("result");
Thread.sleep(2000);
memberCardId = tools.create("EXPERIENCE_CARD",title,"全部","YES","课程次数入场次数",false).getString("result");
break;
}
}
......
......@@ -41,7 +41,7 @@ public class Tools extends XMBaseTest {
}
//创建体验卡 卡类型commodityCardType;卡名称:title;允许购买体验卡的会员类型:memberStatus;体验卡购买条件限制:purchaseRestriction;使用权益:benefit
public JSONObject create(String commodityCardType,String title, String memberStatus, String purchaseRestriction,String benefit, DataUserInfo... userInfos) {
public JSONObject create(String commodityCardType,String title, String memberStatus, String purchaseRestriction,String benefit,Boolean useForActivity, DataUserInfo... userInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_tenantMemberCard_create")
.setTerminal(Terminal.B);
......@@ -173,7 +173,7 @@ public class Tools extends XMBaseTest {
object.put("maxIdlePeriod", "7");//首次使用生效方式的最晚生效天数
object.put("surfaceCornerMark", "自动化测试");//封面标签
object.put("title", title);
object.put("useForActivity", false);//不开启用于营销活动
object.put("validPeriod", "30");//有效期
object.put("activatePatternList", activatePatternList);//生效方式
......@@ -184,6 +184,7 @@ public class Tools extends XMBaseTest {
object.put("shelfState", "YES");//启用体验卡
object.put("description", description);//描述
object.put("benefitList", benefitList);//权益信息
switch (commodityCardType){
case "MEMBER_CARD":
object.put("commodityCardType", "MEMBER_CARD");//卡类型:会员卡
......@@ -191,11 +192,24 @@ public class Tools extends XMBaseTest {
object.put("surfaceUrl", "https://image.xiaomaiketang.com/xm/internal/GKH7tWJTXX.png");//封面
break;
case "EXPERIENCE_CARD":
object.put("useForActivity", useForActivity);//营销活动是否开启
object.put("stock",stock[random.nextInt(2)]);//剩余库存
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表示不限制;限制即:不允许购买过其他卡的会员再购买本张卡
if(useForActivity.equals(true)){ //如果开启用于营销活动
object.put("stock", -1); //剩余库存不限
object.put("purchaseNumberLimit",-1);//每人限购不限
List<String> memberStatusLimitsA=new ArrayList<>();
memberStatusLimitsA.add("POTENTIAL");
memberStatusLimitsA.add("NORMAL");
memberStatusLimitsA.add("HISTORY");
object.put("memberStatusLimits", memberStatusLimitsA);//可领取会员类型所有类型
object.put("purchaseRestriction", "NO"); //购买条件不限制
}
break;
}
......
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