Merge branch 'Feature/20221009-gxh' into 'master'

增加1对多销售拆分

See merge request !38

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

@@ -143,7 +143,7 @@ public class Work implements Authorization {
     public void 工作台_菜单权限列表(){
         Response response = network.getResponse(BasicConfig.WORK_menu_list);
         int size = response.jsonPath().getInt("data.menuList.size()");
-        Assert.assertEquals(size,1,network.message(BasicConfig.WORK_notifyList,"菜单列表数量错误",response.body().asString()));
+        Assert.assertEquals(size,2,network.message(BasicConfig.WORK_notifyList,"菜单列表数量错误",response.body().asString()));
     }
 
     @Test(description = "客户状态分类_数量总览",priority = 10)
@@ -1306,6 +1306,7 @@ public class Work implements Authorization {
             params.put("pickTakeFlag",1);
             params.put("custNum",10);
             params.put("pickTakeAddress","杭州数字娱乐大厦");
+            params.put("receiveAndSendOffTime",time-3600000);
         }else{      //0表示未约到
             params.put("nextContactTime",time);
         }
@@ -1389,6 +1390,7 @@ public class Work implements Authorization {
     //获取约面日历列表
     public static void getCalendarlist(long calendarTime,int inviteStatus,String custName,String inviterName){
         sleep(1000);
+        int flag= 0 ;
         HashMap<String,Object> params = new HashMap<>();
         SimpleDateFormat sdt = new SimpleDateFormat("yyyy-MM-dd");
         params.put("calendarTime", sdt.format(now));
@@ -1398,6 +1400,7 @@ public class Work implements Authorization {
             if(day.calendarTime == calendarTime){
                 for(invitationRecord record:day.invitationInfo) {
                     if(record.custName != null && record.custName.equals(custName)){
+                        flag=1;
                         recordItem = record;
                         Assert.assertEquals(record.inviteStatus, inviteStatus ,network.message(params,BasicConfig.WORK_calendar_list,"约面状态回显非"+inviteStatus,response.body().asString()));
                         Assert.assertEquals(record.inviterName, inviterName ,network.message(params,BasicConfig.WORK_calendar_list,"邀约人非【"+inviterName+"】",response.body().asString()));
@@ -1407,6 +1410,10 @@ public class Work implements Authorization {
                 break;
             }
         }
+
+        if(flag == 0){
+            Assert.fail("未找到相应的约面记录");
+        }
     }
 
     //获取销售系数