Merge branch 'master' into feature/20210728-xmc

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

@@ -23,7 +23,7 @@ public interface Authorization {
     /**
      * 集客助手相关授权
      */
-    //代理人
+    //代理人吉吉 sid：2991
     default void agentTku() {
         network.agentCookies.put("tku", AGENT_TKU);
         System.out.println("代理人tku：" + AGENT_TKU);
@@ -44,7 +44,6 @@ public interface Authorization {
         System.out.println("访客tku：" + VISITOR_UserTku);
     }
 
-
     // 获取访客tku：请勿打扰
     default void userTku1() {
         network.agentCookies.put("tku", VISITOR_TKU);

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

+package com.kjj.cases.assistant.pay;
+
+import com.kjj.cases.admin.Authorization;
+import com.kjj.utils.BaseUtils;
+import io.restassured.response.Response;
+import org.apache.commons.lang3.StringUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.kjj.config.BasicConfig.*;
+import static com.kjj.config.BasicConfig.PAY_CALLOUT;
+
+public class Cashback implements Authorization {
+
+    @BeforeClass
+    public void setUp() {
+        userTku();
+    }
+    public String comboId;
+
+    @Test(description = "用户绑定分享关系",priority = 1)
+    public void 用户绑定分享关系() {
+        Map<String, Object> Params = new HashMap<String, Object>();
+        Params.put("fromStr",1);
+        Params.put("inviterSid",2991);
+        Params.put("accessSource",22);
+        Response response = network.getResponse(Params,PAY_distribute);
+        System.out.println(response.body().asString());
+        boolean data=response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(PAY_distribute,"用户绑定失败",response.body().asString()));
+
+    }
+
+    @Test (description = "用户支付后是否有180天打卡权限",priority = 2)
+    public void 用户支付后是否有180天打卡权限() {
+        Response response = network.getResponse(PAY_clockPayInfo);
+        System.out.println(response.body().asString());
+        boolean isClockPay=response.jsonPath().getBoolean("data.isClockPay");
+        Assert.assertFalse(isClockPay,network.message(PAY_clockPayInfo,"有180天打卡权限",response.body().asString()));
+
+    }
+
+    @Test (description = "返现用户付费_微信支付后回调",priority = 3)
+    public void 返现用户付费_微信支付后回调() {
+        //获取付费价格
+        Response actualPayMoneyResponse = network.getResponse(PAY_combo);
+        System.out.println(actualPayMoneyResponse.body().asString());
+        comboId=actualPayMoneyResponse.jsonPath().getString("data[0].id");
+        Assert.assertNotNull(comboId,network.message(PAY_combo,"套餐ID为null",actualPayMoneyResponse.body().asString()));
+        String actualPayMoney = actualPayMoneyResponse.jsonPath().getString("data[0].actualPayMoney");
+        Assert.assertEquals(actualPayMoney,"365",network.message(PAY_combo,"获取付费价格:价格不是365",actualPayMoneyResponse.body().asString()));
+
+        //创建支付
+        Map<String, Object> payParams = new HashMap<String, Object>();
+        payParams.put("userVersion", 2); // 1 通用版 2 保险版
+        payParams.put("comboId", comboId);
+        payParams.put("oaId", "1");
+        payParams.put("paySource", "2");
+        Response response = network.postResponse(payParams, PAY_create);
+        String tradeNo = response.jsonPath().getString("data.tradeNo");
+
+        // mock微信回调失败
+        Map<String, Object> callbackParams = new HashMap<String, Object>();
+        callbackParams.put("tradeNo", tradeNo);
+        callbackParams.put("payResult", true);
+        callbackParams.put("payTradeNo", "test");
+        response = network.getResponse(callbackParams, PAY_CALLOUT);
+        boolean result = response.jsonPath().getBoolean("data");
+        response.body().prettyPrint();
+        Assert.assertTrue(result, network.message(callbackParams, PAY_CALLOUT, "mock微信支付回调成功,但我们订单处理失败", response.body().asString()));
+
+
+    }
+
+    @Test(description = "获取用户版本信息",priority = 4)
+    public void 获取用户版本信息() {
+        agentTku();
+        Response response = network.getResponse(USER_INFO);
+        System.out.println(response.body().asString());
+        boolean isInsuranceVersion=response.jsonPath().getBoolean("data.isInsuranceVersion");
+        Assert.assertTrue(isInsuranceVersion,network.message(USER_INFO,"不是保险版本",response.body().asString()));
+
+    }
+
+
+
+    @Test(description = "邀请的好友列表",priority = 5)
+    public void 邀请的好友列表() {
+        agentTku();
+        Map<String, Object> Params = new HashMap<String, Object>();
+        Params.put("distributionListType",1);
+        Params.put("pageIndex",1);
+        Params.put("pageSize",10);
+        Response response = network.getResponse(Params,PAY_distributionList);
+        System.out.println(response.body().asString());
+        Object list=response.jsonPath().getJsonObject("data.list");
+        Assert.assertNotNull(list,network.message(PAY_distributionList,"待付款好友列表为null",response.body().asString()));
+
+        Params.put("distributionListType",2);
+        response = network.getResponse(Params,PAY_distributionList);
+        System.out.println(response.body().asString());
+        Object list1=response.jsonPath().getJsonObject("data.list");
+        Assert.assertNotNull(list1,network.message(PAY_distributionList,"已付款好友列表为null",response.body().asString()));
+
+
+
+    }
+
+    @Test(description = "代理人账户信息",priority = 6)
+    public void 代理人账户信息() {
+        agentTku();
+        Response response = network.getResponse(PAY_accInfo);
+        System.out.println(response.body().asString());
+        double balance=Double.parseDouble(response.jsonPath().getString("data.balance"));
+        Assert.assertTrue(balance>0,network.message(PAY_accInfo,"当前余额为0",response.body().asString()));
+        double totalPromotionEarnings=Double.parseDouble(response.jsonPath().getString("data.totalPromotionEarnings"));
+        Assert.assertTrue(totalPromotionEarnings>0,network.message(PAY_accInfo,"总收益为0",response.body().asString()));
+        double settleMoney=Double.parseDouble(response.jsonPath().getString("data.settleMoney"));
+        Assert.assertTrue(settleMoney>0,network.message(PAY_accInfo,"待结算金额为0",response.body().asString()));
+        int canWithdraw=response.jsonPath().getInt("data.canWithdraw");
+        Assert.assertTrue(canWithdraw==1,network.message(PAY_accInfo,"不可以提现",response.body().asString()));
+        int minWithdrawMoney=response.jsonPath().getInt("data.minWithdrawMoney");
+        Assert.assertTrue(minWithdrawMoney==1,network.message(PAY_accInfo,"最小可提现金额不等于1",response.body().asString()));
+        int maxWithdrawMoney=response.jsonPath().getInt("data.maxWithdrawMoney");
+        Assert.assertTrue(maxWithdrawMoney==5000,network.message(PAY_accInfo,"最大可提现金额不等于5000",response.body().asString()));
+
+
+    }
+
+    @Test(description = "代理人账户明细",priority = 7)
+    public void 代理人账户明细() {
+        agentTku();
+        Map<String, Object> Params = new HashMap<String, Object>();
+        Params.put("type", 1);
+        Params.put("pageNo", 1);
+        Params.put("pageSize", 20);
+        Response response = network.getResponse(Params, PAY_accDetail);
+        System.out.println(response.body().asString());
+        int changeType = response.jsonPath().getInt("data[0].changeType");
+        Assert.assertTrue(changeType ==1, network.message(PAY_accDetail, "提现记录为null", response.body().asString()));
+
+        Params.put("type", 2);
+        response = network.getResponse(Params, PAY_accDetail);
+        System.out.println(response.body().asString());
+        int changeType1 = response.jsonPath().getInt("data[0].changeType");
+        Assert.assertTrue(changeType1 ==2, network.message(PAY_accDetail, "收益明细为null", response.body().asString()));
+
+
+
+    }
+
+    @Test(description = "代理人提现",priority = 8)
+    public void 代理人提现() {
+        agentTku();
+        Map<String, Object> Params = new HashMap<String, Object>();
+        Params.put("withdrawMoney", 1);
+        Response response = network.getResponse(Params, PAY_withdraw);
+        System.out.println(response.body().asString());
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(PAY_withdraw, "提现失败", response.body().asString()));
+
+
+    }
+
+    }

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

@@ -23,7 +23,6 @@ public class Pay implements Authorization {
     public void setUp() {
         BaseUtils.ssoLogin();
         agentTku();
-        userTku();
 
     }
     public String comboId;

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

@@ -80,7 +80,6 @@ public class BasicConfig {
     public static final String sids = "Kj21MjMwNTU";
     // 访客(SuYi) userID：4425
     public static String VISITOR_UserTku = "T3gM31f18jAW2hicRDxbwHFSuwA4MMVLLeHZ5G4yvb3sz6YRdcqKfzRJ8dMnfqDmgS8EprRjhFpXPFLBvp";
-
     // 钉钉机器人 线上-告警群
     public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2";
 
@@ -625,8 +624,12 @@ public class BasicConfig {
     public static final String PAY_isRenewCondition= HOST + "/kjy/mp/combo/isRenewCondition";
     public static final String MANAGER_typeList = MANAGER_HOST + "/kjy/manager/promotionCode/typeList";
     public static final String MANAGER_batchCreateV2 = MANAGER_HOST + "/kjy/manager/promotionCode/batchCreateV2";
-
-
+    public static final String PAY_distribute = HOST + "/kjy/sp/visitorPayment/distribute";
+    public static final String PAY_clockPayInfo = HOST + "/kjy/mp/combo/clockPayInfo";
+    public static final String PAY_accInfo = HOST + "/kjy/sp/seller/acc/info";
+    public static final String PAY_distributionList = HOST + "/kjy/sp/seller/distributionList";
+    public static final String PAY_accDetail = HOST + "/kjy/sp/seller/acc/detail";
+    public static final String PAY_withdraw = HOST + "/kjy/sp/seller/acc/withdraw";
 
     // ***************   名片  ***************
     public static final String SELLERCARD_topOfDetail = HOST + "/kjy/mp/sellerCardV5/topOfDetail";

src/test/wechatTestNG.xml

@@ -4,7 +4,12 @@
 
     <test preserve-order="true" name="支付">
         <classes>
-            <class name="com.kjj.cases.assistant.Pay"/>
+            <class name="com.kjj.cases.assistant.pay.Pay"/>
+        </classes>
+    </test>
+    <test preserve-order="true" name="邀请返现">
+        <classes>
+            <class name="com.kjj.cases.assistant.pay.Cashback"/>
         </classes>
     </test>
     <test preserve-order="true" name = "首页">