From 7c727a27120b7a2fba4364f00cba3cbded106ac1 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Wed, 3 Apr 2024 18:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2-Homepage/BlindDate/AdvancedSearch.robot | 5 ++ .../BlindDate/AdvancedsearchResource.robot | 63 +++++++++++++++++++ .../{Blind.robot => NormalSearch.robot} | 3 +- ...ource.robot => NormalsearchResource.robot} | 56 ++++++++--------- 4 files changed, 98 insertions(+), 29 deletions(-) create mode 100644 1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot create mode 100644 1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot rename 1-Applet/2-Homepage/BlindDate/{Blind.robot => NormalSearch.robot} (93%) rename 1-Applet/2-Homepage/BlindDate/{BlindResource.robot => NormalsearchResource.robot} (100%) diff --git a/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot b/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot new file mode 100644 index 0000000..c141958 --- /dev/null +++ b/1-Applet/2-Homepage/BlindDate/AdvancedSearch.robot @@ -0,0 +1,5 @@ +*** Settings *** +Documentation 高级搜索 +Resource AdvancedsearchResource.robot + +*** Test Cases *** diff --git a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot new file mode 100644 index 0000000..53778cd --- /dev/null +++ b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot @@ -0,0 +1,63 @@ +*** Settings *** +Library urllib3 +Library Collections +Library RequestsLibrary +Library DatabaseLibrary + +*** Keywords *** +查询${dating}征婚人的资料信息 + #通过userid获取征婚人的资料 + FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/marriage/information/details params=userId=${userId} + ${miId} Get From Dictionary ${reps.json()['data']} id #获取资料id + ${nickName} Get From Dictionary ${reps.json()['data']} nickName #获取用户名称 + ${miId_list} Create List + ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #用户性别 + ${message} Get From Dictionary ${reps.json()} message + Append To List ${miId_list} ${miId} + Should Be Equal As Strings ${message} successful + END + Set Global Variable ${nickName} + Set Global Variable ${miId_list} + Set Global Variable ${genderCode} + +查询${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/information/details/byid params=miId=${miId} + ${age} Get From Dictionary ${reps.json()['data']} age #年龄 + ${height} Get From Dictionary ${reps.json()['data']} height #获取征婚人身高 + ${cityCode} Get From Dictionary ${reps.json()['data']} cityCode #现居城市 + ${birthYear} Get From Dictionary ${reps.json()['data']} birthYear #出生年份 + ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #性别 + END + Set Global Variable ${age} + Set Global Variable ${height} + Set Global Variable ${cityCode} + Set Global Variable ${birthYear} + Set Global Variable ${genderCode} + +是否有${dating}高级搜索权限 + #高级搜索权益判断 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-mall/user/list/right/by/customer params=miId=${miId}&type=302 #302高级搜索 + ${data} Get From Dictionary ${reps.json()} data #获取权益信息 + Run Keyword If ${data}==[] 数据库添加高级搜索权益 + END + +数据库新增高级搜索权益 + FOR ${userId} ${miId} IN ZIP ${userid_list} ${miId_list} + ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S + ${Time} Add Time To Date ${dataTime} 30 days + Connect To Database Using Custom Params pymysql database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 101, '${dataTime}', '${Time}', 1) #插入一条学历认证数据 + ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '101' #查询权益id + ${right_id} Set Variable ${check_1[0][0]} + ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '规格', 1, 102, NULL) + ${insert_3} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益上限额度', 2, 1, '10') + ${insert_4} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益剩余额度', 3, 1, '10') + Disconnect From Database + END diff --git a/1-Applet/2-Homepage/BlindDate/Blind.robot b/1-Applet/2-Homepage/BlindDate/NormalSearch.robot similarity index 93% rename from 1-Applet/2-Homepage/BlindDate/Blind.robot rename to 1-Applet/2-Homepage/BlindDate/NormalSearch.robot index e4ae9b3..5ff742f 100644 --- a/1-Applet/2-Homepage/BlindDate/Blind.robot +++ b/1-Applet/2-Homepage/BlindDate/NormalSearch.robot @@ -1,6 +1,7 @@ *** Settings *** +Documentation 普通搜索 Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml -Resource BlindResource.robot +Resource NormalsearchResource.robot *** Test Cases *** 用户查看相亲推荐页 diff --git a/1-Applet/2-Homepage/BlindDate/BlindResource.robot b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot similarity index 100% rename from 1-Applet/2-Homepage/BlindDate/BlindResource.robot rename to 1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot index cd20456..0037e7c 100644 --- a/1-Applet/2-Homepage/BlindDate/BlindResource.robot +++ b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot @@ -125,6 +125,34 @@ Library DatabaseLibrary Should Be Equal As Numbers ${count} ${total} Disconnect From Database +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} + 用户查询${dating}搜索列表-学历 #微醺条件搜索 选择婚介征婚人的学历 @@ -156,31 +184,3 @@ Library DatabaseLibrary Set Global Variable ${education} Set Global Variable ${educationCode} END - -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}