C端单次约课报错接口修改优化

src/main/java/com/xiaomai/cases/lunar/reserve/TestSingleReserveSignIn.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.xiaomai.basetest.BaseTestImpl;
 import com.xiaomai.basetest.BaseTestImpl;
 import com.xiaomai.cases.lunar.user.UserTools;
 import com.xiaomai.cases.lunar.user.UserTools;
+import com.xiaomai.cases.polar.admin.AdminTools;
 import com.xiaomai.cases.polar.course.CourseTools;
 import com.xiaomai.cases.polar.course.CourseTools;
 import com.xiaomai.cases.polar.reserve.ReserveTools;
 import com.xiaomai.cases.polar.reserve.ReserveTools;
 import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
 import com.xiaomai.cases.polar.schedule.group.GroupScheduleTools;
@@ -55,6 +56,9 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
     @Resource(name = "ruleTools")
     @Resource(name = "ruleTools")
     RuleTools ruleTools;
     RuleTools ruleTools;
 
 
+    @Resource(name="adminTools")
+    AdminTools adminTools;
+
     String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
     String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
 
 
 
 
@@ -220,16 +224,34 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
         String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
         String categoryId = courseCategoryTools.getCourseCategoryPage("瑜伽");
         courseId = courseTools.getPersonalOrGroupCourseId("GROUP", "单次付费团课签到", categoryId, "STUDIO", "", 2, 1,dataUserInfo).getString(0);
         courseId = courseTools.getPersonalOrGroupCourseId("GROUP", "单次付费团课签到", categoryId, "STUDIO", "", 2, 1,dataUserInfo).getString(0);
 
 
+        // 查询存量的员工
+        // 获取教练列表
+        JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("C端单次约课教练",dataUserInfo);
+        if (pageStudioPersonalCoach.getJSONArray("records").size()==0){
+            adminTools.addStudioAdmin("教练","C端单次约课教练",dataUserInfo);
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("C端单次约课教练",dataUserInfo);
+        }
+        chiefCoachId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(0).getString("id");
+
         // 创建排课
         // 创建排课
         //1.1-创建排课日程
         //1.1-创建排课日程
-        groupScheduleTools.createGroupRuleSchedule(courseId, dataApi.getLoginInfo().getAdminId(), todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), true, 1,minute,dataUserInfo);
+        groupScheduleTools.createGroupRuleSchedule(courseId, chiefCoachId, todayStartTimeTamp, todayEndDateTimeTamp, new ArrayList(), new ArrayList(), true, 1,minute,dataUserInfo);
         try {
         try {
             Thread.sleep(2000);
             Thread.sleep(2000);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
             throw new RuntimeException(e);
         }
         }
+
+
+
+
         //1.2-查询排课日程
         //1.2-查询排课日程
-        JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, dataApi.getLoginInfo().getAdminId(),dataUserInfo);
+        JSONArray getGroupRuleScheduleList = groupScheduleTools.getGroupRuleScheduleList(courseId, chiefCoachId,dataUserInfo);
         //统计查询到的目标日程数量
         //统计查询到的目标日程数量
         ruldId = XMJSONPath.readPath(getGroupRuleScheduleList.getJSONObject(0), "$.ruleId");
         ruldId = XMJSONPath.readPath(getGroupRuleScheduleList.getJSONObject(0), "$.ruleId");
         Long scheduleEndTime = TimeUtils.getTodayEndTime(0);
         Long scheduleEndTime = TimeUtils.getTodayEndTime(0);

src/main/java/com/xiaomai/cases/polar/admin/AdminTools.java

@@ -28,7 +28,7 @@ public class AdminTools extends XMBaseTest {
      * @param dataUserInfos
      * @param dataUserInfos
      * @return: com.alibaba.fastjson.JSONObject  返回的是请求参数
      * @return: com.alibaba.fastjson.JSONObject  返回的是请求参数
      **/
      **/
-    public JSONObject addStudioAdmin(String role, DataUserInfo...dataUserInfos){
+    public JSONObject addStudioAdmin(String role,String name, DataUserInfo...dataUserInfos){
         dataApi.setApiModule(ApiModule.Polar_Admin)
         dataApi.setApiModule(ApiModule.Polar_Admin)
                 .setApiName("API_addStudioAdmin")
                 .setApiName("API_addStudioAdmin")
                 .setTerminal(Terminal.B);
                 .setTerminal(Terminal.B);
@@ -36,7 +36,10 @@ public class AdminTools extends XMBaseTest {
 
 
         JSONObject body = new JSONObject();
         JSONObject body = new JSONObject();
         body.put("phone", RandomStringUtil.randomMobile("103"));
         body.put("phone", RandomStringUtil.randomMobile("103"));
-        String name = RandomStringUtil.random_name();
+        if (name.equals("")){
+            name = RandomStringUtil.random_name();
+
+        }
         body.put("name", name);
         body.put("name", name);
         body.put("nickName", name);
         body.put("nickName", name);
         JSONObject avatar = new JSONObject();
         JSONObject avatar = new JSONObject();
@@ -144,6 +147,7 @@ public class AdminTools extends XMBaseTest {
         return dataApi.getBodyInJSON();
         return dataApi.getBodyInJSON();
     }
     }
 
 
+
     /**
     /**
      * @description:查询帐号下可切换的场馆列表
      * @description:查询帐号下可切换的场馆列表
      * @author: yangjian
      * @author: yangjian
@@ -361,4 +365,5 @@ public class AdminTools extends XMBaseTest {
 
 
 
 
 
 
+
 }
 }

src/main/java/com/xiaomai/cases/polar/admin/TestAddStudioAdmin.java

@@ -43,7 +43,7 @@ public class TestAddStudioAdmin extends BaseTestImpl {
         String[] role = {"店长","教练","销售主管","财务","前台"};
         String[] role = {"店长","教练","销售主管","财务","前台"};
         Random rand = new Random();
         Random rand = new Random();
 
 
-        JSONObject addRequest = adminTools.addStudioAdmin(role[rand.nextInt(5)]);
+        JSONObject addRequest = adminTools.addStudioAdmin(role[rand.nextInt(5)],"");
         // 添加角色成功后
         // 添加角色成功后
         String result = dataApi.getBodyInJSON().getString("result");
         String result = dataApi.getBodyInJSON().getString("result");
         try {
         try {