Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/export/TestExportReserve.java

@@ -5,6 +5,7 @@ import com.xiaomai.enums.ApiModule;
 import com.xiaomai.enums.LoginAccount;
 import com.xiaomai.enums.RequestType;
 import com.xiaomai.enums.Terminal;
+import com.xiaomai.utils.TimeUtils;
 import com.xiaomai.utils.XMBaseTest;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
@@ -49,6 +50,8 @@ public class TestExportReserve extends XMBaseTest {
         object.put("brandId",xmAppApi.getLoginInfo().getBrandId());
         object.put("studioId",xmAppApi.getLoginInfo().getStudioId());
         object.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+        object.put("scheduleStartDate", TimeUtils.getMonthFristDay(-1));
+        object.put("scheduleEndDate",TimeUtils.getMonthLastTime(-1));
 
 
         xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);

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

@@ -95,6 +95,7 @@ public class TestFindStatementPagePermission extends XMBaseTest {
             cardId = cardTools.memberCardCreate("积分自动化会员卡").getString("result");
         }
         JSONObject memberCard = orderTools.fetchPageOfMemberCard("积分会员卡", "MEMBER_CARD");
+        Thread.sleep(500);
         cardId = memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");//会员卡ID
 
         //会员卡购买
@@ -166,12 +167,15 @@ public class TestFindStatementPagePermission extends XMBaseTest {
 
         
         String categoryId1 = courseCategoryTools.getCourseCategoryPage("健美操");
+        Thread.sleep(500);
         String courseId1 = courseTools.getPersonalOrGroupCourseId("PERSONAL", "积分自动化私教课", categoryId1, "STUDIO", "ONE_TO_MANY", 1, 1).getString(0);
 
         JSONArray personalCoachTime = reserveTools.getPersonalTimeBlocks(xmAppApi.getLoginInfo().getAdminId(),courseId1,TimeUtils.getTodayTime());
 
         // 获取当前日期的Calendar实例
         Calendar calendar = Calendar.getInstance();
+        Thread.sleep(500);
+
         // 获取第一条的步长 转换成时间戳
         int minuteOffset1 = personalCoachTime.getJSONObject(0).getIntValue("minuteOffset")/60;
         calendar.set(Calendar.HOUR_OF_DAY, minuteOffset1);