Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/points/TestFindStatementPagePermission.java

@@ -290,7 +290,7 @@ public class TestFindStatementPagePermission extends XMBaseTest {
         Assert.assertEquals(afleftBalance11, afleftBalance10-10);//断言撤销训练营签到积分-10
         Assert.assertEquals(afleftBalance11, afleftBalance10-10);//断言撤销训练营签到积分-10
 
 
         //签单体验卡
         //签单体验卡
-        cardTools.doMemberCardcommonSearch("积分体验卡","EXPERIENCE_CARD");
+        cardTools.doMemberCardcommonSearch("积分体验卡1","EXPERIENCE_CARD");
         String memberCardId1 = XMJSONPath.readPath(dataApi.getApi_response(), "$.result[0].id");//获取第一张搜索体验卡ID
         String memberCardId1 = XMJSONPath.readPath(dataApi.getApi_response(), "$.result[0].id");//获取第一张搜索体验卡ID
 
 
         cardTools.fetchDetailById(memberCardId1);
         cardTools.fetchDetailById(memberCardId1);

src/main/java/com/xiaomai/cases/polar/points/TestPointsRule.java

@@ -16,7 +16,7 @@ public class TestPointsRule extends XMBaseTest {
     public void beforeTest(){
     public void beforeTest(){
         xmAppApi.setApiModule(ApiModule.Polar_Points)
         xmAppApi.setApiModule(ApiModule.Polar_Points)
                 .setApiName("API_memberPoint_saveRule")
                 .setApiName("API_memberPoint_saveRule")
-                .setLoginUser(LoginAccount.YJ_PROD)
+                .setLoginUser(LoginAccount.YJ_PROD_ALL)
                 .setTerminal(Terminal.B);
                 .setTerminal(Terminal.B);
         dal.setCase_owner("yangjian")
         dal.setCase_owner("yangjian")
                 .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
                 .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
@@ -29,9 +29,9 @@ public class TestPointsRule extends XMBaseTest {
     @Test(description = "积分规则编辑/保存")//新开场馆和品牌
     @Test(description = "积分规则编辑/保存")//新开场馆和品牌
     public void testMemberPoint_saveRule(){
     public void testMemberPoint_saveRule(){
         //pointsTools.memberPoint_saveRule("");
         //pointsTools.memberPoint_saveRule("");
-        pointsTools.memberPoint_saveRule(xmAppApi.getLoginInfo().getStudioId());
-        pointsTools.memberPoint_findRule(xmAppApi.getLoginInfo().getStudioId());
-        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.enableMemberPoint"), "YES", "积分规则未开启");
+        //pointsTools.memberPoint_saveRule("");
+        //pointsTools.memberPoint_findRule(xmAppApi.getLoginInfo().getStudioId());
+        //Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.enableMemberPoint"), "YES", "积分规则未开启");
 
 
 
 
     }
     }