bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 0f25741f62cb72d0b2f11638705557771df90d22 1 个父辈 dd2d872b

add README

内嵌 并排对比
正在显示 24 个修改的文件 包含 774 行增加 和 243 行删除
... ... @@ -2,35 +2,22 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" afterDir="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/m_order_actual_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" 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_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$/api/m_api/m_order_purpose_add_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_profile_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_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$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.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$/testcases/admin/ADMIN001_add_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/m_login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/m_login_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_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>
... ... @@ -42,43 +29,41 @@
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" 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="1594742672628" 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="1594655535228" 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="1594718579059" 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$/api/m_api/partners/m_partner_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
<state relative-caret-position="158">
<caret line="84" column="71" selection-start-line="84" selection-start-column="71" selection-end-line="84" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
<state relative-caret-position="176">
<caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="64" column="68" selection-start-line="64" selection-start-column="68" selection-end-line="64" selection-end-column="68" />
<state relative-caret-position="369">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -98,17 +83,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_list_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
... ... @@ -118,11 +92,9 @@
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />
... ... @@ -140,12 +112,28 @@
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
<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_edit_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<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$/api/m_api/purpose/m_order_purpose_convert_api.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" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
</list>
</option>
</component>
... ... @@ -191,7 +179,7 @@
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="partners" type="462c0819:PsiDirectoryNode" />
<item name="purpose" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -212,6 +200,12 @@
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" 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="testsuites" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
... ... @@ -228,14 +222,15 @@
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
<recent name="E:\mmm_auto\partner_api\testcases\purpose" />
<recent name="E:\mmm_auto\partner_api\testcases\actual" />
<recent name="E:\mmm_auto\partner_api\api\m_api\actual" />
<recent name="E:\mmm_auto\partner_api\testcases\partners" />
<recent name="E:\mmm_auto\partner_api\api\m_api" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
<recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
</key>
</component>
... ... @@ -251,7 +246,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="" />
... ... @@ -296,6 +291,28 @@
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="pg_app_db_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="partner_api" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/helpfunc" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="pg_db_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="partner_api" />
<option name="INTERPRETER_OPTIONS" value="" />
... ... @@ -320,6 +337,7 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.db_pg_func" />
<item itemvalue="Python.debugtalk" />
... ... @@ -345,21 +363,23 @@
<workItem from="1594540531041" duration="1200000" />
<workItem from="1594542274462" duration="237000" />
<workItem from="1594565757545" duration="5110000" />
<workItem from="1594608711608" duration="14164000" />
<workItem from="1594608711608" duration="14402000" />
<workItem from="1594710916949" duration="12278000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62690000" />
<option name="totallyTimeSpent" value="75206000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" 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.2934947" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2980333" />
<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 active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.42078364" />
<window_info anchor="bottom" id="Message" order="2" />
<window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
<window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
... ... @@ -382,63 +402,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py" />
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml" />
<entry file="file://$PROJECT_DIR$/api/demo_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
... ... @@ -481,16 +444,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="38" selection-start-line="38" selection-end-line="38" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
... ... @@ -505,34 +458,6 @@
</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="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="35" />
</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>
<caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_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$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9">
<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$/testcases/admin/ADMIN001_add_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
... ... @@ -629,45 +554,66 @@
<state relative-caret-position="-198" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="10" lean-forward="true" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />
</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_add_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="48" />
<state relative-caret-position="484">
<caret line="22" selection-start-line="22" selection-end-line="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<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="213">
<caret line="254" column="41" lean-forward="true" selection-start-line="254" selection-start-column="41" selection-end-line="254" selection-end-column="41" />
<state>
<caret column="6" selection-start-column="6" selection-end-column="19" />
</state>
</provider>
</entry>
<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="44">
<caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
<state relative-caret-position="88">
<caret line="4" column="50" selection-start-line="4" selection-start-column="50" selection-end-line="4" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_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$/testcases/actual/ACTUAL003_actual_list_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>
... ... @@ -678,31 +624,142 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="64" column="68" selection-start-line="64" selection-start-column="68" selection-end-line="64" selection-end-column="68" />
<state relative-caret-position="374">
<caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_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="88">
<caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
</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="550">
<caret line="25" selection-start-line="25" selection-end-line="25" />
</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/actual/m_edit_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-110">
<caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" />
</state>
</provider>
</entry>
<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>
<caret line="3" column="57" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="61" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="14" column="67" selection-start-line="14" selection-start-column="67" selection-end-line="14" selection-end-column="67" />
</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>
<caret column="6" selection-start-column="6" selection-end-column="19" />
</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="246">
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
<caret line="34" lean-forward="true" selection-start-line="2" selection-end-line="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />
<caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
<state relative-caret-position="3998">
<caret line="197" column="42" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="14" column="58" selection-start-line="14" selection-start-column="58" selection-end-line="14" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="84" column="71" selection-start-line="84" selection-start-column="71" selection-end-line="84" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</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="369">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ...
name: 实际订单编辑
name: 意向订单编辑
base_url: ${ENV(base_manager_url)}
variables:
address: ${get_address_from_database(order)}
id: ${get_id_from_database(order)}
buyer: ${get_buyer_from_database(order)}
buyerPhone: ${get_buyerPhone_from_database(order)}
orderDist: ${get_orderDist_from_database(order)}
orderId: ${get_orderId_from_database(order)}
orderName: ${get_orderName_from_database(order)}
address: ${get_actual_address_from_database(order)}
id: ${get_actual_id_from_database(order)}
buyer: ${get_actual_buyer_from_database(order)}
buyerPhone: ${get_actual_buyerPhone_from_database(order)}
orderDist: ${get_actual_orderDist_from_database(order)}
orderId: ${get_actual_orderId_from_database(order)}
orderName: ${get_actual_orderName_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
... ...
... ... @@ -2,7 +2,7 @@ name: 查看实际订单详情
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
id: ${get_id_from_database(order)}
id: ${get_actual_id_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
... ...
... ... @@ -2,7 +2,7 @@ name: 搜索订单号——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
searchText: ${get_orderId_from_database(order)}
searchText: ${get_actual_orderId_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
... ...
name: /v1/auth/profile
base_url: ${ENV(base_manager_url)}
variables:
phone: 15005046165
password: d033e22ae348aeb5660fc2140aec35850c4da997
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTMzNTY2NjEsImlhdCI6MTU5MzMxMzQ2MSwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5MzMxMzQ2MSwidWlkIjo2fQ.UOh6EUisrD6gH2m3JrXwfLmRj3OpyaVK0SNwTETDwWk
json:
password: $password
username: ${convert_to_string(13559112969)}
method: POST
url: /v1/auth/profile
... ... @@ -7,15 +7,19 @@ request:
Authorization: Bearer ${get_m_accesstoken()}
json:
buyer: 我是买家${get_second()}
buyerPhone: ${convert_to_string(13459147023)}
address: '福建省福州市收获地址1'
partner: 2
partnerRatio: 99.19
buyerPhone: ${convert_to_string($account)}
address: '福建省福州市收获地址2'
partner: 29
partnerRatio: 10.2
salesmanRatio: 0.99
orderId: ${get_nowtime()}
orderName: ${get_nowtime()}
orderNum: 50000000000
orderPrice: 1000000000
orderDist: '福建一区'
orderNum: 500
orderPrice: 1000
orderDist: '福建二区'
method: POST
url: v1/order/purpose/update
validate:
- eq:
- content.msg
- ok
... ...
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)}
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
orderStatue: 2
method: POST
url: v1/order/purpose/update
validate:
- eq:
- content.msg
- ok
... ...
name: 查看意向订单详情
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_purpose_order_status_from_database(order)}
id: ${get_purpose_id_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
id: ${convert_to_string($id)}
method: POST
url: v1/order/purpose/detail
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
\ 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)}
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
method: POST
url: v1/order/purpose/update
validate:
- eq:
- content.msg
- ok
... ...
name: 合伙人搜索——意向订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_purpose_order_status_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
pageNumber: 1
pageSize: 10
partner: 29
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
... ...
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:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
pageNumber: 1
pageSize: 10
partner: 29
searchText: $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
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ3MDAxOTIsImlhdCI6MTU5NDY1Njk5MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDY1Njk5MiwidWlkIjoxOH0.8G6kqdQYKgJPmLPGTgwLwXbjKWG5jqlEx5zG6vh1RlQ
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ3ODMxNTIsImlhdCI6MTU5NDczOTk1MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDczOTk1MiwidWlkIjoxOH0.DI-32mxFfLg3r-8jdi-4DS7a_crDZS949MlnY5UU-us
\ No newline at end of file
... ...
... ... @@ -6,6 +6,7 @@ from helpfunc.pg_db_func import *
from helpfunc.db_func import *
from helpfunc.header_func import *
from random import randint
from helpfunc.pg_app_db_func import *
def sleep(n_secs):
time.sleep(n_secs)
... ...
#! /usr/bin/env python
# -*- coding: utf-8 -*-
# Date: 2020/7/12 16:27
# @Author:bxh
# @file: pg_db_func.py
import psycopg2
import datetime
# 获得连接
def GetConnect():
conn = False
try:
conn = psycopg2.connect(database="partner_test",
user="bianxinhua_user",
password="Bianxinhua_user#123",
host="101.37.68.23",
port="15432")
except Exception as err:
print("连接数据库失败，%s" % err)
return conn
#获取超级管理员账号
def get_partner_id_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select id from \"{}\" where account = '13459147023' '''.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#累计实发订单
def get_cumulativeQuantity_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select COUNT(id) from \"{}\" where partner_id = {} and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'))
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#累计实发订单金额
def get_cumulativeMoney_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select sum(order_actual_amount) from \"{}\" where partner_id = {} and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'))
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return int(result[0])
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
# print(get_cumulativeMoney_from_database('order'))
... ...
... ... @@ -50,6 +50,38 @@ def get_id_from_database(tbl):
db.rollback()
db.close()
def get_actual_id_from_database(tbl):
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)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_purpose_id_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = 'select id from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
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()
... ... @@ -151,7 +183,7 @@ def get_partnername_from_database(tbl):
def get_order_status_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_status from \"{}\" order by id DESC'.format(tbl)
sql = 'select order_status from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
... ... @@ -163,14 +195,28 @@ def get_order_status_from_database(tbl):
db.rollback()
db.close()
def get_address_from_database(tbl):
def get_purpose_order_status_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" order by id DESC'.format(tbl)
sql = 'select order_status from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
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:
# 发生错误时回滚
... ... @@ -178,10 +224,39 @@ def get_address_from_database(tbl):
db.rollback()
db.close()
def get_buyer_from_database(tbl):
def get_purpose_address_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" where order_type = 2 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 \"{}\" order by id DESC'.format(tbl)
sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
... ... @@ -193,10 +268,25 @@ def get_buyer_from_database(tbl):
db.rollback()
db.close()
def get_buyerPhone_from_database(tbl):
def get_actual_buyerPhone_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]['contactInfo']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_purpose_buyerPhone_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" order by id DESC'.format(tbl)
sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
... ... @@ -208,10 +298,10 @@ def get_buyerPhone_from_database(tbl):
db.rollback()
db.close()
def get_orderDist_from_database(tbl):
def get_actual_orderDist_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_region_info from \"{}\" order by id DESC'.format(tbl)
sql = 'select order_region_info from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
... ... @@ -223,10 +313,40 @@ def get_orderDist_from_database(tbl):
db.rollback()
db.close()
def get_orderId_from_database(tbl):
def get_purpose_orderDist_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_code from \"{}\" order by id DESC'.format(tbl)
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_orderId_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_code from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# 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_orderId_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)
try:
cursor.execute(sql)
... ... @@ -238,10 +358,10 @@ def get_orderId_from_database(tbl):
db.rollback()
db.close()
def get_orderName_from_database(tbl):
def get_actual_orderName_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_name from \"{}\" order by id DESC'.format(tbl)
sql = 'select order_name from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
... ... @@ -252,4 +372,20 @@ def get_orderName_from_database(tbl):
print(err)
db.rollback()
db.close()
print(get_orderId_from_database('order'))
\ No newline at end of file
def get_purpose_orderName_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_name from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
# print(get_purpose_order_status_from_database('order'))
\ No newline at end of file
... ...
config:
name: 新增意向订单
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 新增意向订单
api: api/m_api/purpose/m_order_purpose_add_api.yml
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 编辑意向订单
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 编辑意向订单
api: api/m_api/purpose/m_order_purpose_edit_api.yml
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 合伙人搜索——意向订单列表
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)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 合伙人搜索——意向订单列表
api: api/m_api/purpose/m_order_purpose_partner_list_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
... ...
config:
name: 搜索订单号——意向订单列表
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)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 搜索订单号——意向订单列表
api: api/m_api/purpose/m_order_purpose_searchText_list_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
... ...
config:
name: 意向订单转发实发订单
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 意向订单转发实发订单
api: api/m_api/purpose/m_order_purpose_convert_api.yml
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 查看意向订单详情
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)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 查看意向订单详情
api: api/m_api/purpose/m_order_purpose_detail_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
... ...
... ... @@ -46,20 +46,40 @@ testcases:
#
#- name: PARTNERS006：启用合伙人
# testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
#
#- name: ACTUAL001：新增实际订单
# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
#
#- name: ACTUAL002：编辑实际订单
# testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
#
#- name: ACTUAL003：合伙人搜索——实际订单列表
# testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml
#
#- name: ACTUAL004：搜索订单号——实际订单列表
# testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
#
#- name: ACTUAL005：查看实际订单详情
# testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
#- name: PURPOSE001：新增意向订单
# testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
#- name: PURPOSE002：编辑意向订单
# testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml
#- name: PURPOSE003：合伙人搜索——意向订单列表
# 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_convert_testcases.yml
- name: ACTUAL005：查看实际订单详情
testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
\ No newline at end of file
- name: PURPOSE006：查看意向订单详情
testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml
\ No newline at end of file
... ...