Merge remote-tracking branch 'origin/master' into Feature/20220415-gxh

# Conflicts:
#	src/test/java/com/kjj/config/BasicConfig.java

src/test/java/com/kjj/cases/otoseller/Work.java

@@ -696,6 +696,37 @@ public class Work implements Authorization {
         Assert.assertTrue(success,network.message(BasicConfig.MANAGER_oto_updatePermission,"开启总监的新客户认领权限和回收客户认领权限失败",response.body().asString()));
     }
 
+
+    @Test(description = "新建日程",priority = 63)
+    public void 新建日程(){
+        //获取日程提醒数量
+        Response listRes = network.getResponse(BasicConfig.WORK_notifyList);
+        int size = listRes.jsonPath().getInt("data.size()");
+
+        //新建日程
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custId",custId);
+        params.put("notifyTime",System.currentTimeMillis()+3600000);
+        params.put("type","phone");
+        Response scheduleRes =network.postResponse(params,BasicConfig.WORK_saveOrModifySchedule);
+        boolean success = scheduleRes.jsonPath().getBoolean("data");
+        Assert.assertTrue(success,network.message(BasicConfig.WORK_saveOrModifySchedule,"新建日程失败",scheduleRes.body().asString()));
+
+        //日程通知数量增加
+        Response listRes2 = network.getResponse(BasicConfig.WORK_notifyList);
+        int size2 = listRes2.jsonPath().getInt("data.size()");
+        Assert.assertTrue(size<size2,network.message(BasicConfig.WORK_notifyList,"日程通知未展示新建日程",listRes.body().asString()));
+    }
+
+    @Test(description = "取消日程",priority = 64)
+    public void 取消日程(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custId",custId);
+        Response response =network.postResponse(params,BasicConfig.WORK_cancelSchedule);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(BasicConfig.WORK_cancelSchedule,"取消日程失败",response.body().asString()));
+    }
+
     @Test(description = "删除客户",priority = 79)
     public void 删除客户(){
         HashMap<String,Object> params = new HashMap<>();

src/test/java/com/kjj/config/BasicConfig.java

@@ -1366,6 +1366,8 @@ public class BasicConfig {
   public static final String WORK_claim= WORK_HOST + "/kjy/oto/manager/customer/pool/claim";
   public static final String WORK_attendanceList= WORK_HOST + "/kjy/oto/manager/attendance/list";
   public static final String WORK_switchWorkStatus= WORK_HOST + "/kjy/oto/manager/attendance/switchWorkStatus";
+  public static final String WORK_saveOrModifySchedule= WORK_HOST + "/kjy/oto/manager/sellerNotify/saveOrModifySchedule";
+  public static final String WORK_cancelSchedule= WORK_HOST + "/kjy/oto/manager/sellerNotify/cancelSchedule";
   public static final String WORK_abandonCust= WORK_HOST + "/kjy/oto/manager/customer/abandonCust";
 
   public static final String PHONE_customerList = PHONE_HOST + "/kjy/oto/manager/customer/list";