bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 94e6806606044a5eb5f6c7fc503120be1be1fd3e 1 个父辈 dfe59c51

add README

内嵌 并排对比
正在显示 19 个修改的文件 包含 407 行增加 和 149 行删除
... ... @@ -2,13 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/order/order_list_2_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/app_api/accessToken_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/login_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_0_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" />
... ... @@ -16,7 +15,7 @@
<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$/testcases/login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/login_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_list_0_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>
... ... @@ -27,78 +26,75 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594810655333" 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="1594801138165" 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="1594915080159" 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="1594915424465" 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="1594826376790" 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">
<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="268">
<caret line="90" column="56" selection-start-line="90" selection-start-column="56" selection-end-line="90" selection-end-column="56" />
<state relative-caret-position="1056">
<caret line="48" selection-start-line="48" selection-start-column="1" selection-end-line="51" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="74" column="20" selection-start-line="74" selection-start-column="4" selection-end-line="74" selection-end-column="20" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
<state relative-caret-position="44">
<caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_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="66">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
<state relative-caret-position="72">
<caret line="22" selection-start-line="22" selection-end-line="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213">
<caret line="390" column="36" selection-start-line="390" selection-start-column="6" selection-end-line="390" selection-end-column="36" />
<state relative-caret-position="-220">
<caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
<state relative-caret-position="488">
<caret line="39" column="24" lean-forward="true" selection-start-line="39" selection-start-column="24" selection-end-line="39" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_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="374">
<caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
<state relative-caret-position="169">
<caret line="273" column="21" lean-forward="true" selection-start-line="273" selection-start-column="21" selection-end-line="273" selection-end-column="21" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="180" column="21" selection-start-line="180" selection-start-column="21" selection-end-line="180" selection-end-column="21" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
<state relative-caret-position="532">
<caret line="34" column="54" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="54" />
</state>
</provider>
</entry>
... ... @@ -115,12 +111,17 @@
<component name="FindInProjectRecents">
<findStrings>
<find>今日新增意向订单</find>
<find>todayIntentionMoney</find>
<find>todayRealQuantity</find>
<find>todayRealMoney</find>
<find>cumulativeQuantity</find>
<find>todayIntentionQuantity</find>
<find>cumulativeMoney</find>
<find>todayIntentionMoney</find>
<find>orderQuantity</find>
<find>partShipmentQuantity</find>
<find>cumulativeQuantity</find>
<find>allShipmentQuantity</find>
<find>allShipmentQuantity</find>
<find>get_allShipmentQuantity_from_database</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -129,10 +130,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
<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_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" />
... ... @@ -173,13 +170,17 @@
<option value="$PROJECT_DIR$/api/app_api/login/accessToken_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$/debugtalk.py" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
</list>
</option>
</component>
... ... @@ -194,6 +195,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -222,6 +224,19 @@
<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="actual" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="helpfunc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -233,6 +248,12 @@
<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="order" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -244,7 +265,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -255,10 +275,6 @@
<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\purpose" />
<recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\testcases\order" />
<recent name="E:\mmm_auto\partner_api\api\app_api\order" />
... ... @@ -266,6 +282,10 @@
<recent name="E:\mmm_auto\partner_api\testcases\purpose" />
<recent name="E:\mmm_auto\partner_api\testcases\actual" />
</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>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -279,7 +299,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="" />
... ... @@ -370,9 +390,9 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.db_pg_func" />
</list>
</recent_temporary>
... ... @@ -398,28 +418,29 @@
<workItem from="1594565757545" duration="5110000" />
<workItem from="1594608711608" duration="14402000" />
<workItem from="1594710916949" duration="12278000" />
<workItem from="1594781185636" duration="14441000" />
<workItem from="1594781185636" duration="15342000" />
<workItem from="1594868693482" duration="7846000" />
<workItem from="1594914151652" duration="1652000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="89647000" />
<option name="totallyTimeSpent" value="100046000" />
</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 active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.30257186" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.31164902" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.42078364" />
<window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" 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" />
<window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" />
<window_info anchor="bottom" id="Database Changes" order="6" />
<window_info anchor="bottom" id="Run" order="7" visible="true" weight="0.3270869" />
<window_info anchor="bottom" id="Run" order="7" weight="0.3270869" />
<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" />
... ... @@ -436,34 +457,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<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">
<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/ADMIN002_edit_admin_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/admin/ADMIN004_detail_admin_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/admin/ADMIN005_forbidden_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<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/ADMIN006_forbidden_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
... ... @@ -541,13 +534,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="484">
<caret line="22" selection-start-line="22" selection-end-line="26" />
</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>
... ... @@ -562,13 +548,6 @@
</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">
... ... @@ -730,74 +709,116 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="74" column="20" selection-start-line="74" selection-start-column="4" selection-end-line="74" selection-end-column="20" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
<state relative-caret-position="-88">
<caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.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="-88">
<caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="110">
<caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<state relative-caret-position="301">
<caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
<state relative-caret-position="3427">
<caret line="390" lean-forward="true" selection-start-line="390" selection-end-line="390" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="42" />
<state relative-caret-position="-220">
<caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213">
<caret line="390" column="36" selection-start-line="390" selection-start-column="6" selection-end-line="390" selection-end-column="36" />
<state relative-caret-position="488">
<caret line="39" column="24" lean-forward="true" selection-start-line="39" selection-start-column="24" selection-end-line="39" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
<state relative-caret-position="198">
<caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="90" column="56" selection-start-line="90" selection-start-column="56" selection-end-line="90" selection-end-column="56" />
<state relative-caret-position="506">
<caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="68" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="48" column="23" selection-start-line="48" selection-start-column="23" selection-end-line="48" selection-end-column="23" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="34" column="54" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="54" />
</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="136">
<caret line="180" column="21" selection-start-line="180" selection-start-column="21" selection-end-line="180" selection-end-column="21" />
<state relative-caret-position="169">
<caret line="273" column="21" lean-forward="true" selection-start-line="273" selection-start-column="21" selection-end-line="273" selection-end-column="21" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</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="44">
<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$/api/m_api/actual/m_add_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="22" selection-start-line="22" selection-end-line="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" selection-start-line="48" selection-start-column="1" selection-end-line="51" selection-end-column="43" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -5,9 +5,8 @@ variables:
uuid: ${make_uuid()}
var_access_token: ${get_accesstoken()}
sign: ${make_sign($currtime, $uuid, $var_access_token)}
id: ${get_actual_id_from_database(order)}
orderNo: ${get_actual_orderId_from_database(order)}
orderStatus: ${get_order_status_from_database(order)}
cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}
orderQuantity: ${get_orderQuantity_from_database(order)}
msg: 成功
request:
headers:
... ... @@ -33,3 +32,9 @@ validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.cumulativeQuantity
- $cumulativeQuantity
- eq:
- content.data.statistics.orderQuantity
- $orderQuantity
\ No newline at end of file
... ...
name: 部分发货-实发订单列表
base_url: ${ENV(base_url)}
variables:
currtime: ${make_time()}
uuid: ${make_uuid()}
var_access_token: ${get_accesstoken()}
sign: ${make_sign($currtime, $uuid, $var_access_token)}
partShipmentQuantity: ${get_partShipmentQuantity_from_database(order)}
msg: 成功
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
X-MMM-AccessToken: $var_access_token
X-MMM-AppName: com.mmm.ability
X-MMM-AppProject: ability
X-MMM-DeviceType: '1'
X-MMM-Sign: $sign
X-MMM-Timestamp: $currtime
X-MMM-Uuid: $uuid
X-MMM-Version: 0.4.0
json:
orderAction: 1
pageIndex: 0
startTime: ${get_starTimestamp()}
pageSize: 20
endTime: ${get_endTimestamp()}
method: POST
url: v1/order/list
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.partShipmentQuantity
- $partShipmentQuantity
\ No newline at end of file
... ...
name: 全部发货-实发订单列表
base_url: ${ENV(base_url)}
variables:
currtime: ${make_time()}
uuid: ${make_uuid()}
var_access_token: ${get_accesstoken()}
sign: ${make_sign($currtime, $uuid, $var_access_token)}
allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}
msg: 成功
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
X-MMM-AccessToken: $var_access_token
X-MMM-AppName: com.mmm.ability
X-MMM-AppProject: ability
X-MMM-DeviceType: '1'
X-MMM-Sign: $sign
X-MMM-Timestamp: $currtime
X-MMM-Uuid: $uuid
X-MMM-Version: 0.4.0
json:
orderAction: 2
pageIndex: 0
startTime: ${get_starTimestamp()}
pageSize: 20
endTime: ${get_endTimestamp()}
method: POST
url: v1/order/list
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.allShipmentQuantity
- $allShipmentQuantity
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ4MzI5NzEsImlzcyI6Imp3dCJ9.yioVEjZs7VoHzFFW573tMs-ZIYUc2ocTZN4bFsrbhV0
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MjI4NTcsImlzcyI6Imp3dCJ9.6hBdA8s3julIsmqU93C_dTd43bXWl54bDIwrNjERuvs
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ4MjY2NzEsImlzcyI6Imp3dCJ9.DFikxWqRmmEiN_Db1bOVgfkdOBKaAHwcLol3Ig6jJBY
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MTY1NTcsImlzcyI6Imp3dCJ9.4USIvY0TA3FIVBHKTIu9wT-ywMzoIj5adZYc4T3h1-Y
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ4Njg5MTEsImlhdCI6MTU5NDgyNTcxMSwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDgyNTcxMSwidWlkIjoxOH0.cYpLfuPmOkj46VUyocuwxii7LPc3YlkEKqcuciUX_sA
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ5NTg3NjgsImlhdCI6MTU5NDkxNTU2OCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDkxNTU2OCwidWlkIjoxOH0.Qy8wCF0KL4Z_5a_Hp6lrw2F_QIb98rsxqBCuqsPZRPg
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc0MTc3NzEsImlzcyI6Imp3dCJ9.rrZJntWukDoJkrgAT6Kx564vlj9klwCLgb6R236_pTU
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc1MDc2NTcsImlzcyI6Imp3dCJ9.hxXuUiXJIMtPB1Ppfoy8u8Cw_8dJKqoKOzsl522WrXc
\ No newline at end of file
... ...
... ... @@ -37,13 +37,16 @@ def create_channel(num):
channel.append(i)
return channel
def get_minute():
i = datetime.datetime.now()
return i.minute
def create_phone_number(num):
phone_number = []
for i in range(num):
number = random.randint(0,9)
phone_number.append('1%d%d%08d'%(number,number+1,number+2))
phone_number.append('1%d%d%08d'%(get_minute(),number+1,number+2))
return phone_number
def getMonth():
year = str(datetime.date.today().year)
d = datetime.date.today()
... ... @@ -75,3 +78,4 @@ def get_starTimestamp():
def get_endTimestamp():
return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
... ...
... ... @@ -5,7 +5,8 @@
# @file: pg_db_func.py
import psycopg2
from datetime import date, timedelta
import datetime
import datetime,time
def get_today():
now_today = datetime.datetime.now()
... ... @@ -15,7 +16,36 @@ def get_today():
def get_tomorrow():
tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
return tomorrow
def getMonth():
year = str(datetime.date.today().year)
d = datetime.date.today()
month = '%02d' % d.month
if month in ['01', '03', '05', '07', '08', '10', '12']:
s = str("-01 00:00:00")
e = str("-31 23:59:59")
startTime = year + "-" + str(month) + s
endTime = year + "-" + str(month) + e
list = [startTime, endTime]
return list
elif month == '02':
s = str("-01 00:00:00")
e = str("-28 23:59:59")
startTime = year + "-" + str(month) + s
endTime = year + "-" + str(month) + e
list = [startTime, endTime]
return list
else:
s = str("-01 00:00:00")
e = str("-30 23:59:59")
startTime = year + "-" + str(month) + s
endTime = year + "-" + str(month) + e
list = [startTime, endTime]
return list
list_time = getMonth()
def get_starTimestamp():
return list_time[0]
def get_endTimestamp():
return list_time[1]
# 获得连接
def GetConnect():
conn = False
... ... @@ -115,7 +145,7 @@ def get_todayRealMoney_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 create_at between \'{}\' and \'{}\' and order_status in (2,3) '''.format(tbl,get_today(),get_tomorrow())
sql = '''select COALESCE(sum(order_actual_amount),0) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (2,3) '''.format(tbl,get_today(),get_tomorrow())
# print(sql)
try:
cursor.execute(sql)
... ... @@ -166,7 +196,7 @@ def get_todayIntentionMoney_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 create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow())
sql = '''select COALESCE(sum(order_actual_amount),0) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow())
# print(sql)
try:
cursor.execute(sql)
... ... @@ -182,7 +212,74 @@ def get_orderQuantity_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select COUNT(id) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow())
sql = '''select COUNT(id) from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' and order_type = 1 and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return int(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 create_at between \'{}\' and \'{}\' and order_type = 1 and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return int(result[0])
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#部分发货的订单数量
def get_partShipmentQuantity_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 create_at between \'{}\' and \'{}\' and order_type = 1 and order_status in (2) '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return int(result[0])
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#全部发货的订单数量
def get_allShipmentQuantity_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 create_at between \'{}\' and \'{}\' and order_type = 1 and order_status in (3) '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
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_allShipmentQuantity_from_database('order'))
#累计意向订单
def get_intentionQuantity_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 create_at between \'{}\' and \'{}\' and order_type = 2 '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
# print(sql)
try:
cursor.execute(sql)
... ... @@ -194,5 +291,5 @@ def get_orderQuantity_from_database(tbl):
db.rollback()
db.close()
print(get_partner_account_from_database('partner_info'))
# print(get_intentionQuantity_from_database('order'))
... ...
... ... @@ -388,4 +388,4 @@ def get_purpose_orderName_from_database(tbl):
db.rollback()
db.close()
print(get_order_status_from_database('order'))
\ No newline at end of file
# print(get_order_status_from_database('order'))
\ No newline at end of file
... ...
... ... @@ -3,6 +3,8 @@ config:
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}
orderQuantity: ${get_orderQuantity_from_database(order)}
msg: 成功
teardown_hooks:
- ${sleep(2)}
... ... @@ -17,3 +19,9 @@ teststeps:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.cumulativeQuantity
- $cumulativeQuantity
- eq:
- content.data.statistics.orderQuantity
- $orderQuantity
\ No newline at end of file
... ...
config:
name: 部分发货-实发订单列表
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
partShipmentQuantity: ${get_partShipmentQuantity_from_database(order)}
msg: 成功
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/login_testcases.yml
- name: $phone 部分发货-实发订单列表
api: api/app_api/order/list_1_api.yml
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.partShipmentQuantity
- $partShipmentQuantity
\ No newline at end of file
... ...
config:
name: 全部发货-实发订单列表
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}
msg: 成功
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/login_testcases.yml
- name: $phone 全部发货-实发订单列表
api: api/app_api/order/list_2_api.yml
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.allShipmentQuantity
- $allShipmentQuantity
\ No newline at end of file
... ...
config:
name: 合伙人测试集
testcases:
#- name: ADMIN001：新增管理员
... ... @@ -50,7 +49,7 @@ testcases:
#- name: ACTUAL001：新增实际订单
# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
# parameters:
# account: ${create_phone_number(3)}
# account: ${create_phone_number(1)}
#
#- name: ACTUAL002：编辑实际订单
# testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
... ... @@ -87,5 +86,11 @@ testcases:
#- name: statistics：订单统计
# testcase: testcases/order/order_statistics_testcases.yml
- name: statistics：订单统计
testcase: testcases/order/order_list_0_testcases.yml
\ No newline at end of file
#- name: list_0：全部订单-实发订单列表
# testcase: testcases/order/order_list_0_testcases.yml
#- name: list_1：部分发货-实发订单列表
# testcase: testcases/order/order_list_1_testcases.yml
- name: list_2：全部发货-实发订单列表
testcase: testcases/order/order_list_2_testcases.yml
\ No newline at end of file
... ...