Merge branch 'master' into feature/20210804-xmc

src/test/java/com/kjj/cases/assistant/markettools/GameLottery.java

@@ -209,7 +209,7 @@ public class GameLottery implements Authorization {
         prizeDetails.add(prizeDetail);
         //奖品列表
         params.put("scid",scid);
-        params.put("pageTitle","来抽奖吧");
+        params.put("pageTitle","指定中奖抽奖转盘自动化测试");
         params.put("prizeDetails",prizeDetails);
         System.out.println(JSON.toJSONString(params));
         Response response = network.postResponse(params, LOTTERRY_saveOrUpdateConf);
@@ -484,7 +484,7 @@ public class GameLottery implements Authorization {
         prizeDetails.add(prizeDetail);
         //奖品列表
         params.put("scid",rateScid);
-        params.put("pageTitle","来抽奖吧");
+        params.put("pageTitle","概率中奖抽奖转盘自动化测试");
         params.put("prizeDetails",prizeDetails);
         System.out.println(JSON.toJSONString(params));
         response = network.postResponse(params, LOTTERRY_saveOrUpdateConf);
@@ -510,6 +510,15 @@ public class GameLottery implements Authorization {
         Assert.assertTrue(success,network.message(params,CONTENT_READ,"接口返回失败",response.body().asString()));
         Assert.assertNotNull(data,network.message(params,CONTENT_READ,"获取访问贺卡记录失败",response.body().asString()));
 
+        params.clear();
+        params.put("scid",rateScid);
+        params.put("forwardTime",System.currentTimeMillis());
+        response = network.postResponse(params, DYNAMIC_addVisit);
+        success = response.jsonPath().getBoolean("success");
+        data = response.jsonPath().getJsonObject("data");
+        Assert.assertTrue(success,network.message(params,DYNAMIC_addVisit,"接口返回失败",response.body().asString()));
+        Assert.assertNotNull(data,network.message(params, DYNAMIC_addVisit,"接口返回数据为空",response.body().asString()));
+
         //抽奖
         params.clear();
         params.put("scid",rateScid);

src/test/java/com/kjj/cases/assistant/markettools/GreetingCrad.java

@@ -6,8 +6,7 @@ import com.kjj.utils.JsonUtil;
 import com.kjj.utils.NetworkUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -133,7 +132,7 @@ public class GreetingCrad implements Authorization{
         Assert.assertNotNull(data,network.message(params,GREETING_findByType,"返回数据为空",response.body().asString()));
 
         int size = response.jsonPath().getInt("data.list.size()");
-        Assert.assertTrue(size>0,network.message(params,GREETING_findByType,"贺卡列表为空",response.body().asString()));
+        Assert.assertTrue(size>0,network.message(params,GREETING_findByType,"标签列表为空",response.body().asString()));
     }
 
     @Test(description = "代理人_获取当前用户关注公众号类型",priority = 9)

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

@@ -620,6 +620,9 @@ public class BasicConfig {
     public static final String WEEKLY_LIST = HOST + "/kjy/mp/seller/weekly/list";
     public static final String NEWFUNC_FIRSTVISIT = HOST + "/kjy/mp/newFunction/sellerFirstVisit";
 
+    public static final String QRCODE_create=  HOST + "/kjy/mp/qrcode/create";
+    public static final String UPLOAD_image=  HOST + "/kjy/mp/upload/image";
+    public static final String DYNAMIC_addVisit=  HOST + "/kjy/mp/seller/dynamic/addVisit";
 
     // ***************   支付  ***************
     public static final String PAY_getMiddleDetail = HOST + "/kjy/mp/payMiddle/getMiddleDetail";
@@ -824,6 +827,19 @@ public class BasicConfig {
     public static final String HOME_findPosterById = HOST + "/kjy/mp/posterTemplate/findPosterById";
     public static final String HOME_getExclusiveArea = HOST + "/kjy/mp/classify/getExclusiveArea";
 
+    //******************个人中心**********************
+    public static final String USINGSTRATAGY_index = HOST + "/kjy/mp/usingStrategy/index";
+    public static final String USINGSTRATAGY_strategyList = HOST + "/kjy/mp/usingStrategy/strategyList";
+    public static final String USINGSTRATAGY_faqDetail = HOST + "/kjy/mp/usingStrategy/faqDetail";
+    public static final String USINGSTRATAGY_useful = HOST + "/kjy/mp/usingStrategy/useful";
+    public static final String USINGSTRATAGY_strategyDetail = HOST + "/kjy/mp/usingStrategy/strategyDetail";
+    public static final String USINGSTRATAGY_successCaseDetail = HOST + "/kjy/mp/usingStrategy/successCaseDetail";
+    public static final String PUSH_list = HOST + "/kjy/mp/seller/push/list";
+    public static final String PUSH_switch = HOST + "/kjy/mp/seller/push/switch";
+    public static final String PUSH_updateCloseTime = HOST + "/kjy/mp/seller/push/updateCloseTime";
+    public static final String SELLERCARD_getInsuranceConceptConfig = HOST + "/kjy/mp/sellerConfig/getInsuranceConceptConfig";
+    public static final String SELLERCARD_getIncreaseStaffConfig = HOST + "/kjy/mp/sellerConfig/getIncreaseStaffConfig";
+
     // **************  设置中心  ***************
     public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
 
@@ -919,6 +935,23 @@ public class BasicConfig {
     public static final String LOTTERRY_getDrawRecord=  HOST + "/kjy/mp/game/getDrawRecord";
     public static final String LOTTERRY_getDrawWinningRecord=  HOST + "/kjy/mp/game/getDrawWinningRecord";
 
+    //*********************邀请函************************
+    public static final String INViTATION_index=  HOST + "/kjy/mp/invitationLetter/index";
+    public static final String INViTATION_preView=  HOST + "/kjy/mp/invitationLetter/preView";
+    public static final String INViTATION_saveOrUpdate=  HOST + "/kjy/mp/invitationLetter/saveOrUpdate";
+    public static final String INViTATION_getH5ShareInfo=  HOST + "/kjy/mp/invitationLetter/getH5ShareInfo";
+    public static final String INViTATION_savePosterImg=  HOST + "/kjy/mp/invitationLetter/savePosterImg";
+    public static final String INViTATION_view=  HOST + "/kjy/mp/invitationLetter/view";
+    public static final String INViTATION_acceptInvitation=  HOST + "/kjy/mp/invitationLetter/acceptInvitation";
+    public static final String INViTATION_myInvitationLetters = HOST + "/kjy/mp/invitationLetter/myInvitationLetters";
+    public static final String INViTATION_getConfigDetail = HOST + "/kjy/mp/invitationLetter/getConfigDetail";
+    public static final String INViTATION_getViewRecordList = HOST + "/kjy/mp/invitationLetter/getViewRecordList";
+    public static final String INViTATION_getAcceptRecordList = HOST + "/kjy/mp/invitationLetter/getAcceptRecordList";
+
+    //*********************趣味测试************************
+    public static final String GAME_answerPageList = HOST + "/kjy/mp/game/answerPageList";
+    public static final String GAME_clueList = HOST + "/kjy/mp/tag/clue/list";
+
     // *************** 管理后台 ***************
     public static final String SSO_doLogin = SSO_HOST + "/doLogin";
     public static final String MANAGER_adminInfo= MANAGER_HOST + "/kjy/manager/admin/info";

src/test/wechatTestNG.xml

@@ -42,6 +42,7 @@
             <class name="com.kjj.cases.assistant.homePage.Upload"/>
         </classes>
     </test>
+
     <test preserve-order="true" name = "获取访客">
         <classes>
             <class name="com.kjj.cases.assistant.whoSawMe.ForwardAndRead"/>
@@ -72,6 +73,16 @@
             <class name="com.kjj.cases.assistant.markettools.GameLottery"/>
         </classes>
     </test>
+    <test preserve-order="true" name = "邀请函和趣味测评">
+        <classes>
+            <class name="com.kjj.cases.assistant.markettools.InvitationLetter"/>
+        </classes>
+    </test>
+    <test preserve-order="true" name = "使用攻略和设置中心">
+        <classes>
+            <class name="com.kjj.cases.assistant.menu.PersonalCenter"/>
+        </classes>
+    </test>
 </suite>
         <!-- Suite -->