diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 5e06aa7..5d471ae 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -15014242835 \ No newline at end of file +13416472917 \ No newline at end of file diff --git a/1-Applet/4-Invite/Invite.robot b/1-Applet/4-Invite/Invite.robot index f6368a4..9bb5057 100644 --- a/1-Applet/4-Invite/Invite.robot +++ b/1-Applet/4-Invite/Invite.robot @@ -5,7 +5,7 @@ Resource InviteResource.robot *** Test Cases *** 红娘邀请嘉宾 Given 查询婚介用户资料 - And 红娘邀请婚介用户成为嘉宾 + And 查询婚介征婚人发榜详情 When 后台查询婚介红娘列表 #Then 数据库查询是否邀请成功 Then 查询婚介后台红娘详情 diff --git a/1-Applet/4-Invite/InviteResource.robot b/1-Applet/4-Invite/InviteResource.robot index 1686b5f..d894ed4 100644 --- a/1-Applet/4-Invite/InviteResource.robot +++ b/1-Applet/4-Invite/InviteResource.robot @@ -18,11 +18,25 @@ Library DatabaseLibrary Set Global Variable ${miId_list} END +查询${dating}征婚人发榜详情 + #通过miId查询征婚人发榜详情 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/seeking/reward/to/be/announced/detail params=miId=${miId} + ${userId} Get From Dictionary ${reps.json()['data']} userId #获取征婚人userId + ${matchmaker} Get From Dictionary ${reps.json()['data']} matchmaker #嘉宾绑定的红娘 + ${matchmakerId} Get From Dictionary ${matchmaker} id #红娘id + ${matchmakerUserId} Get From Dictionary ${matchmaker} userId #红娘userId + Run Keyword If ${matchmakerId}==None 红娘邀请婚介用户成为嘉宾 + ... ELSE log ${matchmaker} + Set Global Variable ${userId} + END + 红娘邀请${dating}用户成为嘉宾 #红娘邀请嘉宾 FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${matchmakerUserId} Set Variable 977568001438126080 #红娘userid,就是不吃饭:978668013433786368;15121074365:977568001438126080 + ${matchmakerUserId} Set Variable 988491861142409216 #红娘userid,就是不吃饭:978668013433786368;15121074365:977568001438126080 生产环境:988491861142409216 ${data} Set Variable {"initiatorUserId":${matchmakerUserId}} ${reps} Post Request dating dating-agency-service/user/save/matchmaker/invite/user?userId=${userId} ${data.encode('utf-8')} ${message} Get From Dictionary ${reps.json()} message #获取响应信息 @@ -53,14 +67,14 @@ Library DatabaseLibrary #查看红娘详情-嘉宾列表 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} - ${reps} GET On Session dating-agency-service/user/get/matchmaker/guest/page params=pageSize=10&matchmakerId=${matchmakerId}&pageNum=1 + ${reps} GET On Session dating dating-agency-service/user/get/matchmaker/guest/page params=pageSize=10&matchmakerId=${matchmakerId}&pageNum=1 ${records} Get From Dictionary ${reps.json()['data']} records #嘉宾列表 Set Global Variable ${records} 遍历嘉宾列表 END 遍历嘉宾列表 - FOR ${miId} ${records} IN ZIP ${miId_list} ${records} + FOR ${records} IN @{records} ${MIID} Get From Dictionary ${records} miId #嘉宾资料id Exit For Loop If ${MIID}==${miId} Set Global Variable ${MIID} diff --git a/1-Applet/5-SeekingReward/SeekingRewardResource.robot b/1-Applet/5-SeekingReward/SeekingRewardResource.robot index 15fe5f0..f58dc6b 100644 --- a/1-Applet/5-SeekingReward/SeekingRewardResource.robot +++ b/1-Applet/5-SeekingReward/SeekingRewardResource.robot @@ -82,15 +82,3 @@ Library DatabaseLibrary Exit For Loop If ${MIID}==${miId} Set Global Variable ${MIID} END - -查询${dating}用户资料-1 - ${miId_list} Create List - FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} - Disable Warnings - Create Session dating ${${dating}.dating域名} ${client_header} - ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} - ${miId} Get From Dictionary ${reps.json()['data']} id #资料id - Append To List ${miId_list} ${miId} - Set Global Variable ${userId} - Set Global Variable ${miId_list} - END diff --git a/output/log.html b/output/log.html index 1f6b4c2..51a288b 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,28 +1806,25 @@ function stopPropagation(event) { window.output = {}; -