bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 f23ccc4c1b8e5117f99151bde70a39b9386bb456 1 个父辈 76918f01

add README

内嵌 并排对比
正在显示 26 个修改的文件 包含 348 行增加 和 317 行删除
... ... @@ -2,9 +2,28 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/testcases/m_pwd_updat_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$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" 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/login/login_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/login/login_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/order/details_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/details_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_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$/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$/testcases/actual/ACTUAL001_add_actual_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_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/login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/login_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -14,45 +33,30 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</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="1597387621720" 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$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1598518478676" 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="1598517630919" 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="1597394689697" 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="true">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1092">
<caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="10" selection-start-column="10" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
<state relative-caret-position="135">
<caret line="6" column="38" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3302">
<caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" />
<state relative-caret-position="463">
<caret line="55" column="49" selection-start-line="55" selection-start-column="49" selection-end-line="55" selection-end-column="49" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -68,17 +72,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>todayRealQuantity</find>
<find>rou</find>
<find>get_partner_id_from_database</find>
<find>cumulativeMoney</find>
<find>tbl</find>
<find>cumulativeQuantity</find>
<find>receivable</find>
<find>get_partner_account_from_database()</find>
<find>partner_account</find>
<find>get_partner_account</find>
<find>received</find>
<find>outstanding</find>
<find>address</find>
<find>buyerPhone</find>
... ... @@ -96,8 +89,19 @@
<find>get_salesman_from_database</find>
<find>get_status_from_database</find>
<find>get_phone_from_database</find>
<find>get_purpose_id_from_database</find>
<find>get_ID_from_database</find>
<find>get_purpose_order_status_from_database</find>
<find>get_purpose_id_from_database</find>
<find>get_todayRealQuantity_from_database</find>
<find>get_cumulativeMoney_from_database</find>
<find>get_accesstoken</find>
<find>get_partner_password_from_database</find>
<find>get_detailAction_0_use_partner_bonus_amount_from_database</find>
<find>get_detailAction_0_order_code_from_database</find>
<find>get_detailAction_1_order_code_from_database</find>
<find>get_partner_account_from_database</find>
<find>print</find>
<find>create_phone_number</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -106,21 +110,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/list_api.yml" />
<option value="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" />
<option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" />
<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$/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$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
... ... @@ -145,18 +134,33 @@
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.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$/helpfunc/pg_app_db_func.py" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.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_del_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/ACTUAL007_purpose_del_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" />
<option value="$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
<option value="$PROJECT_DIR$/api/app_api/login/login_api.yml" />
<option value="$PROJECT_DIR$/testcases/login_testcases.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_statistics_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$/testcases/order/order_details_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
<option value="$PROJECT_DIR$/api/app_api/order/details_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
</list>
</option>
</component>
... ... @@ -187,7 +191,34 @@
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="app_api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="app_api" type="462c0819:PsiDirectoryNode" />
<item name="login" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="app_api" 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="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -203,11 +234,47 @@
<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="admin" 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" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="dividends" 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" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="partners" 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="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>
<path>
... ... @@ -228,7 +295,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../task_api" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
... ... @@ -258,7 +325,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python.pg_db_func">
<component name="RunManager" selected="Python.debugtalk">
<configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="partner_api" />
<option name="INTERPRETER_OPTIONS" value="" />
... ... @@ -349,9 +416,9 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.db_pg_func" />
</list>
</recent_temporary>
... ... @@ -404,26 +471,28 @@
<workItem from="1597281783377" duration="7250000" />
<workItem from="1597383690773" duration="12705000" />
<workItem from="1597627721793" duration="3189000" />
<workItem from="1598498839511" duration="11432000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="218351000" />
<option name="totallyTimeSpent" value="229783000" />
</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 active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.31813306" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.277897" />
<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" visible="true" weight="0.2857143" />
<window_info anchor="bottom" id="Terminal" order="1" 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" />
<window_info anchor="bottom" id="Python Console" order="5" weight="0.328125" />
<window_info anchor="bottom" id="Database Changes" order="6" />
<window_info anchor="bottom" id="Run" order="7" sideWeight="0.49946353" weight="0.32700893" />
<window_info active="true" anchor="bottom" id="Run" order="7" sideWeight="0.49946353" visible="true" weight="0.32700893" />
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" />
<window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
... ... @@ -440,208 +509,133 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<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/actual/m_order_actual_partner_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<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$/api/m_api/purpose/m_order_purpose_partner_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$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
<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="421">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
<state relative-caret-position="494">
<caret line="19" column="42" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_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 relative-caret-position="78">
<caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/header_func.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="7" selection-start-line="7" selection-end-line="7" />
</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="78">
<caret line="3" column="40" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
<state relative-caret-position="177">
<caret line="77" column="19" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-47" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" column="59" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="59" />
<state relative-caret-position="234">
<caret line="9" column="8" selection-start-line="9" selection-end-line="9" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" column="48" lean-forward="true" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="48" />
<state relative-caret-position="525">
<caret line="28" lean-forward="true" selection-start-line="17" selection-end-line="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" />
<state relative-caret-position="213">
<caret line="9" column="82" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="82" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
<state relative-caret-position="182">
<caret line="7" column="61" selection-start-line="7" selection-start-column="61" selection-end-line="7" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
<state relative-caret-position="130">
<caret line="5" column="65" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
<state relative-caret-position="279">
<caret line="362" column="13" selection-start-line="362" selection-start-column="8" selection-end-line="362" selection-end-column="13" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
<state relative-caret-position="279">
<caret line="243" column="13" selection-start-line="243" selection-start-column="8" selection-end-line="243" selection-end-column="13" />
</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/admin/m_admin_update(new)_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
<state relative-caret-position="234">
<caret line="9" column="45" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" column="57" selection-start-line="4" selection-start-column="47" selection-end-line="4" selection-end-column="57" />
<state relative-caret-position="234">
<caret line="9" column="51" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</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="78">
<caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
</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="104">
<caret line="4" column="49" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="49" />
</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="104">
<caret line="4" column="38" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
</state>
<state relative-caret-position="-78" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/order/details_api.yml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="182">
<caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/api.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="64" selection-start-line="64" selection-end-line="64" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="806">
<caret line="31" selection-start-line="31" selection-end-line="42" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="16" column="12" lean-forward="true" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
<state relative-caret-position="156">
<caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="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>
<caret column="11" selection-start-column="11" selection-end-column="11" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -657,127 +651,130 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3712">
<caret line="77" column="34" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="34" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
<state relative-caret-position="338">
<caret line="13" column="53" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />
</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="494">
<caret line="19" column="42" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="42" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
<state relative-caret-position="468">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</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="312">
<caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
<caret line="13" column="53" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_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 file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
<state relative-caret-position="156">
<caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
<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="260">
<caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
<caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="53" />
<state relative-caret-position="260">
<caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<state relative-caret-position="450">
<caret line="18" column="12" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/testcases/order/order_details_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3302">
<caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" />
<state relative-caret-position="78">
<caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
<state relative-caret-position="442">
<caret line="17" selection-start-line="17" selection-end-line="34" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="10" selection-start-column="10" selection-end-column="10" />
<state relative-caret-position="135">
<caret line="6" column="38" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1092">
<caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
<state relative-caret-position="463">
<caret line="55" column="49" selection-start-line="55" selection-start-column="49" selection-end-line="55" selection-end-column="49" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -5,7 +5,7 @@ variables:
uuid: ${make_uuid()}
var_access_token: ${get_accesstoken()}
sign: ${make_sign($currtime, $uuid, $var_access_token)}
order_code: ${get_detailAction_0_order_code_from_database()}
order_code: ${get_detailAction_1_order_code_from_database()}
plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()}
use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()}
endTime: ${get_Decembe_timestamp()}
... ...
... ... @@ -6,8 +6,8 @@ variables:
access_token: ''
sign: ${make_sign($currtime, $uuid,$access_token)}
grantType: signInPassword
phone: ${get_partner_account_from_database(partner_info)}
password: ${get_partner_password_from_database(partner_info)}
phone: ${get_partner_account_from_database()}
password: ${get_partner_password_from_database()}
teardown_hooks:
- ${teardown_hook_get_authcode($response)}
request:
... ...
... ... @@ -5,6 +5,7 @@ variables:
uuid: ${make_uuid()}
var_access_token: ${get_accesstoken()}
sign: ${make_sign($currtime, $uuid, $var_access_token)}
id: ${get_order_id_from_database()}
msg: 成功
request:
headers:
... ...
... ... @@ -29,19 +29,15 @@ validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.cumulativeMoney
- $cumulativeMoney
- eq:
- content.data.statistics.cumulativeQuantity
- $cumulativeQuantity
- eq:
- content.data.statistics.todayRealMoney
- $todayRealMoney
- eq:
- content.data.statistics.todayRealQuantity
- $todayRealQuantity
\ No newline at end of file
... ...
name: 查看意向订单详情
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_purpose_order_status_from_database(order)}
id: ${get_purpose_id_from_database(order)}
id: ${get_purpose_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
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMzE1NjEsImlzcyI6Imp3dCJ9.SCmOoYbOdyBU5r1TFKqMBc2mE1Bl5DKczz0qwPYGCDQ
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTg1MjU3NDgsImlzcyI6Imp3dCJ9.iotyp9M5L_NkNwjAN1pmgyzdC3P0uz2HqaoA41_tofk
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMjUyNjEsImlzcyI6Imp3dCJ9.Uf0zt3mGOTazmo7kUSPFfKrziMtPQNPFpR23WYwgzQs
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTg1MTk0NDgsImlzcyI6Imp3dCJ9.PzdQ2IZB9FBsOIWQ2bUfcNfCWgsN8TBZlEzCRmy1a5M
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTc0MzkwMTAsImlhdCI6MTU5NzM5NTgxMCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzM5NTgxMCwidWlkIjoxOH0.8DkBF75udtyGNq4xH4LNnXtYXZH3SeAPpeP944JFka0
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg1NjE3NDIsImlhdCI6MTU5ODUxODU0MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5ODUxODU0MiwidWlkIjoxOH0.yM7bvqkMJNW9-cNrQt4f5VEV6bcNV0syOC7sAwWQPGA
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTk4MTYzNjEsImlzcyI6Imp3dCJ9.zr9lz7ptdaJxXew2QElTBhyJ-39zJxjP6jNxjMK0zyo
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE2MDExMTA1NDgsImlzcyI6Imp3dCJ9.qNFWG4joHY93kPIJvvnwxL3hpS9K8h8Wr_wBr7JSA4Q
\ No newline at end of file
... ...
... ... @@ -46,7 +46,7 @@ def create_phone_number(num):
phone_number = []
for i in range(num):
number = random.randint(0,9)
phone_number.append('1%d%d%08d'%(get_minute(),number+1,number+2))
phone_number.append('1%d%d%07d'%(get_minute(),number+1,number))
return phone_number
def getMonth():
year = str(datetime.date.today().year)
... ...
... ... @@ -106,7 +106,22 @@ def get_partner_account_from_database():
print(err)
db.rollback()
db.close()
#获取合伙人密码
def get_partner_password_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select "password" from partner_info where account = \'{}\''''.format(get_partner_account_from_database())
# 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():
db = GetConnect()
... ... @@ -130,7 +145,7 @@ def get_cumulativeMoney_from_database():
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select sum(plan_order_amount) from order_base where partner_id = {} and order_type in (1) '''.format(get_partner_id_from_database())
# print(sql)
print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -143,7 +158,6 @@ def get_cumulativeMoney_from_database():
print(err)
db.rollback()
db.close()
# print(get_cumulativeMoney_from_database())
#今日新增实发订单金额
def get_todayRealMoney_from_database():
db = GetConnect()
... ... @@ -258,12 +272,12 @@ def get_received_from_database():
db.rollback()
db.close()
#已收/未收明细列表--发货单号
#已收明细列表--发货单号
def get_detailAction_0_order_code_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select order_code from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database())
sql = '''select delivery_code from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database())
# print(sql)
try:
cursor.execute(sql)
... ... @@ -275,6 +289,22 @@ def get_detailAction_0_order_code_from_database():
db.rollback()
db.close()
#未收明细列表--发货单号
def get_detailAction_1_order_code_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select delivery_code from order_base where partner_id = {} and order_type=1 and partner_bonus_not > 0 order by id desc '''.format(get_partner_id_from_database())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#已收/未收明细列表--订单金额
def get_detailAction_0_plan_order_amount_from_database():
... ... @@ -303,10 +333,33 @@ def get_detailAction_0_use_partner_bonus_amount_from_database():
try:
cursor.execute(sql)
result = cursor.fetchone()
if result[0] == -1.0:
sql = '''select partner_bonus_has from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(
get_partner_id_from_database())
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
else:
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#获取订单id
def get_order_id_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select id from order_base where partner_id = {} and order_type=1 order by id desc '''.format(get_partner_id_from_database())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
# print(get_detailAction_0_use_partner_bonus_amount_from_database())
... ...
... ... @@ -139,7 +139,6 @@ def get_dividends_ID_from_database(id):
print(err)
db.rollback()
db.close()
print(get_dividends_ID_from_database(0))
#意向订单的产品名称
def get_productName_from_database(id):
db = GetConnect()
... ... @@ -245,4 +244,3 @@ def get_status_from_database():
print(err)
db.rollback()
db.close()
# print(get_status_from_database())
\ No newline at end of file
... ...
{
"testcase":[
"testcases/partners/PARTNERS004_list_partner_testcases.yml"
"testcases/admin/ADMIN001_add_admin_testcases.yml"
]
}
\ No newline at end of file
... ...
... ... @@ -4,7 +4,7 @@ config:
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(10)}
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
... ...
... ... @@ -8,7 +8,7 @@ config:
use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()}
msg: 成功
teardown_hooks:
- ${sleep(3)}
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
... ...
... ... @@ -3,7 +3,7 @@ config:
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database()}
order_code: ${get_detailAction_0_order_code_from_database()}
order_code: ${get_detailAction_1_order_code_from_database()}
plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()}
use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()}
msg: 成功
... ...
... ... @@ -8,7 +8,7 @@ config:
outstanding: ${get_outstanding_from_database()}
msg: 成功
teardown_hooks:
- ${sleep(3)}
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
... ...
... ... @@ -2,7 +2,7 @@ config:
name: APP登录用例
base_url: ${ENV(base_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
phone: ${get_partner_account_from_database()}
teststeps:
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 订单详情
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
phone: ${get_partner_account_from_database()}
msg: 成功
teardown_hooks:
- ${sleep(2)}
... ...
config:
name: 订单统计
base_url: ${ENV(base_manager_url)}
base_url: ${ENV(base_url)}
variables:
phone: ${get_partner_account_from_database()}
todayRealQuantity: ${get_todayRealQuantity_from_database()}
... ... @@ -12,7 +12,7 @@ config:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
- name: 登录系统
testcase: testcases/login_testcases.yml
- name: $phone 订单统计
... ... @@ -21,19 +21,15 @@ teststeps:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.cumulativeMoney
- $cumulativeMoney
- eq:
- content.data.statistics.cumulativeQuantity
- $cumulativeQuantity
- eq:
- content.data.statistics.todayRealMoney
- $todayRealMoney
- eq:
- content.data.statistics.todayRealQuantity
- $todayRealQuantity
\ 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_purpose_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
... ... @@ -17,6 +16,3 @@ teststeps:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
... ...
config:
name: 合伙人测试集
testcases:
- name: ADMIN001：新增管理员
testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
parameters:
... ... @@ -16,7 +14,7 @@ testcases:
- name: ADMIN004：查看管理员
testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml
#
- name: ADMIN005：禁用管理员
testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml
... ... @@ -45,7 +43,7 @@ testcases:
- name: PARTNERS006：启用合伙人
testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
#
- name: ACTUAL001：新增实际订单
testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
parameters:
... ...