bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 dfe59c5123fcedfe75674d34243dcf3dc8e4f507 1 个父辈 0f25741f

add README

内嵌 并排对比
正在显示 20 个修改的文件 包含 526 行增加 和 174 行删除
... ... @@ -6,4 +6,4 @@
#base_manager_url= https://public-interface.fjmaimaimai.com/mmm-partnermg
#base_manager_url=http://mmm-partnermg-test.fjmaimaimai.com/
base_manager_url=https://public-interface-test.fjmaimaimai.com/partnermg/
#base_url = http://mmm-partner-test.fjmaimaimai.com
\ No newline at end of file
base_url = http://mmm-partner-test.fjmaimaimai.com/
\ No newline at end of file
... ...
... ... @@ -2,22 +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/m_api/purpose/m_order_purpose_detail_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" afterDir="false" />
<change 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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_profile_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/accessToken_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/app_api/login_api.yml" beforeDir="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/login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/login_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>
... ... @@ -28,18 +27,18 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1594742672628" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$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$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="1594718579059" 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">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="84" column="71" selection-start-line="84" selection-start-column="71" selection-end-line="84" selection-end-column="71" />
<state 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>
</provider>
</entry>
... ... @@ -47,8 +46,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
<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>
... ... @@ -56,11 +55,47 @@
</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="66">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml">
<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>
</provider>
</entry>
</file>
<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="369">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<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>
... ... @@ -77,20 +112,23 @@
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>今日新增意向订单</find>
<find>todayIntentionMoney</find>
<find>todayRealQuantity</find>
<find>todayRealMoney</find>
<find>cumulativeQuantity</find>
<find>todayIntentionQuantity</find>
<find>cumulativeMoney</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/db_func.py" />
<option value="$PROJECT_DIR$/api/m_api/m_partner_set-status_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
... ... @@ -121,7 +159,6 @@
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />
... ... @@ -131,8 +168,17 @@
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
<option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/api/app_api/login/login_api.yml" />
<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$/helpfunc/pg_app_db_func.py" />
</list>
</option>
... ... @@ -148,7 +194,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -165,21 +210,14 @@
<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" />
</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="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="purpose" 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" />
... ... @@ -195,13 +233,7 @@
<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="purpose" type="462c0819:PsiDirectoryNode" />
<item name="order" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -212,6 +244,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -222,16 +255,16 @@
<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" />
<recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
<recent name="E:\mmm_auto\partner_api\testcases\purpose" />
<recent name="E:\mmm_auto\partner_api\testcases\actual" />
<recent name="E:\mmm_auto\partner_api\api\m_api\actual" />
<recent name="E:\mmm_auto\partner_api\testcases\partners" />
</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">
... ... @@ -246,7 +279,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python.pg_app_db_func">
<component name="RunManager" selected="Python.pg_db_func">
<configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="partner_api" />
<option name="INTERPRETER_OPTIONS" value="" />
... ... @@ -337,10 +370,10 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.db_pg_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.pg_app_db_func" />
<item itemvalue="Python.db_pg_func" />
</list>
</recent_temporary>
</component>
... ... @@ -365,18 +398,19 @@
<workItem from="1594565757545" duration="5110000" />
<workItem from="1594608711608" duration="14402000" />
<workItem from="1594710916949" duration="12278000" />
<workItem from="1594781185636" duration="14441000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="75206000" />
<option name="totallyTimeSpent" value="89647000" />
</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.2980333" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.30257186" />
<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" />
... ... @@ -385,7 +419,7 @@
<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" weight="0.3270869" />
<window_info anchor="bottom" id="Run" order="7" visible="true" 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" />
... ... @@ -402,62 +436,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_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>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_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>
<entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
</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="88">
<caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" selection-start-line="2" selection-end-line="8" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="19" selection-start-line="19" selection-end-line="22" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
... ... @@ -542,18 +520,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-198" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
... ... @@ -659,13 +625,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-110">
<caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -715,13 +674,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3998">
<caret line="197" column="42" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -736,27 +688,111 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="51" selection-start-line="8" selection-start-column="51" selection-end-line="8" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/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">
<caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="84" column="71" selection-start-line="84" selection-start-column="71" selection-end-line="84" selection-end-column="71" />
<state relative-caret-position="44">
<caret line="8" column="46" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-110">
<caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.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>
</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">
<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">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<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>
</provider>
</entry>
<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="66">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
</state>
</provider>
</entry>
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="70" selection-start-line="70" selection-end-line="70" />
<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>
... ...
name: 获取授权令牌:/v1/auth/accessToken
name: 获取授权令牌
base_url: ${ENV(base_url)}
variables:
currtime1: ${make_time()}
... ... @@ -25,4 +25,4 @@ request:
clientId: lks3Z8Ncn2j
clientSecret: gtfhyjukiol3Qncbvmdwe67khh
method: POST
url: /v1/auth/accessToken
\ No newline at end of file
url: v1/auth/accessToken
\ No newline at end of file
... ...
... ... @@ -6,8 +6,8 @@ variables:
access_token: ''
sign: ${make_sign($currtime, $uuid,$access_token)}
grantType: signInPassword
phone: ${convert_to_string(17770000005)}
password: 406f44fcef8d2e74db0f1b334c48369dcf6b38d0
phone: ${get_partner_account_from_database(partner_info)}
password: ${get_partner_password_from_database(partner_info)}
teardown_hooks:
- ${teardown_hook_get_authcode($response)}
request:
... ... @@ -28,4 +28,4 @@ request:
password: $password
clientId: 'pdf233Znkjo'
method: POST
url: /v1/auth/login
url: v1/auth/login
... ...
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)}
id: ${get_actual_id_from_database(order)}
orderNo: ${get_actual_orderId_from_database(order)}
orderStatus: ${get_order_status_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: 0
pageIndex: 0
startTime: ${get_starTimestamp()}
pageSize: 20
endTime: ${get_endTimestamp()}
method: POST
url: v1/order/list
validate:
- eq:
- content.msg
- $msg
... ...
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)}
todayIntentionQuantity: ${get_todayIntentionQuantity_from_database(order)}
todayIntentionMoney: ${get_todayIntentionMoney_from_database(order)}
todayRealQuantity: ${get_todayRealQuantity_from_database(order)}
todayRealMoney: ${get_todayRealMoney_from_database(order)}
cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}
cumulativeMoney: ${get_cumulativeMoney_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:
method: POST
url: v1/order/statistics
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.cumulativeMoney
- $cumulativeMoney
- eq:
- content.data.statistics.cumulativeQuantity
- $cumulativeQuantity
- eq:
- content.data.statistics.todayIntentionMoney
- $todayIntentionMoney
- eq:
- content.data.statistics.todayIntentionQuantity
- $todayIntentionQuantity
- eq:
- content.data.statistics.todayRealMoney
- $todayRealMoney
- eq:
- content.data.statistics.todayRealQuantity
- $todayRealQuantity
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTM3OTI3ODcsImlzcyI6Imp3dCJ9.IxQHm091FrkOTCE3WTC3-1XycsdRsotllIujsKG8Zpg
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ4MzI5NzEsImlzcyI6Imp3dCJ9.yioVEjZs7VoHzFFW573tMs-ZIYUc2ocTZN4bFsrbhV0
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTM3OTM2NTcsImlzcyI6Imp3dCJ9.RSktD87bv3wl2ctcQRaD9J9GbGPFDwWW1XKfRWrfAbQ
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ4MjY2NzEsImlzcyI6Imp3dCJ9.DFikxWqRmmEiN_Db1bOVgfkdOBKaAHwcLol3Ig6jJBY
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ3ODMxNTIsImlhdCI6MTU5NDczOTk1MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDczOTk1MiwidWlkIjoxOH0.DI-32mxFfLg3r-8jdi-4DS7a_crDZS949MlnY5UU-us
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ4Njg5MTEsImlhdCI6MTU5NDgyNTcxMSwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDgyNTcxMSwidWlkIjoxOH0.cYpLfuPmOkj46VUyocuwxii7LPc3YlkEKqcuciUX_sA
\ No newline at end of file
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTM3OTI4MTcsImlzcyI6Imp3dCJ9.uBQ0vYCvjdou4iQe9tQ9pS94XbjNTiJQTq48Czc5WMo
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc0MTc3NzEsImlzcyI6Imp3dCJ9.rrZJntWukDoJkrgAT6Kx564vlj9klwCLgb6R236_pTU
\ No newline at end of file
... ...
... ... @@ -7,6 +7,7 @@ from helpfunc.db_func import *
from helpfunc.header_func import *
from random import randint
from helpfunc.pg_app_db_func import *
from datetime import date, timedelta
def sleep(n_secs):
time.sleep(n_secs)
... ... @@ -21,6 +22,11 @@ def get_today():
now_today = datetime.datetime.now()
str_time = now_today.strftime("%Y-%m-%d")
return str_time
def get_tomorrow():
tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
return tomorrow
def get_second():
curr_time = datetime.datetime.now()
return curr_time.second
... ... @@ -37,3 +43,35 @@ def create_phone_number(num):
number = random.randint(0,9)
phone_number.append('1%d%d%08d'%(number,number+1,number+2))
return phone_number
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 int(time.mktime(time.strptime(list_time[0], '%Y-%m-%d %H:%M:%S'))*1000)
def get_endTimestamp():
return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
... ...
... ... @@ -4,8 +4,18 @@
# @Author:bxh
# @file: pg_db_func.py
import psycopg2
from datetime import date, timedelta
import datetime
def get_today():
now_today = datetime.datetime.now()
str_time = now_today.strftime("%Y-%m-%d")
return str_time
def get_tomorrow():
tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
return tomorrow
# 获得连接
def GetConnect():
conn = False
... ... @@ -18,7 +28,7 @@ def GetConnect():
except Exception as err:
print("连接数据库失败，%s" % err)
return conn
#获取超级管理员账号
#获取超级管理员id
def get_partner_id_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
... ... @@ -34,6 +44,38 @@ def get_partner_id_from_database(tbl):
print(err)
db.rollback()
db.close()
#获取超级管理员账号
def get_partner_account_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select account from \"{}\" where account = '13459147023' '''.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#获取超级管理员密码
def get_partner_password_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select "password" from \"{}\" where account = '13459147023' '''.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
#累计实发订单
def get_cumulativeQuantity_from_database(tbl):
db = GetConnect()
... ... @@ -67,5 +109,90 @@ def get_cumulativeMoney_from_database(tbl):
print(err)
db.rollback()
db.close()
# print(get_cumulativeMoney_from_database('order'))
#今日新增实发订单金额
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())
# 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_todayRealQuantity_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 (2,3) '''.format(tbl,get_today(),get_tomorrow())
# 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_todayIntentionQuantity_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())
# 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_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())
# 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_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())
# 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_partner_account_from_database('partner_info'))
... ...
... ... @@ -388,4 +388,4 @@ def get_purpose_orderName_from_database(tbl):
db.rollback()
db.close()
# print(get_purpose_order_status_from_database('order'))
\ No newline at end of file
print(get_order_status_from_database('order'))
\ No newline at end of file
... ...
config:
name: login_testcases
name: APP登录用例
base_url: ${ENV(base_url)}
variables:
phone: ${convert_to_string(17770000005)}
phone: ${get_partner_account_from_database(partner_info)}
teststeps:
- name: $phone 登录系统
api: api/app_api/login_api.yml
api: api/app_api/login/login_api.yml
teardown_hooks:
- ${teardown_hook_get_authcode($response)}
# validate:
... ... @@ -16,12 +16,9 @@ teststeps:
# - 登录成功
- name: $phone 获取accessToken
api: api/app_api/accessToken_api.yml
api: api/app_api/login/accessToken_api.yml
teardown_hooks:
- ${teardown_hook_get_accesstoken($response)}
#- name: $phone 获取userinfo
# api: api/app_api/userInfo_api.yml
- name: $phone APP版本升级
api: api/app_api/version_getLatestversionInfo_api.yml
\ No newline at end of file
... ...
config:
name: 全部订单-实发订单列表
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
msg: 成功
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/login_testcases.yml
- name: $phone 全部订单-实发订单列表
api: api/app_api/order/list_0_api.yml
validate:
- eq:
- content.msg
- $msg
\ No newline at end of file
... ...
config:
name: 订单统计
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_partner_account_from_database(partner_info)}
todayIntentionQuantity: ${get_todayIntentionQuantity_from_database(order)}
todayIntentionMoney: ${get_todayIntentionMoney_from_database(order)}
todayRealQuantity: ${get_todayRealQuantity_from_database(order)}
todayRealMoney: ${get_todayRealMoney_from_database(order)}
cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}
cumulativeMoney: ${get_cumulativeMoney_from_database(order)}
msg: 成功
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/login_testcases.yml
- name: $phone 订单统计
api: api/app_api/order/statistics_api.yml
validate:
- eq:
- content.msg
- $msg
- eq:
- content.data.statistics.cumulativeMoney
- $cumulativeMoney
- eq:
- content.data.statistics.cumulativeQuantity
- $cumulativeQuantity
- eq:
- content.data.statistics.todayIntentionMoney
- $todayIntentionMoney
- eq:
- content.data.statistics.todayIntentionQuantity
- $todayIntentionQuantity
- eq:
- content.data.statistics.todayRealMoney
- $todayRealMoney
- eq:
- content.data.statistics.todayRealQuantity
- $todayRealQuantity
\ No newline at end of file
... ...
... ... @@ -50,7 +50,7 @@ testcases:
#- name: ACTUAL001：新增实际订单
# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
# account: ${create_phone_number(3)}
#
#- name: ACTUAL002：编辑实际订单
# testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
... ... @@ -67,7 +67,7 @@ testcases:
#- name: PURPOSE001：新增意向订单
# testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
# account: ${create_phone_number(3)}
#- name: PURPOSE002：编辑意向订单
# testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml
... ... @@ -81,5 +81,11 @@ testcases:
#- name: PURPOSE005：意向订单转发实发订单
# testcase: testcases/purpose/PURPOSE005_purpose_convert_testcases.yml
- name: PURPOSE006：查看意向订单详情
testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml
\ No newline at end of file
#- name: PURPOSE006：查看意向订单详情
# testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml
#- 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
... ...