diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot index dd600c5..8b921b8 100644 --- a/0-Login/LoginResource.robot +++ b/0-Login/LoginResource.robot @@ -193,12 +193,24 @@ Library ImageHorizonLibrary Create Session dating ${${dating}.dating域名} ${login_header} ${reps} GET On Session dating /dating-agency-uec/user/list/own-organization params=userId=${userid} ${data} Get From Dictionary ${reps.json()} data #获取用户组织数据 + Set Global Variable ${data} ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful Run Keyword If ${data}==[] log 未获取到组织信息! - ... ELSE log ${data} + ... ELSE 遍历用户组织信息 END +遍历用户组织信息 + #遍历用户组织信息 + FOR ${orgdata} IN @{data} + ${orgdata} Evaluate random.choice(${data}) random #随机获取用户组织信息 + ${orgId} Get From Dictionary ${orgdata} orgId #组织id + ${fullName} Get From Dictionary ${orgdata} fullName #组织name + #${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} #趣招亲小程序 + ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795883','Authorization':'${token}','X-ORGANIZATION-ID':'${orgId}'} #招亲宝小程序 + END + Set Global Variable ${client_header} + 获取${dating}平台用户baseinfo #获取baseinfo ${matchmakerFlagList} Create List diff --git a/2-Web/OperationCenter/Operation.robot b/3-Operation/Applet/Home/Operation.robot similarity index 70% rename from 2-Web/OperationCenter/Operation.robot rename to 3-Operation/Applet/Home/Operation.robot index 6f92113..db94eb2 100644 --- a/2-Web/OperationCenter/Operation.robot +++ b/3-Operation/Applet/Home/Operation.robot @@ -3,10 +3,6 @@ Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml Resource OperationResources.robot *** Test Cases *** -创建一级代理商组织 - Given 创建婚介一级代理商 - Then 查询婚介一级代理列表 - 邀请绑定代理人 Given 扫描婚介邀请绑定代理人二维码 Then 用户绑定婚介运营中心 diff --git a/3-Operation/Applet/Home/OperationResources.robot b/3-Operation/Applet/Home/OperationResources.robot new file mode 100644 index 0000000..b9f0894 --- /dev/null +++ b/3-Operation/Applet/Home/OperationResources.robot @@ -0,0 +1,61 @@ +*** Settings *** +Library urllib3 +Library String +Library DateTime +Library Collections +Library RequestsLibrary +Library DatabaseLibrary + +*** Keywords *** +扫描${dating}邀请绑定代理人二维码 + #扫描邀请绑定代理人二维码 + 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=mark=50325897884795883&qrCodeRecordId=1023654201504436224 + ${code} Get From Dictionary ${reps.json()} code + ${orgId} Get From Dictionary ${reps.json()['data']['metaData']} orgId #运营中心组织id + END + Set Global Variable ${orgId} + +用户绑定${dating}运营中心 + #用户绑定运营中心 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable {"orgId":${orgId}} + ${reps} POST On Session dating dating-agency-uec/user/bind/operation-center ${data.encode('utf-8')} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + +邀请${dating}用户开店 + #代理商邀请用户开店 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + +region固定省市-广州 + Disable Warnings + Create Session region http://qncloud.oss-cn-shenzhen.aliyuncs.com + ${reps} GET On Session region address.json + ${local_data} Get From Dictionary ${reps.json()} data + FOR ${province} IN @{local_data} #省列表数据 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + Exit For Loop If '${provinceName}'=='广东省' + END + ${city_data} Get From Dictionary ${province} children #广东省市列表数据 + FOR ${city} IN @{city_data} + ${cityCode} Get From Dictionary ${city} value #获取市编码 + ${cityName} Get From Dictionary ${city} label #获取市名称 + Exit For Loop If '${cityName}'=='广州市' + END + ${district_data} Get From Dictionary ${city} children #广州市列表数据 + log ${district_data} + ${district} Evaluate random.choice(${district_data}) random + ${districtCode} Get From Dictionary ${district} value #随机获取广州市区编码 + ${districtName} Get From Dictionary ${district} label #随机获取广州市区名称 + Set Global Variable ${cityCode} + Set Global Variable ${cityName} + Set Global Variable ${districtCode} + Set Global Variable ${districtName} + Set Global Variable ${provinceCode} + Set Global Variable ${provinceName} diff --git a/2-Web/OperationCenter/__init__.robot b/3-Operation/Applet/Home/__init__.robot similarity index 100% rename from 2-Web/OperationCenter/__init__.robot rename to 3-Operation/Applet/Home/__init__.robot diff --git a/3-Operation/Web/OperationCenter/Operation.robot b/3-Operation/Web/OperationCenter/Operation.robot new file mode 100644 index 0000000..7db73bc --- /dev/null +++ b/3-Operation/Web/OperationCenter/Operation.robot @@ -0,0 +1,8 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Resource OperationResources.robot + +*** Test Cases *** +创建一级代理商组织 + Given 创建婚介一级代理商 + Then 查询婚介一级代理列表 diff --git a/2-Web/OperationCenter/OperationResources.robot b/3-Operation/Web/OperationCenter/OperationResources.robot similarity index 61% rename from 2-Web/OperationCenter/OperationResources.robot rename to 3-Operation/Web/OperationCenter/OperationResources.robot index 3ad9727..2e4278b 100644 --- a/2-Web/OperationCenter/OperationResources.robot +++ b/3-Operation/Web/OperationCenter/OperationResources.robot @@ -46,22 +46,30 @@ Library DatabaseLibrary Set Global Variable ${AdministratorName} END -扫描${dating}邀请绑定代理人二维码 - #扫描邀请绑定代理人二维码 - 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=mark=50325897884795883&qrCodeRecordId=1023654201504436224 - ${code} Get From Dictionary ${reps.json()} code - ${orgId} Get From Dictionary ${reps.json()['data']['metaData']} orgId #运营中心组织id +region固定省市-广州 + Disable Warnings + Create Session region http://qncloud.oss-cn-shenzhen.aliyuncs.com + ${reps} GET On Session region address.json + ${local_data} Get From Dictionary ${reps.json()} data + FOR ${province} IN @{local_data} #省列表数据 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + Exit For Loop If '${provinceName}'=='广东省' END - Set Global Variable ${orgId} - -用户绑定${dating}运营中心 - #用户绑定运营中心 - FOR ${client_header} IN @{Cheader_list} - Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable {"orgId":${orgId}} - ${reps} POST On Session dating dating-agency-uec/user/bind/operation-center ${data.encode('utf-8')} - ${message} Get From Dictionary ${reps.json()} message - Should Be Equal As Strings ${message} successful + ${city_data} Get From Dictionary ${province} children #广东省市列表数据 + FOR ${city} IN @{city_data} + ${cityCode} Get From Dictionary ${city} value #获取市编码 + ${cityName} Get From Dictionary ${city} label #获取市名称 + Exit For Loop If '${cityName}'=='广州市' END + ${district_data} Get From Dictionary ${city} children #广州市列表数据 + log ${district_data} + ${district} Evaluate random.choice(${district_data}) random + ${districtCode} Get From Dictionary ${district} value #随机获取广州市区编码 + ${districtName} Get From Dictionary ${district} label #随机获取广州市区名称 + Set Global Variable ${cityCode} + Set Global Variable ${cityName} + Set Global Variable ${districtCode} + Set Global Variable ${districtName} + Set Global Variable ${provinceCode} + Set Global Variable ${provinceName} diff --git a/3-Operation/Web/OperationCenter/__init__.robot b/3-Operation/Web/OperationCenter/__init__.robot new file mode 100644 index 0000000..213963c --- /dev/null +++ b/3-Operation/Web/OperationCenter/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 分销代理 diff --git a/output/log.html b/output/log.html index d0713d6..9fab7dc 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};