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

Feature/20211215 gxh

See merge request test-group/kejiji!195

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

@@ -71,6 +71,11 @@ public interface Authorization {
         network.agentCookies.put(TKU_COOKIE_NAME, VISITOR1_TKU);
         System.out.println("访客三tku：" + VISITOR1_TKU);
     }
+    // 获取访客tku：向日葵
+    default void userTku3() {
+        network.agentCookies.put(TKU_COOKIE_NAME, VISITOR2_TKU);
+        System.out.println("访客四tku：" + VISITOR2_TKU);
+    }
 
     // 获取访客tku：小葡萄
     default void newUser1() {

src/test/java/com/kjj/cases/assistant/pay/Cashback.java

@@ -52,6 +52,7 @@ public class Cashback implements Authorization {
             throwables.printStackTrace();
         }
     }
+
     @Test(description = "一级用户绑定分享合伙人关系",priority = 1)
     public void 一级用户绑定分享合伙人关系() {
         newUser1();
@@ -66,7 +67,7 @@ public class Cashback implements Authorization {
         boolean bindResult=response.jsonPath().getBoolean("data.bindResult");
         Assert.assertTrue(bindResult,network.message(PAY_bind,"用户绑定失败",response.body().asString()));
     }
-
+//
     @Test (description = "默认付费_一级用户邀请付费页",priority = 2) //priority 方法执行优先级
     public void 默认付费_一级用户邀请付费页()  {
         //代理人续费状态

src/test/java/com/kjj/cases/assistant/pay/Pay.java

@@ -99,7 +99,7 @@ public class Pay implements Authorization {
         int data = response.jsonPath().getInt("data");
         Assert.assertEquals(data,5,network.message(cancelParams, PAY_result,"取消支付：取消支付失败",response.body().asString()));  //判断返回的微信调起参数中appId是否正确
     }
-//
+
     @Test (description = "创建优惠码",priority = 9)
     public void 创建优惠码 () {
         //优惠码类型列表
@@ -127,15 +127,15 @@ public class Pay implements Authorization {
 
     @Test (description = "优惠券_优惠码绑定",priority = 10)
     public void 优惠券_优惠码绑定 () {
-        agentTku();
+        userTku3();
         //吉吉切换非会员
-        updateTypeOrDate(2991,false);
+        updateTypeOrDate(207,false);
         //绑定优惠码
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("sellerId",2991);
+        params.put("sellerId",207);
         params.put("promId",id);
-        params.put("openId","osi5w5ggFiEXk0tPJH9b0KO_XU08");
-        params.put("userId",5495);
+        params.put("openId","osi5w5qvNVe8sWzVitVDZVdUkoZ8");
+        params.put("userId",359);
         params.put("oaId",1);
         params.put("scene",2);
         Response response = network.postResponse(params,PAY_distribute);
@@ -152,7 +152,7 @@ public class Pay implements Authorization {
         codeListParam.put("pageSize",20);
         response =network.getResponse(codeListParam,MANAGER_codeList);
         String nickName=response.jsonPath().getString("data.list[0].nickName");
-        Assert.assertEquals(nickName,"吉吉",network.message(params, PAY_distribute,"用户绑定失败",response.body().asString()));
+        Assert.assertEquals(nickName,"向日葵",network.message(params, PAY_distribute,"用户绑定失败",response.body().asString()));
     }
 
     @Test (description = "默认付费_优惠码付费页",priority = 11) //priority 方法执行优先级