bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 0e1e7429b9160b156e0dd8f1945272d30e02a7f7 1 个父辈 94e68066

add README

内嵌 并排对比
正在显示 19 个修改的文件 包含 236 行增加 和 144 行删除
... ... @@ -2,20 +2,21 @@
<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_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 afterPath="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/order/order_intentions_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/order/list_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_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$/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/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/order/order_list_2_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_list_2_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>
... ... @@ -26,27 +27,30 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CoverageDataManager">
<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$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595000563833" 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="1595001825451" 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="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" selection-start-line="48" selection-start-column="1" selection-end-line="51" selection-end-column="43" />
<state relative-caret-position="26">
<caret line="47" selection-start-line="47" selection-end-line="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
<state relative-caret-position="358">
<caret line="326" lean-forward="true" selection-start-line="326" selection-end-line="326" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -54,51 +58,24 @@
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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="-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$/api/app_api/order/list_0_api.yml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="213">
<caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="199">
<caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
<folding>
<element signature="e#108#123#0" expanded="true" />
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/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>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -120,8 +97,8 @@
<find>partShipmentQuantity</find>
<find>cumulativeQuantity</find>
<find>allShipmentQuantity</find>
<find>allShipmentQuantity</find>
<find>get_allShipmentQuantity_from_database</find>
<find>intentionQuantity</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -130,10 +107,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" />
... ... @@ -172,15 +145,19 @@
<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$/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$/testcases/order/order_list_1_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />
<option value="$PROJECT_DIR$/api/app_api/order/list_0_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$/api/app_api/order/intentions_api.yml" />
<option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.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>
... ... @@ -219,36 +196,37 @@
<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" />
<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="m_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" />
<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" />
<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="testcases" type="462c0819:PsiDirectoryNode" />
<item name="helpfunc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="actual" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -275,6 +253,10 @@
<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" />
... ... @@ -282,10 +264,6 @@
<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">
... ... @@ -421,20 +399,22 @@
<workItem from="1594781185636" duration="15342000" />
<workItem from="1594868693482" duration="7846000" />
<workItem from="1594914151652" duration="1652000" />
<workItem from="1594948652577" duration="13932000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="100046000" />
<option name="totallyTimeSpent" value="113978000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.31164902" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.3161876" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.44974446" />
<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" />
... ... @@ -457,20 +437,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<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">
<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/partners/PARTNERS001_add_partner_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/partners/PARTNERS002_edit_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
... ... @@ -681,13 +647,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-462">
... ... @@ -737,86 +696,107 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_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="-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 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$/api/app_api/order/list_0_api.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="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 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_1_testcases.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="198">
<caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
<state relative-caret-position="66">
<caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
<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="506">
<caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
<state relative-caret-position="44">
<caret line="2" selection-start-line="2" selection-end-line="3" selection-end-column="18" />
</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="176">
<caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
</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="110">
<caret line="5" column="68" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="68" />
<caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">
<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 relative-caret-position="594">
<caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.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="532">
<caret line="34" column="54" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="54" />
<state relative-caret-position="66">
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="176">
<caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.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 relative-caret-position="154">
<caret line="31" column="49" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="26">
<caret line="47" selection-start-line="47" selection-end-line="47" />
</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 relative-caret-position="213">
<caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
</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="1056">
<caret line="48" selection-start-line="48" selection-start-column="1" selection-end-line="51" selection-end-column="43" />
<state relative-caret-position="199">
<caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="358">
<caret line="326" lean-forward="true" selection-start-line="326" selection-end-line="326" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ...
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)}
intentionQuantity: ${get_intentionQuantity_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:
pageIndex: 0
pageSize: 20
method: POST
url: v1/order/intentions
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.intentionQuantity
- $intentionQuantity
... ...
name: 全部订单-实发订单列表
base_url: ${ENV(base_url)}
teardown_hooks:
- ${sleep(10)}
variables:
currtime: ${make_time()}
uuid: ${make_uuid()}
... ...
name: 部分发货-实发订单列表
base_url: ${ENV(base_url)}
teardown_hooks:
- ${sleep(10)}
variables:
currtime: ${make_time()}
uuid: ${make_uuid()}
... ...
name: 全部发货-实发订单列表
base_url: ${ENV(base_url)}
teardown_hooks:
- ${sleep(10)}
variables:
currtime: ${make_time()}
uuid: ${make_uuid()}
... ...
name: 实际订单新增
base_url: ${ENV(base_manager_url)}
teardown_hooks:
- ${sleep(5)}
request:
headers:
Content-Type: application/json;charset=utf-8
... ... @@ -14,8 +16,8 @@ request:
salesmanRatio: 20.2
orderId: ${get_nowtime()}
orderName: ${get_nowtime()}
orderNum: 50
orderPrice: 100
orderNum: 500
orderPrice: 1000000
orderDist: '福建一区'
orderStatue: 3
method: POST
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MjI4NTcsImlzcyI6Imp3dCJ9.6hBdA8s3julIsmqU93C_dTd43bXWl54bDIwrNjERuvs
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5NjM4NDAsImlzcyI6Imp3dCJ9.0vRdFJBZ-KAl4i6VfyveyWfSD77efIuNAeiQWp1rmTU
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MTY1NTcsImlzcyI6Imp3dCJ9.4USIvY0TA3FIVBHKTIu9wT-ywMzoIj5adZYc4T3h1-Y
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5NTc1NDAsImlzcyI6Imp3dCJ9.vviFgl2MmnN9J8q1swQcsMoe84XMLe4f0X5BfSTc_Oc
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ5NTg3NjgsImlhdCI6MTU5NDkxNTU2OCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDkxNTU2OCwidWlkIjoxOH0.Qy8wCF0KL4Z_5a_Hp6lrw2F_QIb98rsxqBCuqsPZRPg
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTUwNDAzOTQsImlhdCI6MTU5NDk5NzE5NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDk5NzE5NCwidWlkIjoxOH0.ytZZMcD5YPV2NwP51D1UpfbdWeGqETJ1BQ5Ii-hbV0Y
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc1MDc2NTcsImlzcyI6Imp3dCJ9.hxXuUiXJIMtPB1Ppfoy8u8Cw_8dJKqoKOzsl522WrXc
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc1NDg2NDAsImlzcyI6Imp3dCJ9.DvDeRgMC2P6LDoCwBOXY6b5UvHy87dThhokOhK_rdrE
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@ from helpfunc.header_func import *
from random import randint
from helpfunc.pg_app_db_func import *
from datetime import date, timedelta
import datetime
def sleep(n_secs):
time.sleep(n_secs)
... ... @@ -78,4 +79,17 @@ def get_starTimestamp():
def get_endTimestamp():
return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
# def get_date_timestamp(date):
# return int(time.mktime(time.strptime(date, '%Y-%m-%d %H:%M:%S'))*1000)
import time
import datetime
def get_date_timestamp():
begin = int(time.mktime(time.strptime(f'{datetime.datetime.now().year}-01-01 0:0:0', '%Y-%m-%d %H:%M:%S'))*1000)
end = int(time.mktime(time.strptime(f'{datetime.datetime.now().year}-12-31 23:59:59', '%Y-%m-%d %H:%M:%S')))
return begin, end
print("{:.2f}".format(1/6))
... ...
... ... @@ -273,7 +273,7 @@ def get_allShipmentQuantity_from_database(tbl):
print(err)
db.rollback()
db.close()
print(get_allShipmentQuantity_from_database('order'))
# print(get_allShipmentQuantity_from_database('order'))
#累计意向订单
def get_intentionQuantity_from_database(tbl):
db = GetConnect()
... ... @@ -290,6 +290,37 @@ def get_intentionQuantity_from_database(tbl):
print(err)
db.rollback()
db.close()
# print(get_intentionQuantity_from_database('order'))
#累计所有年份未收分红
def get_outstanding_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select COALESCE(sum(((order_actual_amount - order_payment_amount ) * partner_bonus_percent)/100),0) as outstanding from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return round(result[0],2)
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#累计所有年份已收分红
def get_received_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select COALESCE(sum((order_payment_amount * partner_bonus_percent)/100),0) as received from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return round(result[0],2)
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
print(get_received_from_database('order'))
... ...
... ... @@ -4,7 +4,7 @@ config:
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
- ${sleep(10)}
teststeps:
- name: $phone 登录系统
... ...
config:
name: 意向订单列表
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
intentionQuantity: ${get_intentionQuantity_from_database(order)}
msg: 成功
teardown_hooks:
- ${sleep(10)}
teststeps:
- name: $phone 登录系统
testcase: testcases/login_testcases.yml
- name: $phone 订单统计
api: api/app_api/order/intentions_api.yml
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.intentionQuantity
- $intentionQuantity
\ No newline at end of file
... ...
... ... @@ -6,7 +6,7 @@ config:
allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}
msg: 成功
teardown_hooks:
- ${sleep(2)}
- ${sleep(10)}
teststeps:
- name: $phone 登录系统
... ...
... ... @@ -46,10 +46,10 @@ testcases:
#- name: PARTNERS006：启用合伙人
# testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
#
#- name: ACTUAL001：新增实际订单
# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
- name: ACTUAL001：新增实际订单
testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
parameters:
account: ${create_phone_number(1)}
#
#- name: ACTUAL002：编辑实际订单
# testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
... ... @@ -92,5 +92,8 @@ testcases:
#- 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
#- name: list_2：全部发货-实发订单列表
# testcase: testcases/order/order_list_2_testcases.yml
#- name: intentions：意向订单列表
# testcase: testcases/order/order_intentions_testcases.yml
\ No newline at end of file
... ...