Commit c5c32ef1 authored by 张艳玲's avatar 张艳玲

Merge branch 'featrue/20210702-zhangyl' into 'master'

update

See merge request test-group/kejiji!58
parents b8d7bf77 a3c73421
...@@ -765,19 +765,35 @@ public class SaveLive implements Authorization { ...@@ -765,19 +765,35 @@ public class SaveLive implements Authorization {
Assert.assertTrue(data1, network.message(saveGuessParam, BasicConfig.MANAGER_saveOrUpdate1, "新增猜数字红包失败", guessRes.body().asString())); Assert.assertTrue(data1, network.message(saveGuessParam, BasicConfig.MANAGER_saveOrUpdate1, "新增猜数字红包失败", guessRes.body().asString()));
//瓜分金额 //瓜分金额
Map<String, Object> sumAmountParam = new HashMap<>(); Map<String, Object> partitionParam = new HashMap<>();
sumAmountParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); partitionParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
sumAmountParam.put("redAmount", 88); partitionParam.put("guessLeastTime", 4);
sumAmountParam.put("redRealNum", 1); partitionParam.put("guessMinNum", 1);
sumAmountParam.put("redShowNum", 1); partitionParam.put("guessMaxNum", 10);
sumAmountParam.put("guessMinNum", 1); partitionParam.put("realSumAmount", 1000);
sumAmountParam.put("guessMaxNum", 10); partitionParam.put("redRealNum", 33);
sumAmountParam.put("guessLeastTime", 4); partitionParam.put("showSumAmount", 1000);
sumAmountParam.put("sendType", 1); partitionParam.put("sendType", 2);
Response sumAmountRes = network.postResponse(sumAmountParam, BasicConfig.MANAGER_saveOrUpdate1); Response sumAmountRes = network.postResponse(partitionParam, BasicConfig.MANAGER_saveOrUpdate1);
boolean data2 = sumAmountRes.jsonPath().getBoolean("data"); boolean data2 = sumAmountRes.jsonPath().getBoolean("data");
System.out.println(data2); System.out.println(data2);
Assert.assertTrue(data2, network.message(sumAmountParam, BasicConfig.MANAGER_saveOrUpdate1, "新增猜数字红包失败", sumAmountRes.body().asString())); Assert.assertTrue(data2, network.message(partitionParam, BasicConfig.MANAGER_saveOrUpdate1, "新增猜数字红包失败", sumAmountRes.body().asString()));
//瓜分金额手气王
Map<String, Object> redParam = new HashMap<>();
redParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
redParam.put("guessLeastTime", 2);
redParam.put("guessMinNum", 1);
redParam.put("guessMaxNum", 3);
redParam.put("luckAmount", 10000);
redParam.put("realSumAmount", 1000);
redParam.put("redRealNum", 33);
redParam.put("showSumAmount", 10000);
redParam.put("sendType", 2);
Response redRes = network.postResponse(redParam, BasicConfig.MANAGER_saveOrUpdate1);
boolean data3 = redRes.jsonPath().getBoolean("data");
System.out.println(data3);
Assert.assertTrue(data3, network.message(redParam, BasicConfig.MANAGER_saveOrUpdate1, "新增猜数字红包失败", redRes.body().asString()));
} }
...@@ -817,7 +833,7 @@ public class SaveLive implements Authorization { ...@@ -817,7 +833,7 @@ public class SaveLive implements Authorization {
updateParam.put("guessMaxNum", 10); updateParam.put("guessMaxNum", 10);
updateParam.put("guessLeastTime", 4); updateParam.put("guessLeastTime", 4);
updateParam.put("sendType", 1); updateParam.put("sendType", 1);
updateParam.put("confId", this.confId.get(2).getConfId()); updateParam.put("confId", this.confId.get(0).getConfId());
Response response = network.postResponse(updateParam, BasicConfig.MANAGER_saveOrUpdate1); Response response = network.postResponse(updateParam, BasicConfig.MANAGER_saveOrUpdate1);
boolean data = response.jsonPath().getBoolean("data"); boolean data = response.jsonPath().getBoolean("data");
System.out.println(data); System.out.println(data);
...@@ -830,7 +846,7 @@ public class SaveLive implements Authorization { ...@@ -830,7 +846,7 @@ public class SaveLive implements Authorization {
public void 删除猜数字红包() { public void 删除猜数字红包() {
Map<String, Object> delParam = new HashMap<>(); Map<String, Object> delParam = new HashMap<>();
delParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey())); delParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
delParam.put("confId", this.confId.get(2).getConfId()); delParam.put("confId", this.confId.get(0).getConfId());
Response response = network.postResponse(delParam, BasicConfig.MANAGER_del_1); Response response = network.postResponse(delParam, BasicConfig.MANAGER_del_1);
boolean data = response.jsonPath().getBoolean("data"); boolean data = response.jsonPath().getBoolean("data");
System.out.println(data); System.out.println(data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment