diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 9fd8acb..b2a5c23 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -49,7 +49,8 @@ Library ImageHorizonLibrary
用户扫描红娘二维码注册登录
Given 扫描婚介红娘二维码
- Then 获取婚介平台用户baseinfo并判断是否是红娘
+ When 获取婚介平台用户baseinfo并判断是否是红娘
+ And 查询婚介红娘申请结果
数据库删除用户
Given 读取TXT文件
diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot
index a9b5f9d..897289e 100644
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -146,6 +146,7 @@ Library ImageHorizonLibrary
${userid_list} Create List
${Cheader_list} Create List
${Aheader_list} Create List
+ ${phoneList} Create List
Disable Warnings
FOR ${phone} IN @{phoneList}
Create Session dating ${${dating}.dating域名} ${${dating}.AHeader}
@@ -217,7 +218,7 @@ Library ImageHorizonLibrary
#${filepath} Evaluate open('./matchmaker.png','rb')
FOR ${client_header} IN @{Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
- ${reps} GET On Session dating dating-agency-uec/user/verify/qrcode params=&qrCodeRecordId=972626840957095936
+ ${reps} GET On Session dating dating-agency-uec/user/verify/qrcode params=&qrCodeRecordId=982617756153286656
${code} Get From Dictionary ${reps.json()} code
END
@@ -228,33 +229,36 @@ Library ImageHorizonLibrary
${reps} GET On Session dating dating-agency-uec/user/get/base-info
${phone} Get From Dictionary ${reps.json()['data']} phone #登录用户手机号
${matchmakerFlag} Get From Dictionary ${reps.json()['data']} matchmakerFlag #登录用户是否是红娘
- Run Keyword If ${matchmakerFlag}==False 注册婚介红娘
+ Run Keyword If ${matchmakerFlag}==False 查询婚介红娘申请结果
... ELSE 查询婚介平台红娘列表
END
Set Global Variable ${phone}
Set Global Variable ${matchmakerFlag}
-查询${dating}红娘申请列表
+查询${dating}红娘申请结果
FOR ${client_header} IN @{Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
${reps} GET On Session dating dating-agency-uec/user/get/matchmaker-apply/by/customer
${data} Get From Dictionary ${reps.json()} data
- Run Keyword If ${data}!=None ${status} get from Dictionary ${data} status
- ... ELSE 填写婚介红娘加盟信息
+ Run Keyword If ${data}==None 填写婚介红娘加盟信息
+ ... ELSE 查询婚介红娘申请加盟列表
Run Keyword If ${status}==4 填写婚介红娘加盟信息
... ELSE IF ${status}==1 数据库修改申请状态为待审核
- ... ELSE IF ${status}==3 查询${dating}平台红娘数据
- ... ELSE 运营人员操作${dating}后台审核通过
+ ... ELSE IF ${status}==3 查询婚介平台红娘数据
+ ... ELSE 运营人员操作婚介后台审核通过
END
填写${dating}红娘加盟信息
+ region固定省市-广州
FOR ${client_header} IN @{Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
- ${data} Set Variable { \ \ \ \ "name": "就是不吃饭", \ \ \ \ "identityCard": "441481199509213863", \ \ \ \ "phone": "${phone}", \ \ \ \ "captcha": "888888", \ \ \ \ "serviceAreaList": [ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "provinceCode": ${provinceCode}, \ \ \ \ \ \ \ \ \ \ \ \ "provinceName": "${provinceName}", \ \ \ \ \ \ \ \ \ \ \ \ "cityCode": ${cityCode}, \ \ \ \ \ \ \ \ \ \ \ \ "cityName": "${cityName}", \ \ \ \ \ \ \ \ \ \ \ \ "districtCode": ${districtCode}, \ \ \ \ \ \ \ \ \ \ \ \ "districtName": "${districtName}" \ \ \ \ \ \ \ \ }, \ \ \ \ ] }
+ ${value} Generate Random String 18 [NUMBERS] #随机生成18位数字
+ ${data} Set Variable { \ \ \ \ "name": "${phone}", \ \ \ \ "identityCard": "${value}", \ \ \ \ "phone": "${phone}", \ \ \ \ "captcha": "888888", \ \ \ \ "serviceAreaList": [ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "provinceCode": ${provinceCode}, \ \ \ \ \ \ \ \ \ \ \ \ "provinceName": "${provinceName}", \ \ \ \ \ \ \ \ \ \ \ \ "cityCode": ${cityCode}, \ \ \ \ \ \ \ \ \ \ \ \ "cityName": "${cityName}", \ \ \ \ \ \ \ \ \ \ \ \ "districtCode": ${districtCode}, \ \ \ \ \ \ \ \ \ \ \ \ "districtName": "${districtName}" \ \ \ \ \ \ \ \ } \ \ \ \ ] }
${reps} POST On Session dating dating-agency-uec/user/apply/matchmaker ${data.encode('utf-8')}
${matchmakerId} Get From Dictionary ${reps.json()} data #红娘审核id
Set Global Variable ${matchmakerId}
END
+ 查询婚介红娘申请加盟列表
数据库修改申请状态为待审核
Connect To Database Using Custom Params pymysql database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221'
@@ -265,25 +269,35 @@ Library ImageHorizonLibrary
Disconnect From Database
运营人员操作${dating}后台审核通过
+ FOR ${admin_header} IN @{Aheader_list}
+ 查询婚介红娘申请加盟列表
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${data} Set Variable {"id":"${matchmakerId}","status":3}
+ ${reps} POST On Session dating dating-agency-uec/user/audit/matchmaker-apply ${data.encode('utf-8')}
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ END
+
+查询${dating}红娘申请加盟列表
+ #查询红娘加盟审核列表
FOR ${admin_header} IN @{Aheader_list}
Create Session dating ${${dating}.dating域名} ${admin_header}
${reps} GET On Session dating dating-agency-uec/user/page/matchmaker-audit params=pageSize=10&pageNum=1
${records} Get From Dictionary ${reps.json()['data']} records #红娘加盟审核列表
Set Global Variable ${records}
遍历红娘加盟审核列表
- Create Session dating ${${dating}.dating域名} ${admin_header}
- ${data} Set Variable {"id":"${id}","status":3}
- ${reps} POST On Session dating dating-agency-uec/user/audit/matchmaker-apply ${data.encode('utf-8')}
- ${message} Get From Dictionary ${reps.json()} message
- Should Be Equal As Strings ${message} successful
- ERND
+ END
遍历红娘加盟审核列表
FOR ${data} IN @{records}
- ${id} Get From Dictionary ${data} id
- Exit For Loop If ${id}==${matchmakerId}
- Set Global Variable ${id}
+ ${Phone} Get From Dictionary ${data} phone #红娘手机号
+ ${status} Get From Dictionary ${data} status #红娘加盟审核状态
+ ${matchmakerId} Get From Dictionary ${data} id #红娘加盟id
+ Exit For Loop If ${Phone}==${phone}
END
+ Set Global Variable ${Phone}
+ Set Global Variable ${status}
+ Set Global Variable ${matchmakerId}
查询${dating}平台红娘数据
FOR ${admin_header} IN @{Aheader_list}
@@ -291,16 +305,6 @@ Library ImageHorizonLibrary
${reps} GET On Session dating dating-agency-uec/user/page/matchmaker params=pageSize=10&pageNum=1
END
-注册${dating}红娘
- #注册成为红娘
- FOR ${client_header} IN @{Cheader_list}
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${reps} POST On Session dating dating-agency-uec/user/create/matchmaker
- ${matchmakerId} Get From Dictionary ${reps.json()} data
- ${message} Get From Dictionary ${reps.json()} message
- Should Be Equal As Strings ${message} successful
- END
-
查询${dating}平台红娘列表
FOR ${admin_header} IN @{Aheader_list}
Create Session dating ${${dating}.dating域名} ${admin_header}
@@ -312,10 +316,12 @@ Library ImageHorizonLibrary
红娘列表
FOR ${matchmaker} IN @{matchmaker_list}
- ${PhoneNum} Get From Dictionary ${matchmaker} phone
+ ${status} Get From Dictionary ${matchmaker} status #获取红娘加盟状态
+ ${PhoneNum} Get From Dictionary ${matchmaker} phone #获取红娘手机号
Exit For Loop If ${PhoneNum}==${phone}
END
Set Global Variable ${PhoneNum}
+ Set Global Variable ${status}
数据库删除用户数据
FOR ${userId} IN @{userid_list}
diff --git a/output/log.html b/output/log.html
index 5278f2e..740fc17 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};