bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 f2d9a18889b787ce8a7c961376ec9940e99ada26 1 个父辈 d4d6d26c

add README

内嵌 并排对比
正在显示 19 个修改的文件 包含 188 行增加 和 422 行删除
... ... @@ -2,29 +2,21 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/order/list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/refreshToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/refreshToken.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" beforeDir="false" afterPath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/reports/20200812T033205.613604.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/reports/20200812T033521.571604.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
</list>
... ... @@ -36,35 +28,26 @@
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595408122991" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597223804431" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597287878682" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597224770757" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597287208188" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1041">
<caret line="94" selection-start-line="94" selection-start-column="1" selection-end-line="95" selection-end-column="66" />
<state relative-caret-position="410">
<caret line="73" selection-start-line="73" selection-end-line="74" selection-end-column="69" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
<caret line="20" column="52" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="49" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="49" />
<state relative-caret-position="52">
<caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
</state>
</provider>
</entry>
... ... @@ -72,29 +55,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="996">
<caret line="189" column="24" lean-forward="true" selection-start-line="189" selection-start-column="24" selection-end-line="189" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74">
<caret line="60" column="32" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="32" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
<state relative-caret-position="877">
<caret line="113" selection-start-line="113" selection-end-line="140" selection-end-column="14" />
</state>
</provider>
</entry>
... ... @@ -110,9 +72,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>今日新增意向订单</find>
<find>todayRealMoney</find>
<find>orderQuantity</find>
<find>partShipmentQuantity</find>
<find>allShipmentQuantity</find>
<find>get_allShipmentQuantity_from_database</find>
... ... @@ -122,8 +81,6 @@
<find>todayIntentionMoney</find>
<find>todayIntentionQuantity</find>
<find>get_purpose_address_from_database</find>
<find>get_purpose_id_from_database</find>
<find>buyerPhone</find>
<find>todayRealQuantity</find>
<find>rou</find>
<find>get_partner_id_from_database</find>
... ... @@ -136,7 +93,15 @@
<find>get_partner_account</find>
<find>received</find>
<find>outstanding</find>
<find>get_purpose_id_from_database</find>
<find>address</find>
<find>buyerPhone</find>
<find>orderDist</find>
<find>admin_account</find>
<find>actual_address</find>
<find>get_actual_delivery_code_from_database</find>
<find>get_order_status_from_database</find>
<find>get_actual_id_from_database</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -145,12 +110,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
... ... @@ -174,10 +133,8 @@
<option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
<option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" />
... ... @@ -190,16 +147,24 @@
<option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />
<option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" />
<option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-116" />
<option name="y" value="347" />
<option name="width" value="1382" />
... ... @@ -239,30 +204,31 @@
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="helpfunc" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="purpose" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="helpfunc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="actual" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="dividend" type="462c0819:PsiDirectoryNode" />
<item name="order" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="order" type="462c0819:PsiDirectoryNode" />
<item name="purpose" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -316,7 +282,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python.pg_db_func">
<component name="RunManager" selected="Python.pg_app_db_func">
<configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="partner_api" />
<option name="INTERPRETER_OPTIONS" value="" />
... ... @@ -407,8 +373,8 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.db_pg_func" />
</list>
... ... @@ -459,21 +425,22 @@
<workItem from="1596899522553" duration="58000" />
<workItem from="1597197819907" duration="7375000" />
<workItem from="1597211046716" duration="9744000" />
<workItem from="1597281783377" duration="7250000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="195207000" />
<option name="totallyTimeSpent" value="202457000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.3052575" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.30954936" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.2857143" />
<window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" />
<window_info anchor="bottom" id="Message" order="2" />
<window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" />
<window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" />
... ... @@ -496,23 +463,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-462">
<caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
... ... @@ -585,20 +535,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
... ... @@ -606,13 +542,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="832">
<caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
... ... @@ -620,13 +549,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="11" column="52" lean-forward="true" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="658">
... ... @@ -737,72 +659,127 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
<caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
<state relative-caret-position="520">
<caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
<state relative-caret-position="395">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
<state relative-caret-position="78">
<caret line="3" column="38" selection-start-line="3" selection-start-column="38" selection-end-line="3" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
<caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74">
<caret line="60" column="32" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="32" />
<state relative-caret-position="412">
<caret line="91" column="14" selection-start-line="91" selection-start-column="14" selection-end-line="91" selection-end-column="14" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="20">
<caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="46" />
<state relative-caret-position="5">
<caret line="3" column="46" lean-forward="true" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1041">
<caret line="94" selection-start-line="94" selection-start-column="1" selection-end-line="95" selection-end-column="66" />
<state relative-caret-position="52">
<caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
<caret line="20" column="52" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" />
<state relative-caret-position="421">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="49" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="49" />
<state relative-caret-position="410">
<caret line="73" selection-start-line="73" selection-end-line="74" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="52">
<caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="996">
<caret line="189" column="24" lean-forward="true" selection-start-line="189" selection-start-column="24" selection-end-line="189" selection-end-column="24" />
<state relative-caret-position="877">
<caret line="113" selection-start-line="113" selection-end-line="140" selection-end-column="14" />
</state>
</provider>
</entry>
... ...
name: 查看实际订单详情
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
id: ${get_actual_id_from_database(order)}
id: ${get_actual_id_from_database()}
request:
headers:
Content-Type: application/json;charset=utf-8
... ... @@ -15,7 +14,4 @@ request:
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
\ No newline at end of file
- ok
\ No newline at end of file
... ...
name: 合伙人搜索——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
partner: ${get_partner_id_from_database()}
request:
headers:
... ... @@ -18,7 +17,4 @@ request:
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
\ No newline at end of file
- ok
\ No newline at end of file
... ...
name: 搜索订单号——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
searchText: ${get_actual_delivery_code_from_database()}
partner: ${get_partner_id_from_database()}
request:
... ... @@ -19,7 +18,4 @@ request:
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.status
- $orderStatue
\ No newline at end of file
- ok
\ No newline at end of file
... ...
name: 意向订单编辑
base_url: ${ENV(base_manager_url)}
variables:
address: ${get_purpose_address_from_database(order)}
id: ${get_purpose_id_from_database(order)}
buyer: ${get_purpose_buyer_from_database(order)}
buyerPhone: ${get_purpose_buyerPhone_from_database(order)}
orderDist: ${get_purpose_orderDist_from_database(order)}
orderId: ${get_purpose_orderId_from_database(order)}
orderName: ${get_purpose_orderName_from_database(order)}
orderid: ${get_purpose_id_from_database()}
partner: ${get_partner_name_from_database()}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
buyer: $buyer
buyerPhone: $buyerPhone
address: $address
partner: 29
partnerRatio: 10.2
salesmanRatio: 0.99
orderId: $orderId
orderName: $orderName
orderNum: 500
orderPrice: 1000
orderDist: $orderDist
id: $id
orderId: ${get_nowtime()}
buyer: 我是客户${get_second()}
orderDist: '福建二区'
partnerID: ${get_partner_id_from_database()}
partner: $partner
id: $orderid
commissionProportion: 10.2
product:
- id: ${get_ID_from_database(0)}
productName: 产品名称${get_second()}
orderNum: 33
univalence: 1.12
partnerRatio: 1.27
- id: ${get_ID_from_database(1)}
productName: 产品名称${get_second()}
orderNum: 45
univalence: 2.22
partnerRatio: 5.7
method: POST
url: v1/order/purpose/update
validate:
... ...
name: 合伙人搜索——意向订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_purpose_order_status_from_database(order)}
partner: ${get_partner_id_from_database()}
request:
headers:
Content-Type: application/json;charset=utf-8
... ... @@ -10,14 +10,11 @@ request:
json:
pageNumber: 1
pageSize: 10
partner: 29
partner: $partner
searchText: ''
method: POST
url: v1/order/purpose/list
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
\ No newline at end of file
- ok
\ No newline at end of file
... ...
name: 搜索订单号——意向订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_purpose_order_status_from_database(order)}
searchText: ${get_purpose_orderId_from_database(order)}
request:
headers:
... ... @@ -18,7 +17,4 @@ request:
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
\ No newline at end of file
- ok
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTcyNjc3NjQsImlhdCI6MTU5NzIyNDU2NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzIyNDU2NCwidWlkIjoxOH0.3LItQh9bAjVXu-77Rl_EbejijxOfA1-CjcpNqWRsXnc
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTczMzIxMjIsImlhdCI6MTU5NzI4ODkyMiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzI4ODkyMiwidWlkIjoxOH0.keiW0ynf6DGb-3vkp0zBZR02ZuR3ujTlEfUAnJZxW6M
\ No newline at end of file
... ...
... ... @@ -74,13 +74,13 @@ def get_partner_id_from_database():
db.rollback()
db.close()
# print(get_partner_id_from_database())
#获取超级管理员姓名
def get_partner_name_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select partner_name from partner_info where account = '13459147023' '''
print(sql)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -90,7 +90,6 @@ def get_partner_name_from_database():
print(err)
db.rollback()
db.close()
# print(get_partner_name_from_database())
#获取超级管理员账号
def get_partner_account_from_database():
db = GetConnect()
... ...
... ... @@ -34,12 +34,12 @@ def get_admin_account_from_database(tbl):
db.rollback()
db.close()
def get_id_from_database(tbl):
#实际订单的发货单号
def get_actual_delivery_code_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = 'select id from \"{}\" order by id DESC'.format(tbl)
# print(sql)
sql = '''select delivery_code from order_base where order_type = 1 order by id DESC'''
#print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -50,12 +50,12 @@ def get_id_from_database(tbl):
db.rollback()
db.close()
def get_actual_id_from_database(tbl):
#实际订单的id
def get_actual_id_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = 'select id from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# print(sql)
sql = '''select id from order_base where order_type = 1 order by id DESC'''
#print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -65,26 +65,13 @@ def get_actual_id_from_database(tbl):
print(err)
db.rollback()
db.close()
#意向订单id
def get_purpose_id_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select id from "order" where order_type = 2 order by id DESC'''
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_account_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select account from " + tbl + ' ' + 'order by id desc '
sql = '''select id from order_base where order_type = 2 order by id DESC'''
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -94,67 +81,26 @@ def get_account_from_database(tbl):
print(err)
db.rollback()
db.close()
def get_partnername_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select partner_name from " + tbl + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_area_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select region_info from " + tbl + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['regionName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_salesman_from_database(tbl):
#意向订单的产品ID
def get_ID_from_database(id):
db = GetConnect()
cursor = db.cursor()
sql= "select salesman from " + tbl + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0][0]['name']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_phone_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select salesman from " + tbl + ' ' + 'order by id desc '
sql= '''select id from order_good where order_id = {} order by id ASC '''.format(get_purpose_id_from_database())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0][0]['telephone']
result = cursor.fetchall()
return result[id][0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_status_from_database(tbl):
def get_account_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select status from " + tbl + ' ' + 'order by id desc '
sql= "select account from " + tbl + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -168,37 +114,7 @@ def get_status_from_database(tbl):
def get_partnername_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select partner_name from " + tbl + ' ' + "where partner_category = 1" + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_order_status_from_database():
db = GetConnect()
cursor = db.cursor()
sql = '''select bonus_status from order_base where order_type = 1 order by id DESC'''
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_purpose_order_status_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_status from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
sql= "select partner_name from " + tbl + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -209,100 +125,11 @@ def get_purpose_order_status_from_database(tbl):
db.rollback()
db.close()
def get_actual_address_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['shippingAddress']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_actual_buyer_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['buyerName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_purpose_buyer_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['buyerName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_actual_orderDist_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_region_info from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['regionName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_purpose_orderDist_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_region_info from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['regionName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_actual_delivery_code_from_database():
db = GetConnect()
cursor = db.cursor()
sql = '''select delivery_code from order_base where order_type = 1 order by id DESC'''
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
# print(get_actual_delivery_code_from_database())
def get_purpose_orderId_from_database(tbl):
def get_partnername_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_code from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
sql= "select partner_name from " + tbl + ' ' + "where partner_category = 1" + ' ' + 'order by id desc '
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -312,6 +139,3 @@ def get_purpose_orderId_from_database(tbl):
print(err)
db.rollback()
db.close()
print(get_order_status_from_database())
... ...
{
"testcase":[
"testcases/dividend/dividend_statistics_testcases.yml"
"testcases/actual/ACTUAL003_actual_list_testcases.yml"
]
}
\ No newline at end of file
... ...
... ... @@ -3,7 +3,6 @@ config:
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
... ... @@ -16,7 +15,4 @@ teststeps:
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
- ok
\ No newline at end of file
... ...
... ... @@ -3,7 +3,6 @@ config:
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
... ... @@ -17,6 +16,3 @@ teststeps:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.status
- $orderStatue
... ...
... ... @@ -3,7 +3,6 @@ config:
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
... ... @@ -17,6 +16,3 @@ teststeps:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
... ...
... ... @@ -3,7 +3,6 @@ config:
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_purpose_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
... ... @@ -17,6 +16,3 @@ teststeps:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
... ...
... ... @@ -54,8 +54,8 @@ testcases:
#- name: ACTUAL003：合伙人搜索——实际订单列表
# testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml
#
- name: ACTUAL004：搜索订单号——实际订单列表
testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
#- name: ACTUAL004：搜索订单号——实际订单列表
# testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
#
#- name: ACTUAL005：查看实际订单详情
# testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
... ... @@ -71,8 +71,8 @@ testcases:
#- name: PURPOSE003：合伙人搜索——意向订单列表
# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
#- name: PURPOSE004：搜索订单号——意向订单列表
# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
- name: PURPOSE004：搜索订单号——意向订单列表
testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
#- name: PURPOSE005：意向订单转发实发订单
# testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml
... ...