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

修改签到领红包的金额校验，并增加支付中切换版本的还原

See merge request test-group/kejiji!148

src/test/java/com/kjj/cases/assistant/homePage/SignRed.java

@@ -96,7 +96,7 @@ public class SignRed implements Authorization {
             int changeType = response.jsonPath().getInt("data[0].changeType");
             String nickname = response.jsonPath().getString("data[0].nickname");
             int bizType = response.jsonPath().getInt("data[0].bizType");
-            float changeMoney = response.jsonPath().getFloat("data[0].changeMoney");
+            double changeMoney = response.jsonPath().getDouble("data[0].changeMoney");
             Assert.assertEquals(changeType ,2, network.message(PAY_accDetail, "收益明细类型错误", response.body().asString()));
             Assert.assertEquals(nickname, "吉吉",network.message(PAY_accDetail, "签到用户名称错误", response.body().asString()));
             Assert.assertEquals(bizType, 16,network.message(PAY_accDetail, "收益明细类型错误", 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();
-
     }
     public String comboId;
     public long id;
@@ -126,6 +125,13 @@ public class Pay implements Authorization {
         response = network.getResponse(params,version_info);
         userVersion = response.jsonPath().getInt("data.find {it.openType == 1}.userVersion"); // 找出开启状态的版本类型
         Assert.assertEquals(userVersion,changeVersion,network.message(params, version_info,"会员类型版本判断:判断错误，此版本为尊享版",response.body().asString()));
+
+        if(userVersion == 1){//切换回保险专用版
+            versionParams.put("targetVersion",2);
+            response = network.postResponse(versionParams,PAY_exchange);
+            result = response.jsonPath().getString("desc");
+            Assert.assertEquals(result,"OK",network.message(versionParams,PAY_exchange,"会员类型切换:切换失败",response.body().asString()));  //判断返回的微信调起参数中appId是否正确
+        }
     }