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

Feature/20220914 gxh

See merge request !28

src/test/java/com/oto/bean/invitationRecord.java

+package com.oto.bean;
+
+import lombok.Data;
+
+@Data
+public class invitationRecord {
+    public int recordId;
+    public String custName;
+    public boolean hasAssignFlag;
+    public String takeLookName;
+    public int inviteStatus;
+    public long interviewTime;
+    public String expertName;
+}

src/test/java/com/oto/bean/inviteDay.java

+package com.oto.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class inviteDay {
+    public long calendarTime;
+    public List<invitationRecord> invitationInfo;
+}

src/test/java/com/oto/cases/admin/Authorization.java

@@ -14,18 +14,23 @@ public interface Authorization {
     NetworkUtils network = NetworkUtils.getInstance();
 
     //oto销售工作台-销售
-    default void otosellerAuth() {
-        network.agentCookies.put(otoSellerCookieKey, otoSellerCookieValue);
+    default void otoSellerAuth() {
+        network.agentCookies.put("otoToken", otoSellerCookieValue);
     }
 
     //oto销售工作台-总监
     default void otoLeaderAuth() {
-        network.agentCookies.put(otoLeaderCookieKey, otoLeaderCookieValue);
+        network.agentCookies.put("otoToken", otoLeaderCookieValue);
     }
 
     //oto销售工作台-管理员
     default void otoManagerAuth() {
-        network.agentCookies.put(otoManagerCookieKey, otoManagerCookieValue);
+        network.agentCookies.put("otoToken", otoManagerCookieValue);
+    }
+
+    //oto销售工作台-带看人
+    default void otoTakerAuth() {
+        network.agentCookies.put("otoToken", "eTd1Af5HRGuUtkXq6ZtdzRwuMAr15wbxgFdLvd7yBH2P3tUPLtxddZ3PVh7hYvUNEmh2KUB");
     }
 
     //久久保管理员-正常权限模式

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

@@ -36,8 +36,8 @@ public class BasicConfig {
   public static final String dingTalkPath = "https://oapi.dingtalk.com/robot/send?access_token=e6fc528a3a5991ba74d800c9b1688bf5e0f4f88864ec92da777f84c260181407";
 
   /*******OTO销售工作台*********/
-  public  static final String OTO_TKU = "4yrzAfNog7WE527NKCNmqBqph48N7mWR9J49QYysZmKYC3DF97hQFap7RphynF3GFXLhp7GFZ35mc";
-
+//  public  static final String OTO_TKU = "4yrzAfNog7WE527NKCNmqBqph48N7mWR9J49QYysZmKYC3DF97hQFap7RphynF3GFXLhp7GFZ35mc";
+  public  static final String OTO_TKU = "7Fcuh7FWTsTHSqd288vMyjAfN4Jz65xJY9UT76XsXSNJDjNBCoTd8saZJrKzeUKpKUaCyxwdMaoCbh4i7qdQbiiuhvxvhxw7GZ6P5yaWPkx6kp3CTwqww9AzAHJT5GAx941A662pYRtbM4Gkbcm15Dr5";
   // *************** 客集集域名 ***************
   public static final String HOST = "https://kjj.m.duibatest.com.cn";
   public static final String SSO_HOST = "https://sso.duibatest.com.cn";
@@ -113,6 +113,8 @@ public class BasicConfig {
   public static final String MANAGER_custFromSourceList = MANAGER_HOST +"/kjy/manager/oto/common/custFromSourceList";
   public static final String MANAGER_customer_update = MANAGER_HOST +"/kjy/manager/pub/form/customer/update";
   public static final String MANAGER_product_listAll = MANAGER_HOST +"/kjy/manager/oto/product/listAll";
+  public static final String WORK_calendar_updateExpert= MANAGER_HOST + "/kjy/manager/pub/form/customer/updateExpert";
+  public static final String WORK_calendar_expertList= MANAGER_HOST + "/kjy/manager/pub/form/customer/expertList";
 
   //*************** OTO销售工作台 ***************
   public static final String WORK_getCaptcha = WORK_HOST +  "/kjy/oto/manager/auth/captcha";
@@ -171,6 +173,12 @@ public class BasicConfig {
   public static final String WORK_invire= WORK_HOST + "/kjy/oto/customer/invire/record/list";
   public static final String WORK_generate= WORK_HOST + "/kjy/oto/manager/qrcode/generate";
   public static final String WORK_getCallCustInfo= WORK_HOST + "/kjy/oto/manager/customer/call/getCallCustInfo";
+  public static final String WORK_menu_list= WORK_HOST + "/kjy/oto/manager/seller/menu/list";
+  public static final String WORK_calendar_list= WORK_HOST + "/kjy/oto/manager/cust/calendar/list";
+  public static final String WORK_calendar_preAssign= WORK_HOST + "/kjy/oto/manager/cust/calendar/preAssign";
+  public static final String WORK_calendar_nowAssign= WORK_HOST + "/kjy/oto/manager/cust/calendar/nowAssign";
+  public static final String WORK_calendar_workMenu= WORK_HOST + "/kjy/oto/manager/cust/calendar/workMenu";
+  public static final String WORK_calendar_assignRollback= WORK_HOST + "/kjy/oto/manager/cust/calendar/assignRollback";
 
   //*************************客集集营销平台******************************
   public static final String PHONE_bindWxUser = HOST + "/kjy/oto/interview/bindWxUser";

src/test/java/com/oto/utils/BaseUtils.java

@@ -26,6 +26,8 @@ public class BaseUtils {
     public static String otoLeaderCookieValue;
     public static String otoManagerCookieKey;
     public static String otoManagerCookieValue;
+    public static String otoTakerCookieKey;
+    public static String otoTakerCookieValue;
     public static String JJBManagerCookieKey;
     public static String JJBManagerCookieValue;
 
@@ -96,11 +98,10 @@ public class BaseUtils {
 //        otoSellerCookieKey = cookieKeyValue[0];
 //        otoSellerCookieValue = cookieKeyValue[1];
 
-        otoSellerCookieKey = "otoToken";
         otoSellerCookieValue = "64e83LYGbaXYX9EkHumCho2UoHa4LLngpoj9ksrdj5vUiAndSwpeHVxc45qhsXT8a8niiL6oifhdXYR2BvYntaAoj4zRqmExv6eEuMsTfiN";
 
-        network.agentCookies.put(otoSellerCookieKey, otoSellerCookieValue); //存入cookies
-        System.out.println("销售Cookie中key："+ otoSellerCookieKey +" ，values："+ otoSellerCookieValue);
+        network.agentCookies.put("otoToken", otoSellerCookieValue); //存入cookies
+        System.out.println("销售Cookie中key：otoToken" +" ，values："+ otoSellerCookieValue);
     }
 
     /**
@@ -138,11 +139,10 @@ public class BaseUtils {
 //        otoLeaderCookieKey = cookieKeyValue[0];
 //        otoLeaderCookieValue = cookieKeyValue[1];
 
-        otoLeaderCookieKey = "otoToken";
         otoLeaderCookieValue = "64e83LYGbaXYX9EkHumCho2UoHa4LLngtEH3qdP4vZcgziRKzqpEScM6Ea5UdYNEMDstTteXF6yrygqLEsBVdZJ1mKGyZ4cD5dZVM2RqyrK";
 
-        network.agentCookies.put(otoLeaderCookieKey, otoLeaderCookieValue); //存入cookies
-        System.out.println("总监Cookie中key："+ otoLeaderCookieKey +" ，values："+ otoLeaderCookieValue);
+        network.agentCookies.put("otoToken", otoLeaderCookieValue); //存入cookies
+        System.out.println("总监Cookie中key：otoToken" + "，values："+ otoLeaderCookieValue);
     }
 
     /**
@@ -180,11 +180,17 @@ public class BaseUtils {
 //        otoManagerCookieKey = cookieKeyValue[0];
 //        otoManagerCookieValue = cookieKeyValue[1];
 
-        otoManagerCookieKey = "otoToken";
         otoManagerCookieValue = "2hdZyc3Wrhbokz5QFVTnXxxteUrg4U3szFLLQhKruh4Q6eZAVEBcYAKcwDfN5vGk9MNkshTkxpyidEtujMzGw5X5EsNfV1h7kn2bzap2P8baGi";
 
-//        network.agentCookies.put(otoManagerCookieKey, otoManagerCookieValue); //存入cookies
-//        System.out.println("销售Cookie中key："+ otoManagerCookieKey +" ，values："+ otoManagerCookieValue);
+        network.agentCookies.put("otoToken", otoManagerCookieValue); //存入cookies
+        System.out.println("管理员Cookie中key：otoToken"+" ，values："+ otoManagerCookieValue);
+    }
+
+    /**
+     * 专家登录销售工作台
+     */
+    public static void otoExpertLogin(){
+        otoTakerCookieValue = "eTd1Af5HRGuUtkXq6ZtdzRwuMAr1k2Cvo19wspzuZEsY48qVwFBfsmN8fyk9oT9sWj9WU5L";
     }
 
     /**

src/test/java/com/oto/utils/IdMakeUtil.java

@@ -56,14 +56,12 @@ public class IdMakeUtil implements Authorization {
         BaseUtils.ssoLogin();
         Map<String, Object> ids = new HashMap<>();
         ids.put("code", id);
-//        System.out.println("input: "+id);
         Response encodeIdRes = network.getResponse(ids, BasicConfig.MANAGER_ID_ENCODE);
-//        System.out.println("encodeIdRes:  "+encodeIdRes.body().asString());
         String encodeId = encodeIdRes.jsonPath().getString("data");
         Assert.assertNotNull(encodeId, network.message(ids, BasicConfig.MANAGER_ID_ENCODE, "加密id失败", encodeIdRes.body().asString()));
         return encodeId;
     }
-
+    
     public static long managerDecodeingId(String code) {
         BaseUtils.ssoLogin();
         Map<String, Object> decodePar = new HashMap<>();