diff --git a/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot similarity index 100% rename from 1-WriteInfo/InfoResource.robot rename to 1-Applet/1-WriteInfo/InfoResource.robot diff --git a/1-WriteInfo/Infomation.robot b/1-Applet/1-WriteInfo/Infomation.robot similarity index 100% rename from 1-WriteInfo/Infomation.robot rename to 1-Applet/1-WriteInfo/Infomation.robot diff --git a/1-WriteInfo/__init__.robot b/1-Applet/1-WriteInfo/__init__.robot similarity index 100% rename from 1-WriteInfo/__init__.robot rename to 1-Applet/1-WriteInfo/__init__.robot diff --git a/2-Homepage/Blind/Blind.robot b/1-Applet/2-Homepage/Blind/Blind.robot similarity index 100% rename from 2-Homepage/Blind/Blind.robot rename to 1-Applet/2-Homepage/Blind/Blind.robot diff --git a/2-Homepage/Blind/BlindDate.robot b/1-Applet/2-Homepage/Blind/BlindDate.robot similarity index 100% rename from 2-Homepage/Blind/BlindDate.robot rename to 1-Applet/2-Homepage/Blind/BlindDate.robot diff --git a/2-Homepage/Blind/__init__.robot b/1-Applet/2-Homepage/Blind/__init__.robot similarity index 100% rename from 2-Homepage/Blind/__init__.robot rename to 1-Applet/2-Homepage/Blind/__init__.robot diff --git a/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot similarity index 100% rename from 2-Homepage/MarriageInfo/Authentication.robot rename to 1-Applet/2-Homepage/MarriageInfo/Authentication.robot index 1439799..52910dd 100644 --- a/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -88,6 +88,22 @@ Library DatabaseLibrary Set Global Variable ${data} END +提交${dating}征婚人的介绍信息 + ${value} Set Variable 在学习上,严格要求自己,端正工作态度,作到了理论联理实际;从而提高了自身的一专多能的长处及思想文化素质,包括生活中也学到了养成良好的生活习惯,生活充实而有条理,有严谨的生活态度和良好的生活作风,为人热情大方,诚实守信,乐于助人,拥有自己的良好做事原则,能与同事们和睦相处。思想上,自觉遵守公司的的,坚持参加公司的每次的培训。要求积极上进,爱护公司的一砖一瓦,一直严谨的态度和积极的热情投身于学习和工作中,虽然有成功的泪水,也有失败的辛酸,然而日益激烈的社会竟争也使我充分地认识到成为一名德智体全面发展的优秀工作者的重要性。 #个人介绍value + #${value} Set Variable 草泥马 #敏感词个人介绍 + ${authenticationCode} Evaluate 7 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable {"authenticationCode":${authenticationCode},"miId":"${miId}","value":"${value}"} + ${reps} POST On Session dating dating-agency-service/user/save/certification/audit ${data.encode('utf-8')} + ${code} Get From Dictionary ${reps.json()} code #相应状态码 + ${auditId} Get From Dictionary ${reps.json()} data #获取审核id + ${message} Get From Dictionary ${reps.json()} message + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + ... ELSE log ${message} + END + Set Global Variable ${auditId} + 查询数据库身份证审核数据 Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' ${check} Query SELECT id FROM `dating_agency_service`.`da_marriage_information_certification_audit` WHERE `id` = '${data}' AND `authentication_code` = '0' AND `is_delete` = '0' #查询相册审核语句 @@ -259,19 +275,3 @@ region ... ELSE Should Be Equal As Strings ${message} 正在审核中!请等待审核完成。 END Set Global Variable ${auditId} - -提交${dating}征婚人的介绍信息 - ${value} Set Variable 在学习上,严格要求自己,端正工作态度,作到了理论联理实际;从而提高了自身的一专多能的长处及思想文化素质,包括生活中也学到了养成良好的生活习惯,生活充实而有条理,有严谨的生活态度和良好的生活作风,为人热情大方,诚实守信,乐于助人,拥有自己的良好做事原则,能与同事们和睦相处。思想上,自觉遵守公司的的,坚持参加公司的每次的培训。要求积极上进,爱护公司的一砖一瓦,一直严谨的态度和积极的热情投身于学习和工作中,虽然有成功的泪水,也有失败的辛酸,然而日益激烈的社会竟争也使我充分地认识到成为一名德智体全面发展的优秀工作者的重要性。 #个人介绍value - #${value} Set Variable 草泥马 #敏感词个人介绍 - ${authenticationCode} Evaluate 7 - FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} - Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable {"authenticationCode":${authenticationCode},"miId":"${miId}","value":"${value}"} - ${reps} POST On Session dating dating-agency-service/user/save/certification/audit ${data.encode('utf-8')} - ${code} Get From Dictionary ${reps.json()} code #相应状态码 - ${auditId} Get From Dictionary ${reps.json()} data #获取审核id - ${message} Get From Dictionary ${reps.json()} message - Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful - ... ELSE log ${message} - END - Set Global Variable ${auditId} diff --git a/2-Homepage/MarriageInfo/DataAuthentication.robot b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot similarity index 100% rename from 2-Homepage/MarriageInfo/DataAuthentication.robot rename to 1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot index e7509d9..e5da2ee 100644 --- a/2-Homepage/MarriageInfo/DataAuthentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot @@ -24,6 +24,10 @@ Resource ../../0-Login/LoginResource.robot Given 查询婚介征婚人的资料信息 When 提交婚介征婚人身份证审核 +提交征婚人的介绍信息 + Given 查询婚介征婚人的资料信息 + When 提交婚介征婚人的介绍信息 + 提交征婚人户口所在地 Given 查询婚介征婚人的资料信息 When 提交婚介征婚人的户口所在地 @@ -56,7 +60,3 @@ Resource ../../0-Login/LoginResource.robot 提交征婚人学历认证 Given 查询婚介征婚人的资料信息 When 提交婚介征婚人的学历审核 - -提交征婚人的介绍信息 - Given 查询婚介征婚人的资料信息 - When 提交婚介征婚人的介绍信息 diff --git a/2-Homepage/MarriageInfo/MateSelection.robot b/1-Applet/2-Homepage/MarriageInfo/MateSelection.robot similarity index 100% rename from 2-Homepage/MarriageInfo/MateSelection.robot rename to 1-Applet/2-Homepage/MarriageInfo/MateSelection.robot diff --git a/2-Homepage/MarriageInfo/Selection.robot b/1-Applet/2-Homepage/MarriageInfo/Selection.robot similarity index 100% rename from 2-Homepage/MarriageInfo/Selection.robot rename to 1-Applet/2-Homepage/MarriageInfo/Selection.robot diff --git a/2-Homepage/MarriageInfo/__init__.robot b/1-Applet/2-Homepage/MarriageInfo/__init__.robot similarity index 100% rename from 2-Homepage/MarriageInfo/__init__.robot rename to 1-Applet/2-Homepage/MarriageInfo/__init__.robot diff --git a/1-Applet/3-Customer/EquityResource.robot b/1-Applet/3-Customer/EquityResource.robot new file mode 100644 index 0000000..a45db36 --- /dev/null +++ b/1-Applet/3-Customer/EquityResource.robot @@ -0,0 +1,40 @@ +*** Settings *** +Library urllib3 +Library String +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-mall/user/page/product/by/customer params={} + ${records} Get From Dictionary ${reps.json()['data']} records #权益购买列表 + END + +购买${dating}项目的学历权益 + #选择学历权益 + FOR ${equity} IN @{records} + ${subCategory} Get From Dictionary ${equity} subCategory #产品名称 + ${productSpecId} Get From Dictionary ${equity} productSpecId #权益规格id + ${unitSellingPrice} Get From Dictionary ${equity} unitSellingPrice #产品现价 + Exit For Loop If ${subCategory}==101 #学历认证权益:101 + END + Set Global Variable ${productSpecId} + Set Global Variable ${unitSellingPrice} + #创建订单 + FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} + Create Session dating' ${${dating}.dating域名} ${client_header} + ${orderData} Set Variable {"miId":"${miId}","productSpecId":"${productSpecId}"} + ${reps} POST On Session dating dating-agency-mall/user/submit/order ${orderData.encode('utf-8')} + ${orderId} Get From Dictionary ${reps.json()['data']} orderId #订单id + ${paymentOrderId} Get From Dictionary ${reps.json()['data']} paymentOrderId #第三方支付单id + Set Global Variable ${orderId} + Set Global Variable ${paymentOrderId} + END + #支付订单 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${payData} Set Variable {"paymentOrderId":"${paymentOrderId}","paymentMethod":1} + ${reps} POST On Session dating dating-agency-mall/user/pre-pay/third-party ${payData.encode('utf-8')} diff --git a/1-Applet/3-Customer/__init__.robot b/1-Applet/3-Customer/__init__.robot new file mode 100644 index 0000000..ae8361f --- /dev/null +++ b/1-Applet/3-Customer/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 权益购买 diff --git a/1-Applet/3-Customer/byEquity.robot b/1-Applet/3-Customer/byEquity.robot new file mode 100644 index 0000000..ce168f0 --- /dev/null +++ b/1-Applet/3-Customer/byEquity.robot @@ -0,0 +1,7 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Resource EquityResource.robot + +*** Test Cases *** +购买学历认证权益 + Given 查询婚介权益列表 diff --git a/Web/InfoAudit/AuditInfomation.robot b/2-Web/InfoAudit/AuditInfomation.robot similarity index 100% rename from Web/InfoAudit/AuditInfomation.robot rename to 2-Web/InfoAudit/AuditInfomation.robot diff --git a/Web/InfoAudit/Infomation.robot b/2-Web/InfoAudit/Infomation.robot similarity index 100% rename from Web/InfoAudit/Infomation.robot rename to 2-Web/InfoAudit/Infomation.robot diff --git a/Web/InfoAudit/__init__.robot b/2-Web/InfoAudit/__init__.robot similarity index 100% rename from Web/InfoAudit/__init__.robot rename to 2-Web/InfoAudit/__init__.robot diff --git a/Web/Mall/ProductResource.robot b/2-Web/Mall/ProductResource.robot similarity index 100% rename from Web/Mall/ProductResource.robot rename to 2-Web/Mall/ProductResource.robot diff --git a/Web/Mall/product.robot b/2-Web/Mall/product.robot similarity index 100% rename from Web/Mall/product.robot rename to 2-Web/Mall/product.robot diff --git a/output/log.html b/output/log.html index a52b908..7909018 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};