diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index 7c8baec..56aa382 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -127,3 +127,5 @@ Library ImageHorizonLibrary #Replace String #替换字段值 #${Data} Update Value To Json ${Data} $.id ${DataId} + #随机生成18位数字 + ${value} Generate Random String 18 [NUMBERS] diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 5d471ae..8518c68 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -13416472917 \ No newline at end of file +15134891062 \ No newline at end of file diff --git a/1-Applet/5-SeekingReward/SeekingReward.robot b/1-Applet/5-SeekingReward/SeekingReward.robot index d0889db..0d641b7 100644 --- a/1-Applet/5-SeekingReward/SeekingReward.robot +++ b/1-Applet/5-SeekingReward/SeekingReward.robot @@ -11,3 +11,5 @@ Resource SeekingRewardResource.robot Then 查询婚介招亲榜列表 红娘推荐嘉宾 + Given 红娘查询婚介招亲榜列表 + Then 红娘查询可推荐婚介嘉宾列表 diff --git a/1-Applet/5-SeekingReward/SeekingRewardResource.robot b/1-Applet/5-SeekingReward/SeekingRewardResource.robot index f58dc6b..891ae86 100644 --- a/1-Applet/5-SeekingReward/SeekingRewardResource.robot +++ b/1-Applet/5-SeekingReward/SeekingRewardResource.robot @@ -82,3 +82,47 @@ Library DatabaseLibrary Exit For Loop If ${MIID}==${miId} Set Global Variable ${MIID} END + +红娘查询${dating}招亲榜列表 + #红娘查询招亲榜列表 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/seeking/reward/page params=pageNum=1&pageSize=10&matchmakerFlag=${matchmakerFlag} + ${records} Get From Dictionary ${reps.json()['data']} records #获取招亲榜数据 + ${rewardData} Evaluate random.choice(${records}) random #随机选择招亲榜 + ${miId} Get From Dictionary ${rewardData} miId #招亲榜人miId + ${msrId} Get From Dictionary ${rewardData} msrId #招亲榜id + Set Global Variable ${miId} + Set Global Variable ${msrId} + END + +红娘查询可推荐${dating}嘉宾列表 + #红娘选择推荐嘉宾 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/candidate/guest/page params=pageNum=1&pageSize=10&miId=${miId}&msrId=${msrId} + ${records} Get From Dictionary ${reps.json()['data']} records #获取可推荐嘉宾列表 + Set Global Variable ${records} + Run Keyword If ${records}==None log 暂无嘉宾可推荐! + ... ELSE 选择婚介可推荐嘉宾并推荐 + END + +选择${dating}可推荐嘉宾并推荐 + #招亲榜可推荐嘉宾列表 + FOR ${records} IN ${records} + ${guestData} Evaluate random.choice(${records}) random #随机选择嘉宾 + ${MsrId} Get From Dictionary ${guestData} msrId #当前榜id + ${guestMiId} Get From Dictionary ${guestData} miId #嘉宾资料id + Set Global Variable ${MsrId} + Set Global Variable ${guestMiId} + END + #红娘给招亲榜推荐嘉宾 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable {"msrId":"${MsrId}","miId":"${guestMiId}"} + ${reps} POST On Session dating dating-agency-service/user/recommend/guest/ ${data.encode('utf-8')} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + +红娘给${dating}招亲榜推荐嘉宾 diff --git a/output/log.html b/output/log.html index 51a288b..15c5fbb 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};