Merge remote-tracking branch 'origin/master'

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

@@ -38,18 +38,19 @@ public class TestAXFAggOrder extends BaseTestImpl {
         String thirdOrderNo = "";
         String thirdOrderNo = "";
         for (int i = 0; i < total; i++){
         for (int i = 0; i < total; i++){
             receivedAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedAmount");
             receivedAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedAmount");
+
             if (receivedAmount > 0){
             if (receivedAmount > 0){
                 // 查询详情数据
                 // 查询详情数据
                 receivedActualAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedActualAmount");
                 receivedActualAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedActualAmount");
                 thirdOrderNo = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getString("thirdOrderNo");
                 thirdOrderNo = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getString("thirdOrderNo");
+
+                body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":"+thirdOrderNo+",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+                xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
+                response = xmAppApi.getBodyInJSON();
+                // 验证统计条返回的数据与列表统计数据一致
+                Assert.assertEquals(response.getJSONObject("result").getString("receivedActualAmount").equals(String.valueOf(receivedActualAmount)), true);
                 break;
                 break;
             }
             }
-
-            body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":"+thirdOrderNo+",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
-            xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
-            response = xmAppApi.getBodyInJSON();
-            // 验证统计条返回的数据与列表统计数据一致
-            Assert.assertEquals(response.getJSONObject("result").getString("receivedActualAmount").equals(String.valueOf(receivedActualAmount)), true);
         }
         }
     }
     }
 
 

src/main/java/com/xiaomai/cases/polar/reserve/ReserveTools.java

@@ -271,7 +271,7 @@ public class ReserveTools extends XMBaseTest {
 
 
         JSONObject body = new JSONObject();
         JSONObject body = new JSONObject();
         body.put("current",0);
         body.put("current",0);
-        body.put("size",500);
+        body.put("size",600);
         if (!courseId.equals("")){
         if (!courseId.equals("")){
             body.put("courseId",courseId);
             body.put("courseId",courseId);
         }
         }

src/main/java/com/xiaomai/cases/polar/schedule/camp/TestEditCampRuleSchedule.java

@@ -91,7 +91,7 @@ public class TestEditCampRuleSchedule extends SelectTargetTrainingCampAndGetInfo
         //给会员报名
         //给会员报名
         trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
         trainingTools.doSignCampOrder(memberId, this.price, this.campId,"");
         orderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
         orderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
-        Thread.sleep(5000);
+        Thread.sleep(10000);
 
 
         //check 预约记录（训练营预约记录，根据训练营活动筛选）
         //check 预约记录（训练营预约记录，根据训练营活动筛选）
         JSONArray reserverList= reserveTools.getPageByStudio("","","","",null,
         JSONArray reserverList= reserveTools.getPageByStudio("","","","",null,