Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/finance/axf/TestAxfGetLatestApply.java

@@ -30,8 +30,8 @@ public class TestAxfGetLatestApply extends BaseTestImpl {
         String str = "{\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
         String str = "{\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
         xmAppApi.doRequest(RequestType.JSON, params,str,headers).assetsSuccess(true);
         xmAppApi.doRequest(RequestType.JSON, params,str,headers).assetsSuccess(true);
         //校验校区的商户号PID与预期的一致
         //校验校区的商户号PID与预期的一致
-        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("merchantNo"),"2088460274140455","PID返回错误");
-        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("state"),"SETTLE_SUCCESS","状态是申请成功");
+        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("superTenantKey"),"B_"+xmAppApi.getLoginInfo().getBrandId());
+        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("tenantKey"),"S_"+xmAppApi.getLoginInfo().getStudioId());
 
 
     }
     }
 }
 }

src/main/java/com/xiaomai/cases/polar/training/TestGetTrainingPlanContent.java

@@ -59,8 +59,8 @@ public class TestGetTrainingPlanContent extends BaseTestImpl {
         Assert.assertNotNull(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result"));
         Assert.assertNotNull(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result"));
 
 
         //5.保存并发送训练计划
         //5.保存并发送训练计划
-        String exerciseId = XMJSONPath.readPath(trainingTools.getListByName("胸"),"$.result[0].id");
-        String exerciseName = XMJSONPath.readPath(trainingTools.getListByName("胸"),"$.result[0].name");
+        String exerciseId = XMJSONPath.readPath(trainingTools.getListByName("上斜绳索夹胸"),"$.result[0].id");
+        String exerciseName = XMJSONPath.readPath(trainingTools.getListByName("上斜绳索夹胸"),"$.result[0].name");
         String recordId = trainingTools.trainingPlanRecordCreate(memberId,exerciseId,exerciseName);
         String recordId = trainingTools.trainingPlanRecordCreate(memberId,exerciseId,exerciseName);
         Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"))==num+1);
         Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(trainingTools.trainingPlanRecordPage(memberId,""),"$.result.total"))==num+1);