Skip to content

O
oto
Commit 978cc6c3 authored by xiamengchen's avatar xiamengchen
Browse files
Options

更新团队任务部分

parent cc53b4de
Hide whitespace changes
Inline Side-by-side
Showing with 277 additions and 15 deletions
src/test/java/com/kjj/bean/whoSawMe/MyTaskList.java 0 → 100644
View file @ 978cc6c3
package com.kjj.bean.whoSawMe;
import lombok.Data;
@Data
public class MyTaskList {
private int taskId;
private String contentId;
private int taskStatus;
}
src/test/java/com/kjj/bean/whoSawMe/TeamTaskList.java 0 → 100644
View file @ 978cc6c3
package com.kjj.bean.whoSawMe;
import lombok.Data;
@Data
public class TeamTaskList {
private String contentId;
private int id;
private int taskAchieverNum;
private int taskStatus;
private int taskTargetNum;
}
src/test/java/com/kjj/cases/assistant/whoSawMe/MyCustomer.java
View file @ 978cc6c3
......@@ -24,7 +24,7 @@ public class MyCustomer implements Authorization {
private String createTagId;
private long visitor1UserId;
private String sessionId;
private int visitCount; // 二次访客来访次数
private int visitCount; // 二度访客来访次数
private String id; // 自定义提醒事项id
private long lastMessageId;
......@@ -57,7 +57,7 @@ public class MyCustomer implements Authorization {
}
// 消息通知页_对话记录
@Test(description = "消息通知页_对话记录", priority = 99)
@Test(description = "消息通知页_对话记录", priority = 51)
public void 消息通知页_对话记录() throws IOException{
param = new HashMap<>();
param.put("pageIndex", 1);
......@@ -893,8 +893,8 @@ public class MyCustomer implements Authorization {
}
// 还原用户信息
@AfterClass
public void tearDown() throws IOException{
@Test(description = "还原用户详细信息", priority = 55)
public void 还原用户详细信息() throws IOException{
// 关闭生日提醒
param = new HashMap<>();
param.put("birthRemind", false);
......
src/test/java/com/kjj/cases/assistant/whoSawMe/WhoSawMe.java
View file @ 978cc6c3
package com.kjj.cases.assistant.whoSawMe;
import com.beust.jcommander.internal.Lists;
import com.kjj.bean.whoSawMe.MyTaskList;
import com.kjj.bean.whoSawMe.RankingList;
import com.kjj.bean.whoSawMe.TeamTaskList;
import com.kjj.bean.whoSawMe.WeeklyList;
import com.kjj.cases.admin.Authorization;
import com.kjj.config.BasicConfig;
......@@ -31,6 +33,8 @@ public class WhoSawMe implements Authorization {
private String tagId0;
private String weeklyPublicationId;
private String scid; // 代理人周报scid
private String taskArticleContentId; // 任务素材contentId
private int taskId;
@BeforeClass
public void setUp() throws IOException {
......@@ -449,8 +453,243 @@ public class WhoSawMe implements Authorization {
Assert.assertFalse(hasSuperior, network.message(param, BasicConfig.BOSS_ROLE, "成员仍有上级", response.body().asString()));
}
// 团队任务_新建任务
@Test(description = "团队任务_新建任务_选择素材", priority = 30)
public void 团队任务_新建任务_选择素材() throws IOException{
param.clear();
param.put("contentType", "article");
param.put("pageIndex", 1);
param.put("pageSize", 20);
response = network.getResponse(param, BasicConfig.FINDPAGEBYCONTENTTYPE);
int totalCount = response.jsonPath().getInt("data.totalCount");
Assert.assertTrue(totalCount >= 1, network.message(param, BasicConfig.FINDPAGEBYCONTENTTYPE, "素材列表无内容", response.body().asString()));
taskArticleContentId = response.jsonPath().getString("data.list[0].contentId");
}
@Test(description = "团队任务_新建任务_创建任务", priority = 31)
public void 团队任务_新建任务_创建任务() throws IOException{
// 获取选择素材的scId
String scid = far.getContentScId(taskArticleContentId);
param.clear();
param.put("scid", scid);
response = network.postResponse(param, BasicConfig.BOSS_CREATE);
taskId = response.jsonPath().getInt("data");
}
@Test(description = "团队任务_新建任务_获取可推送成员", priority = 32)
public void 团队任务_新建任务_获取可推送成员() throws IOException{
param.clear();
param.put("pageIndex", 1);
param.put("pageSize", 20);
param.put("sellerId", xxxSellerId);
response = network.getResponse(param, BasicConfig.TEAMMEMBER);
int totalCount = response.jsonPath().getInt("data.totalCount");
String sellerId = response.jsonPath().getString("data.list[0].sellerId");
Assert.assertEquals(totalCount, 1, network.message(param, BasicConfig.TEAMMEMBER, "可推送成员数不正确", response.body().asString()));
Assert.assertEquals(sellerId, far.encodeId(jjSellerId), network.message(param, BasicConfig.TEAMMEMBER, "可推送成员sellerId错误", response.body().asString()));
}
@Test(description = "团队任务_新建任务_获取任务详情", priority = 33)
public void 团队任务_新建任务_获取任务详情() throws IOException{
param.clear();
param.put("taskId", taskId);
response = network.getResponse(param, BasicConfig.BOSS_DETAIL);
String contentId = response.jsonPath().getString("data.contentId");
int taskStatus = response.jsonPath().getInt("data.taskStatus");
Assert.assertEquals(contentId, taskArticleContentId, network.message(param, BasicConfig.BOSS_DETAIL, "任务素材Id有误", response.body().asString()));
Assert.assertEquals(taskStatus, 0, network.message(param, BasicConfig.BOSS_DETAIL, "任务状态有误", response.body().asString()));
}
@Test(description = "团队任务_推送任务", priority = 34)
public void 团队任务_推送任务() throws IOException{
List<String> sellerIds = new ArrayList<>();
sellerIds.add(far.encodeId(jjSellerId));
param.clear();
param.put("effectiveDuration", 7); // 任务有效期7天
param.put("isAllMen", false);
param.put("sellerIds", sellerIds); // 指定指派成员
param.put("superiorIds", new ArrayList<>());
param.put("taskId", taskId);
response = network.postResponse(param, BasicConfig.BOSS_PUBLISH);
boolean data = response.jsonPath().getBoolean("data");
Assert.assertTrue(data, network.message(param, BasicConfig.BOSS_PUBLISH, "任务推送失败", response.body().asString()));
}
@Test(description = "团队任务_查看发布任务列表_未完成", priority = 35)
public void 团队任务_查看发布任务列表_未完成() throws IOException{
param.clear();
param.put("pageSize", 20);
param.put("taskStatus", 1);
response = network.getResponse(param, BasicConfig.BOSS_TEAMTASKLIST);
int totalCount = response.jsonPath().getInt("data.totalCount");
Assert.assertEquals(totalCount, 1, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "未完成任务数量有误", response.body().asString()));
List<TeamTaskList> teamTaskLists = JsonUtil.parseResponseToPageBean(response, TeamTaskList.class);
for (TeamTaskList teamTaskList: teamTaskLists){
Assert.assertEquals(teamTaskList.getTaskStatus(), 1, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "未完成任务列表中存在非未完成状态记录", response.body().asString()));
}
int taskId1 = teamTaskLists.get(0).getId();
int taskAchieverNum = teamTaskLists.get(0).getTaskAchieverNum();
Assert.assertEquals(taskId1, taskId, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "任务id错误", response.body().asString()));
Assert.assertEquals(taskAchieverNum, 0, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "任务完成人数不为0", response.body().asString()));
}
@Test(description = "团队任务_未完成任务详细", priority = 36)
public void 团队任务_未完成任务详细() throws IOException{
// 判断是否开启了演示数据
response = network.getResponse(BasicConfig.BOSS_ISDEMO);
boolean data = response.jsonPath().getBoolean("data");
Assert.assertFalse(data, network.message(BasicConfig.BOSS_ISDEMO, "演示数据已开启", response.body().asString()));
// 未完成列表
param.clear();
param.put("taskId", taskId);
param.put("pageSize", 20);
param.put("type", 1);
response = network.getResponse(param, BasicConfig.BOSS_RECEIVERLIST);
int totalCount = response.jsonPath().getInt("data.totalCount");
List<Object> list = response.jsonPath().getList("data.list");
Assert.assertEquals(totalCount, 1, network.message(param, BasicConfig.BOSS_RECEIVERLIST, "未完成人数有误", response.body().asString()));
// 已完成列表
param.clear();
param.put("taskId", taskId);
param.put("pageSize", 20);
param.put("type", 2);
response = network.getResponse(param, BasicConfig.BOSS_RECEIVERLIST);
totalCount = response.jsonPath().getInt("data.totalCount");
list = response.jsonPath().getList("data.list");
Assert.assertEquals(totalCount, 0, network.message(param, BasicConfig.BOSS_RECEIVERLIST, "已完成人数不为0", response.body().asString()));
Assert.assertEquals(list.size(), 0, network.message(param, BasicConfig.BOSS_RECEIVERLIST, "已完成列表非空", response.body().asString()));
}
// 下级代理人完成任务
@Test(description = "接受任务_检查新任务", priority = 36)
public void 接受任务_检查新任务() throws IOException{
// 切换到下级代理人
network.agentCookies.put("tku", BasicConfig.AGENT_TKU);
response = network.getResponse(BasicConfig.HASNEWTASK);
boolean data = response.jsonPath().getBoolean("data");
Assert.assertTrue(data, network.message(BasicConfig.HASNEWTASK, "未检查到新任务", response.body().asString()));
}
@Test(description = "接受任务_我的任务_头部信息", priority = 37)
public void 接受任务_我的任务_头部信息() throws IOException{
response = network.getResponse(BasicConfig.MYTASKHEADER);
int incompleteTaskNum = response.jsonPath().getInt("data.incompleteTaskNum");
Assert.assertEquals(incompleteTaskNum, 1, network.message(BasicConfig.MYTASKHEADER, "未完成任务数错误", response.body().asString()));
}
@Test(description = "接受任务_我的任务_未完成任务列表", priority = 38)
public void 接受任务_我的任务_未完成任务列表() throws IOException{
param.clear();
param.put("pageSize", 20);
param.put("type", 1);
response = network.getResponse(param, BasicConfig.MYTASKLIST);
int totalCount = response.jsonPath().getInt("data.totalCount");
Assert.assertEquals(totalCount, 1, network.message(param, BasicConfig.MYTASKLIST, "列表记录数错误", response.body().asString()));
List<MyTaskList> myTaskLists = JsonUtil.parseResponseToPageBean(response, MyTaskList.class);
for (MyTaskList myTaskList : myTaskLists){
Assert.assertEquals(myTaskList.getTaskStatus(), 1, network.message(param, BasicConfig.MYTASKLIST, "未完成任务列表中存在任务状态不正确的记录", response.body().asString()));
}
int taskId1 = myTaskLists.get(0).getTaskId();
String contentId = myTaskLists.get(0).getContentId();
Assert.assertEquals(taskId1, taskId, network.message(param, BasicConfig.MYTASKLIST, "任务ID不正确", response.body().asString()));
Assert.assertEquals(contentId, taskArticleContentId, network.message(param, BasicConfig.MYTASKLIST, "任务素材ID不正确", response.body().asString()));
}
@Test(description = "接受任务_转发素材", priority = 39)
public void 接受任务_转发素材() throws IOException{
// 获取文章scid
String scid = far.getContentScId(taskArticleContentId);
param.clear();
param.put("scId", scid);
param.put("forwardType", 1);
response = network.getResponse(param, BasicConfig.FORWARD);
boolean data = response.jsonPath().getBoolean("data");
Assert.assertTrue(data, network.message(param, BasicConfig.FORWARD, "转发素材失败", response.body().asString()));
}
@Test(description = "接受任务_我的任务_已完成任务列表", priority = 40)
public void 接受任务_我的任务_已完成任务列表() throws IOException{
param.clear();
param.put("pageSize", 20);
param.put("type", 2);
response = network.getResponse(param, BasicConfig.MYTASKLIST);
int totalCount = response.jsonPath().getInt("data.totalCount");
Assert.assertEquals(totalCount, 1, network.message(param, BasicConfig.MYTASKLIST, "列表记录数有误", response.body().asString()));
List<MyTaskList> myTaskLists = JsonUtil.parseResponseToPageBean(response, MyTaskList.class);
for (MyTaskList myTaskList : myTaskLists){
Assert.assertEquals(myTaskList.getTaskStatus(), 2, network.message(param, BasicConfig.MYTASKLIST, "已完成任务列表中存在完成状态不正确的记录", response.body().asString()));
}
int taskId1 = myTaskLists.get(0).getTaskId();
String contentId = myTaskLists.get(0).getContentId();
Assert.assertEquals(taskId1, taskId, network.message(param, BasicConfig.MYTASKLIST, "任务ID不正确", response.body().asString()));
Assert.assertEquals(contentId, taskArticleContentId, network.message(param, BasicConfig.MYTASKLIST, "任务素材ID不正确", response.body().asString()));
// 查看未完成任务列表是否为空
param.clear();
param.put("pageSize", 20);
param.put("type", 1);
response = network.getResponse(param, BasicConfig.MYTASKLIST);
totalCount = response.jsonPath().getInt("data.totalCount");
Assert.assertEquals(totalCount, 0, network.message(param, BasicConfig.MYTASKLIST, "未完成列表不为空", response.body().asString()));
myTaskLists = JsonUtil.parseResponseToPageBean(response, MyTaskList.class);
Assert.assertEquals(myTaskLists.size(), 0, network.message(param, BasicConfig.MYTASKLIST, "未完成列表不为空", response.body().asString()));
// 切换回团队主管理员
network.agentCookies.put("tku", BasicConfig.VISITOR2_TKU);
}
// 团队管理员检查任务完成状态
@Test(description = "团队任务_查看发布任务列表_检查任务完成状态", priority = 41)
public void 团队任务_查看发布任务列表_检查任务完成状态() throws IOException{
// 查看未完成列表
param.clear();
param.put("pageSize", 20);
param.put("taskStatus", 1);
response = network.getResponse(param, BasicConfig.BOSS_TEAMTASKLIST);
List<Object> list = response.jsonPath().getList("data.list");
Assert.assertEquals(list.size(), 0, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "未完成列表不为空", response.body().asString()));
// 查看已完成列表
param.clear();
param.put("pageSize", 20);
param.put("taskStatus", 2);
response = network.getResponse(param, BasicConfig.BOSS_TEAMTASKLIST);
List<TeamTaskList> teamTaskLists = JsonUtil.parseResponseToPageBean(response, TeamTaskList.class);
int id = teamTaskLists.get(0).getId();
int taskAchieverNum = teamTaskLists.get(0).getTaskAchieverNum();
int taskStatus = teamTaskLists.get(0).getTaskStatus();
Assert.assertEquals(id, taskId, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "任务id不匹配", response.body().asString()));
Assert.assertEquals(taskAchieverNum, 1, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "任务完成人数不正确", response.body().asString()));
Assert.assertEquals(taskStatus, 2, network.message(param, BasicConfig.BOSS_TEAMTASKLIST, "任务完成状态不正确", response.body().asString()));
}
@Test(description = "团队任务_查看发布任务列表_查看完成任务详情", priority = 42)
public void 团队任务_查看发布任务列表_查看完成任务详情() throws IOException{
// 已完成任务成员列表
param.clear();
param.put("taskId", taskId);
param.put("pageSize", 20);
param.put("type", 2);
response = network.getResponse(param, BasicConfig.BOSS_RECEIVERLIST);
Long sellerId = response.jsonPath().getLong("data.list[0].sellerId");
Assert.assertEquals(sellerId, jjSellerId, network.message(param, BasicConfig.BOSS_RECEIVERLIST, "已完成成员sellerId错误", response.body().asString()));
// 未完成任务成员列表
param.clear();
param.put("taskId", taskId);
param.put("pageSize", 20);
param.put("type", 1);
response = network.getResponse(param, BasicConfig.BOSS_RECEIVERLIST);
List<Object> list = response.jsonPath().getList("data.list");
Assert.assertEquals(list.size(), 0, network.message(param, BasicConfig.BOSS_RECEIVERLIST, "未完成列表不为空", response.body().asString()));
}
// 查看今日转发素材列表
@Test(description = "查看今日转发素材列表", priority = 30)
@Test(description = "查看今日转发素材列表", priority = 43)
public void 查看转发素材列表() throws IOException{
param = new HashMap<>();
param.put("sellerId", xxxSellerId);
......@@ -464,7 +703,7 @@ public class WhoSawMe implements Authorization {
}
// 查看转发名片记录列表
@Test(description = "查看转发名片记录列表", priority = 31)
@Test(description = "查看转发名片记录列表", priority = 44)
public void 查看转发名片记录列表() throws IOException{
param = new HashMap<>();
param.put("sellerId", xxxSellerId);
......@@ -477,7 +716,7 @@ public class WhoSawMe implements Authorization {
}
// 使用工具
@Test(description = "使用工具", priority = 32)
@Test(description = "使用工具", priority = 45)
public void 使用工具() throws IOException{
// 生成抽奖转盘素材scId
String lottery_scId = far.getContentScId(BasicConfig.LOTTERY_CONTENTID);
......@@ -492,7 +731,7 @@ public class WhoSawMe implements Authorization {
}
// 查看使用工具记录列表
@Test(description = "查看使用工具记录列表", priority = 33)
@Test(description = "查看使用工具记录列表", priority = 46)
public void 查看使用工具记录列表() throws IOException{
param = new HashMap<>();
param.put("sellerId", xxxSellerId);
......@@ -506,7 +745,7 @@ public class WhoSawMe implements Authorization {
}
// 查看获得线索记录列表
@Test(description = "查看获得线索记录列表", priority = 34)
@Test(description = "查看获得线索记录列表", priority = 47)
public void 查看获得线索记录列表() throws IOException{
param = new HashMap<>();
param.put("sellerId", xxxSellerId);
......@@ -520,7 +759,7 @@ public class WhoSawMe implements Authorization {
}
// 查看转发动态访问列表
@Test(description = "查看转发素材访问列表", priority = 35)
@Test(description = "查看转发素材访问列表", priority = 48)
public void 查看转发素材访问列表() throws IOException{
// 获取首条素材列表中首条动态id
param = new HashMap<>();
......@@ -541,7 +780,7 @@ public class WhoSawMe implements Authorization {
}
// 销售线索_新线索引导
@Test(description = "销售线索详情_新线索引导", priority = 36)
@Test(description = "销售线索详情_新线索引导", priority = 49)
public void 销售线索详情_新线索引导() throws IOException{
param = new HashMap<>();
param.put("guideType", 34);
......@@ -551,7 +790,7 @@ public class WhoSawMe implements Authorization {
}
// 销售线索_线索详情
@Test(description = "销售线索_线索详情", priority = 37)
@Test(description = "销售线索_线索详情", priority = 50)
public void 销售线索_线索详情() throws IOException{
param = new HashMap<>();
param.put("clueId", clueId);
......@@ -566,7 +805,7 @@ public class WhoSawMe implements Authorization {
}
// 销售线索_跟进建议
@Test(description = "销售线索_跟进建议", priority = 38)
@Test(description = "销售线索_跟进建议", priority = 51)
public void 销售线索_跟进建议() throws IOException{
param = new HashMap<>();
param.put("clueId", clueId);
......@@ -577,7 +816,7 @@ public class WhoSawMe implements Authorization {
}
// 管理客户信息
@Test(description = "管理客户信息", priority = 39)
@Test(description = "管理客户信息", priority = 52)
public void 管理客户信息() throws IOException{
List<String> tagIds = Lists.newArrayList();
tagIds.add(tagId0);
......@@ -592,7 +831,7 @@ public class WhoSawMe implements Authorization {
}
// 销售线索_获取访客管理信息
@Test(description = "销售线索_获取访客管理信息", priority = 40)
@Test(description = "销售线索_获取访客管理信息", priority = 53)
public void 销售线索_获取访客管理信息() throws IOException{
String encodeUserId = far.encodeId(xxrUserId);
param = new HashMap<>();
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ 978cc6c3
......@@ -764,6 +764,7 @@ public class BasicConfig {
public static final String RELATIONINFO_LIST = HOST + "/kjy/mp/seller/customer/getRelationInfoList";
public static final String RELATIONINFO_RANKING = HOST + "/kjy/mp/seller/customer/relation/ranking";
public static final String UPDATECUSTMATERIAL = HOST + "/kjy/mp/seller/v2/customer/material/saveOrUpdate";
public static final String DELWINNER = HOST + "/kjy/mp/seller/delWinner";
// *************** 标签管理 ***************
public static final String TAG_ADDORUPDATE = HOST + "/kjy/mp/sellerTag/addOrUpdateTag";
public static final String TAG_GETLIST = HOST + "/kjy/mp/sellerTag/getTagList";
......
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