diff --git a/1-Applet/5-SeekingReward/SeekingReward.robot b/1-Applet/5-SeekingReward/SeekingReward.robot index 0d641b7..344b867 100644 --- a/1-Applet/5-SeekingReward/SeekingReward.robot +++ b/1-Applet/5-SeekingReward/SeekingReward.robot @@ -5,9 +5,7 @@ Resource SeekingRewardResource.robot *** Test Cases *** 用户发布招亲榜 Given 查询婚介用户资料 - And 查询婚介征婚人发榜详情 - When 用户发布婚介招亲榜 - And 数据库插入数据 + When 查询婚介征婚人发榜详情 Then 查询婚介招亲榜列表 红娘推荐嘉宾 diff --git a/1-Applet/5-SeekingReward/SeekingRewardResource.robot b/1-Applet/5-SeekingReward/SeekingRewardResource.robot index 891ae86..c6208b5 100644 --- a/1-Applet/5-SeekingReward/SeekingRewardResource.robot +++ b/1-Applet/5-SeekingReward/SeekingRewardResource.robot @@ -33,7 +33,10 @@ Library DatabaseLibrary 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} + ${msrId} Get From Dictionary ${reps.json()['data']} msrId #用户发不的悬赏榜id ${userId} Get From Dictionary ${reps.json()['data']} userId #获取征婚人userId + Run Keyword If ${msrId}==None 用户发布婚介招亲榜 + ... ELSE log 您已发榜,不能重复发布悬赏 Set Global Variable ${userId} END @@ -51,6 +54,7 @@ Library DatabaseLibrary Set Global Variable ${meetingFee} Set Global Variable ${rewardAmount} END + 数据库插入数据 数据库插入数据 ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S #获取当前时间 @@ -113,16 +117,38 @@ Library DatabaseLibrary ${guestData} Evaluate random.choice(${records}) random #随机选择嘉宾 ${MsrId} Get From Dictionary ${guestData} msrId #当前榜id ${guestMiId} Get From Dictionary ${guestData} miId #嘉宾资料id + ${profilePhoto} Get From Dictionary ${guestData} profilePhoto #嘉宾头像 + ${realNameAudit} Get From Dictionary ${guestData} realNameAudit #嘉宾是否已实名认证 Set Global Variable ${MsrId} Set Global Variable ${guestMiId} + Set Global Variable ${profilePhoto} + Set Global Variable ${realNameAudit} 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')} + ${code} Get From Dictionary ${reps.json()} code #获取响应状态码 ${message} Get From Dictionary ${reps.json()} message - Should Be Equal As Strings ${message} successful + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + ... ELSE log ${message} END + #Run Keyword If ${profilePhoto}==None log 嘉宾还未上传头像,请联系嘉宾上传头像 + #... + ... # ELSE IF ${realNameAudit}==None log 嘉宾还未实名认证,请联系嘉宾完成实名认证 + #... + ... # ELSE log 推荐嘉宾成功! 红娘给${dating}招亲榜推荐嘉宾 + +用户查询${dating}榜单待选嘉宾列表 + #用户查询榜单待选嘉宾列表 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/my/candidate/guest/list params=selectiveType=0 + ${data} Get From Dictionary ${reps.json()} data #获取待选嘉宾列表 + ${guestData} Evaluate random.choice(${data}) random #随机获取待选嘉宾 + ${guestMiId} Get From Dictionary ${guestData} miId #嘉宾资料id + ${msrId} Get From Dictionary ${guestData} msrId #招亲榜id + ${msrpdId} Get From Dictionary ${guestData} msrpdId #