From 65e7b7105cc2e3c5165b05fb9f02caf6ffe7c630 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Mon, 15 Apr 2024 16:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=85=B6=E4=BB=96=E4=BA=BA?= =?UTF-8?q?=E5=BE=81=E5=A9=9A=E8=B5=84=E6=96=99=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0-Login/phone-test.txt | 2 +- .../BlindDate/AdvancedsearchResource.robot | 34 +- 1-Applet/2-Homepage/Interaction/ILikeit.robot | 10 + .../Interaction/ILikeitResource.robot | 73 + 1-Applet/3-Customer/EquityResource.robot | 26 + 1-Applet/3-Customer/byEquity.robot | 8 + 2-Web/Mall/ProductResource.robot | 6 +- output/log.html | 10 +- output/output.xml | 2387 +++++++++-------- output/report.html | 10 +- 10 files changed, 1469 insertions(+), 1097 deletions(-) diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 443de94..babccb1 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -19128859944 \ No newline at end of file +15873078264 \ No newline at end of file diff --git a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot index bd6ed4f..1b691ee 100644 --- a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot +++ b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot @@ -65,13 +65,15 @@ Library DateTime 用户查询${dating}高级搜索列表-户口所在地 #户口所在地查询 - #region固定省市-广州 + region固定省市-汕头 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&domicilePlaceProvinceCode=${provinceCode}&domicilePlaceProvinceName=${provinceName}&domicilePlaceCityCode=${cityCode}&domicilePlaceCityName=${cityName}&unlock=2&pageNum=1&pageSize=100 ${total} Get From Dictionary ${reps.json()['data']} total - Set Global Variable ${total} + ${records} Get From Dictionary ${reps.json()['data']} records + Set Global Variable ${records} END + Set Global Variable ${total} 数据库查询征婚资料数量-户口所在地 Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' @@ -235,6 +237,34 @@ region固定省市-广州 Set Global Variable ${provinceCode} Set Global Variable ${provinceName} +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} + 数据库新增高级搜索权益 FOR ${userId} ${miId} IN ZIP ${userid_list} ${miId_list} ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S diff --git a/1-Applet/2-Homepage/Interaction/ILikeit.robot b/1-Applet/2-Homepage/Interaction/ILikeit.robot index 915af61..4f26391 100644 --- a/1-Applet/2-Homepage/Interaction/ILikeit.robot +++ b/1-Applet/2-Homepage/Interaction/ILikeit.robot @@ -9,3 +9,13 @@ Resource ILikeitResource.robot When 查看婚介平台相亲列表 Then 用户标记婚介资料like And 用户查询婚介我喜欢列表 + +用户标记不喜欢 + Given 用户查询婚介我喜欢列表 + When 用户标记婚介资料no like + +用户查看其他征婚人资料详情 + Given 查询婚介征婚人的资料信息 + When 查询婚介征婚人资料 + And 用户查询婚介高级搜索列表-户口所在地 + Then 查看婚介征婚人详情 diff --git a/1-Applet/2-Homepage/Interaction/ILikeitResource.robot b/1-Applet/2-Homepage/Interaction/ILikeitResource.robot index 01c0fde..e420946 100644 --- a/1-Applet/2-Homepage/Interaction/ILikeitResource.robot +++ b/1-Applet/2-Homepage/Interaction/ILikeitResource.robot @@ -67,6 +67,10 @@ Library DatabaseLibrary Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable {"miId":"${miId}"} ${reps} POST On Session dating dating-agency-service/user/like/his ${data.encode('utf-8')} + ${data} Get From Dictionary ${reps.json()} data + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + log 标记喜欢成功 END 用户查询${dating}我喜欢列表 @@ -79,3 +83,72 @@ Library DatabaseLibrary ${miIdData} Get From Dictionary ${Data} miId Exit For Loop If ${miIdData}==${miId} END + Set Global Variable ${miIdData} + +用户标记${dating}资料no like + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable {"miId":"${miIdData}"} + ${reps} POST On Session dating dating-agency-service/user/cancel/like ${data.encode('utf-8')} + ${data} Get From Dictionary ${reps.json()} data #标记id + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + log 标记不喜欢成功 + END + +用户查询${dating}高级搜索列表-户口所在地 + #户口所在地查询 + region固定省市-汕头 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=true&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&domicilePlaceProvinceCode=${provinceCode}&domicilePlaceProvinceName=${provinceName}&domicilePlaceCityCode=${cityCode}&domicilePlaceCityName=${cityName}&unlock=2&pageNum=1&pageSize=100 + ${total} Get From Dictionary ${reps.json()['data']} total + ${records} Get From Dictionary ${reps.json()['data']} records + Set Global Variable ${records} + log ${records} + 遍历搜索结果 + END + Set Global Variable ${total} + +遍历搜索结果 + FOR ${data} IN @{records} + ${miId} Get From Dictionary ${data} miId + Exit For Loop If ${miId}==965354767578697728 #就是不吃饭：965354767578697728 + END + Set Global Variable ${miId} + +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}征婚人详情 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/details params=miId=${miId}&freeCharge=1 + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END diff --git a/1-Applet/3-Customer/EquityResource.robot b/1-Applet/3-Customer/EquityResource.robot index ea8d587..1e7194f 100644 --- a/1-Applet/3-Customer/EquityResource.robot +++ b/1-Applet/3-Customer/EquityResource.robot @@ -122,3 +122,29 @@ Library DatabaseLibrary ${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, '1') Disconnect From Database 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} 5 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}, 501, '${dataTime}', '${Time}', 1) #插入一条聊天卡 + ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '501' AND `enable` = '1' #查询权益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, '3') + ${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, '3') + Disconnect From Database + 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} 5 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}, 601, '${dataTime}', '${Time}', 1) #插入一条会员 + ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '601' AND `enable` = '1' #查询权益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, 101, NULL) + Disconnect From Database + END diff --git a/1-Applet/3-Customer/byEquity.robot b/1-Applet/3-Customer/byEquity.robot index 8c529a2..141112e 100644 --- a/1-Applet/3-Customer/byEquity.robot +++ b/1-Applet/3-Customer/byEquity.robot @@ -25,3 +25,11 @@ Resource EquityResource.robot 用户线下约见面权益 Given 查询婚介征婚人的资料信息 When 数据库新增线下约见面权益 + +用户线聊天卡权益 + Given 查询婚介征婚人的资料信息 + When 数据库新增聊天卡权益 + +用户线会员权益 + Given 查询婚介征婚人的资料信息 + When 数据库新增会员权益 diff --git a/2-Web/Mall/ProductResource.robot b/2-Web/Mall/ProductResource.robot index 2462083..e2d29f6 100644 --- a/2-Web/Mall/ProductResource.robot +++ b/2-Web/Mall/ProductResource.robot @@ -7,9 +7,9 @@ Library DatabaseLibrary *** Keywords *** 平台商品数据创建 - ${subCategory_list} Create List 101 201 301 302 401 501 601 #产品名称 - ${mainCategory_list} Create List 1 2 3 3 4 3 3 #产品分类 - ${productTitle_list} Create List 学历认证 头像修改 解锁更多人数 高级搜索 线下约见面 聊天卡 会员 + ${subCategory_list} Create List 101 201 301 302 401 501 601 701 801 #产品名称 + ${mainCategory_list} Create List 1 2 3 3 4 3 3 3 3 #产品分类 + ${productTitle_list} Create List 学历认证 头像修改 解锁更多人数 高级搜索 线下约见面 聊天卡 会员 包恋爱 包领证 ${data_list} Create List FOR ${mainCategory} ${subCategory} ${productTitle} IN ZIP ${mainCategory_list} ${subCategory_list} ${productTitle_list} ${productSpecUnit_list} Create List 101 102 #产品规格：101 周期，102 天数 diff --git a/output/log.html b/output/log.html index 0efc645..e5a39df 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};