正在显示
29 个修改的文件
包含
414 行增加
和
2793 行删除
| @@ -2,26 +2,29 @@ | @@ -2,26 +2,29 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment=""> | 4 | <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/reports/20200812T033205.613604.html" afterDir="false" /> | ||
| 6 | - <change afterPath="$PROJECT_DIR$/reports/20200812T033521.571604.html" afterDir="false" /> | ||
| 7 | - <change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" /> | ||
| 8 | - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||
| 9 | - <change beforePath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" afterDir="false" /> | ||
| 10 | - <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" afterDir="false" /> | 5 | + <change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" afterDir="false" /> |
| 6 | + <change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" afterDir="false" /> | ||
| 7 | + <change beforePath="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" afterDir="false" /> | ||
| 8 | + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_api.yml" afterDir="false" /> | ||
| 9 | + <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" beforeDir="false" /> | ||
| 10 | + <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" afterDir="false" /> | ||
| 11 | + <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" /> | ||
| 11 | <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" /> | 12 | <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" /> |
| 12 | <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" /> | 13 | <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" /> |
| 13 | <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> | 14 | <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> |
| 14 | <change beforePath="$PROJECT_DIR$/config/refreshToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/refreshToken.csv" afterDir="false" /> | 15 | <change beforePath="$PROJECT_DIR$/config/refreshToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/refreshToken.csv" afterDir="false" /> |
| 16 | + <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> | ||
| 15 | <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" /> | 17 | <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" /> |
| 16 | - <change beforePath="$PROJECT_DIR$/reports/20200806T015502.489234.html" beforeDir="false" /> | ||
| 17 | - <change beforePath="$PROJECT_DIR$/reports/20200806T020234.973114.html" beforeDir="false" /> | ||
| 18 | - <change beforePath="$PROJECT_DIR$/reports/20200806T020249.929970.html" beforeDir="false" /> | ||
| 19 | - <change beforePath="$PROJECT_DIR$/reports/20200806T022337.373320.html" beforeDir="false" /> | ||
| 20 | - <change beforePath="$PROJECT_DIR$/reports/20200806T022632.120315.html" beforeDir="false" /> | ||
| 21 | - <change beforePath="$PROJECT_DIR$/reports/20200806T034153.490922.html" beforeDir="false" /> | ||
| 22 | - <change beforePath="$PROJECT_DIR$/reports/20200807T130412.509038.html" beforeDir="false" /> | ||
| 23 | - <change beforePath="$PROJECT_DIR$/reports/20200807T131750.133804.html" beforeDir="false" /> | ||
| 24 | - <change beforePath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" afterDir="false" /> | 18 | + <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" /> |
| 19 | + <change beforePath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" beforeDir="false" afterPath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" afterDir="false" /> | ||
| 20 | + <change beforePath="$PROJECT_DIR$/reports/20200812T033205.613604.html" beforeDir="false" /> | ||
| 21 | + <change beforePath="$PROJECT_DIR$/reports/20200812T033521.571604.html" beforeDir="false" /> | ||
| 22 | + <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" beforeDir="false" /> | ||
| 23 | + <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" /> | ||
| 24 | + <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" afterDir="false" /> | ||
| 25 | + <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" afterDir="false" /> | ||
| 26 | + <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" afterDir="false" /> | ||
| 27 | + <change beforePath="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" afterDir="false" /> | ||
| 25 | <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> | 28 | <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> |
| 26 | <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> | 29 | <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> |
| 27 | </list> | 30 | </list> |
| @@ -33,74 +36,65 @@ | @@ -33,74 +36,65 @@ | ||
| 33 | </component> | 36 | </component> |
| 34 | <component name="CoverageDataManager"> | 37 | <component name="CoverageDataManager"> |
| 35 | <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595408122991" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> | 38 | <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595408122991" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> |
| 36 | - <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597204031938" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> | 39 | + <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597223804431" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> |
| 37 | <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" /> | 40 | <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" /> |
| 38 | - <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1596181551908" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> | 41 | + <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597224770757" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> |
| 39 | </component> | 42 | </component> |
| 40 | <component name="FileEditorManager"> | 43 | <component name="FileEditorManager"> |
| 41 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 44 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 42 | <file pinned="false" current-in-tab="false"> | 45 | <file pinned="false" current-in-tab="false"> |
| 43 | <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> | 46 | <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> |
| 44 | <provider selected="true" editor-type-id="text-editor"> | 47 | <provider selected="true" editor-type-id="text-editor"> |
| 45 | - <state relative-caret-position="2210"> | ||
| 46 | - <caret line="85" selection-start-line="85" selection-end-line="86" selection-end-column="60" /> | 48 | + <state relative-caret-position="1041"> |
| 49 | + <caret line="94" selection-start-line="94" selection-start-column="1" selection-end-line="95" selection-end-column="66" /> | ||
| 47 | </state> | 50 | </state> |
| 48 | </provider> | 51 | </provider> |
| 49 | </entry> | 52 | </entry> |
| 50 | </file> | 53 | </file> |
| 51 | <file pinned="false" current-in-tab="false"> | 54 | <file pinned="false" current-in-tab="false"> |
| 52 | - <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml"> | 55 | + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml"> |
| 53 | <provider selected="true" editor-type-id="text-editor"> | 56 | <provider selected="true" editor-type-id="text-editor"> |
| 54 | - <state relative-caret-position="390"> | ||
| 55 | - <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" /> | 57 | + <state relative-caret-position="520"> |
| 58 | + <caret line="20" column="52" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" /> | ||
| 56 | </state> | 59 | </state> |
| 57 | </provider> | 60 | </provider> |
| 58 | </entry> | 61 | </entry> |
| 59 | </file> | 62 | </file> |
| 60 | <file pinned="false" current-in-tab="false"> | 63 | <file pinned="false" current-in-tab="false"> |
| 61 | - <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml"> | 64 | + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> |
| 62 | <provider selected="true" editor-type-id="text-editor"> | 65 | <provider selected="true" editor-type-id="text-editor"> |
| 63 | - <state relative-caret-position="962"> | ||
| 64 | - <caret line="37" column="54" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="54" /> | ||
| 65 | - </state> | ||
| 66 | - </provider> | ||
| 67 | - </entry> | ||
| 68 | - </file> | ||
| 69 | - <file pinned="false" current-in-tab="false"> | ||
| 70 | - <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> | ||
| 71 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 72 | - <state relative-caret-position="182"> | ||
| 73 | - <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="52" /> | 66 | + <state relative-caret-position="78"> |
| 67 | + <caret line="3" column="49" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="49" /> | ||
| 74 | </state> | 68 | </state> |
| 75 | </provider> | 69 | </provider> |
| 76 | </entry> | 70 | </entry> |
| 77 | </file> | 71 | </file> |
| 78 | <file pinned="false" current-in-tab="true"> | 72 | <file pinned="false" current-in-tab="true"> |
| 79 | - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> | 73 | + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> |
| 80 | <provider selected="true" editor-type-id="text-editor"> | 74 | <provider selected="true" editor-type-id="text-editor"> |
| 81 | - <state relative-caret-position="4170"> | ||
| 82 | - <caret line="344" column="56" selection-start-line="344" selection-start-column="56" selection-end-line="344" selection-end-column="56" /> | ||
| 83 | - <folding> | ||
| 84 | - <element signature="e#108#123#0" expanded="true" /> | ||
| 85 | - </folding> | 75 | + <state relative-caret-position="996"> |
| 76 | + <caret line="189" column="24" lean-forward="true" selection-start-line="189" selection-start-column="24" selection-end-line="189" selection-end-column="24" /> | ||
| 86 | </state> | 77 | </state> |
| 87 | </provider> | 78 | </provider> |
| 88 | </entry> | 79 | </entry> |
| 89 | </file> | 80 | </file> |
| 90 | <file pinned="false" current-in-tab="false"> | 81 | <file pinned="false" current-in-tab="false"> |
| 91 | - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml"> | 82 | + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml"> |
| 92 | <provider selected="true" editor-type-id="text-editor"> | 83 | <provider selected="true" editor-type-id="text-editor"> |
| 93 | - <state relative-caret-position="208"> | ||
| 94 | - <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> | 84 | + <state relative-caret-position="104"> |
| 85 | + <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="46" /> | ||
| 95 | </state> | 86 | </state> |
| 96 | </provider> | 87 | </provider> |
| 97 | </entry> | 88 | </entry> |
| 98 | </file> | 89 | </file> |
| 99 | <file pinned="false" current-in-tab="false"> | 90 | <file pinned="false" current-in-tab="false"> |
| 100 | - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml"> | 91 | + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> |
| 101 | <provider selected="true" editor-type-id="text-editor"> | 92 | <provider selected="true" editor-type-id="text-editor"> |
| 102 | - <state relative-caret-position="676"> | ||
| 103 | - <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> | 93 | + <state relative-caret-position="74"> |
| 94 | + <caret line="60" column="32" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="32" /> | ||
| 95 | + <folding> | ||
| 96 | + <element signature="e#108#123#0" expanded="true" /> | ||
| 97 | + </folding> | ||
| 104 | </state> | 98 | </state> |
| 105 | </provider> | 99 | </provider> |
| 106 | </entry> | 100 | </entry> |
| @@ -123,8 +117,6 @@ | @@ -123,8 +117,6 @@ | ||
| 123 | <find>allShipmentQuantity</find> | 117 | <find>allShipmentQuantity</find> |
| 124 | <find>get_allShipmentQuantity_from_database</find> | 118 | <find>get_allShipmentQuantity_from_database</find> |
| 125 | <find>intentionQuantity</find> | 119 | <find>intentionQuantity</find> |
| 126 | - <find>received</find> | ||
| 127 | - <find>outstanding</find> | ||
| 128 | <find>ArgumentParser</find> | 120 | <find>ArgumentParser</find> |
| 129 | <find>print(get_expend_from_database())</find> | 121 | <find>print(get_expend_from_database())</find> |
| 130 | <find>todayIntentionMoney</find> | 122 | <find>todayIntentionMoney</find> |
| @@ -138,6 +130,13 @@ | @@ -138,6 +130,13 @@ | ||
| 138 | <find>cumulativeMoney</find> | 130 | <find>cumulativeMoney</find> |
| 139 | <find>tbl</find> | 131 | <find>tbl</find> |
| 140 | <find>cumulativeQuantity</find> | 132 | <find>cumulativeQuantity</find> |
| 133 | + <find>receivable</find> | ||
| 134 | + <find>get_partner_account_from_database()</find> | ||
| 135 | + <find>partner_account</find> | ||
| 136 | + <find>get_partner_account</find> | ||
| 137 | + <find>received</find> | ||
| 138 | + <find>outstanding</find> | ||
| 139 | + <find>get_order_status_from_database</find> | ||
| 141 | </findStrings> | 140 | </findStrings> |
| 142 | </component> | 141 | </component> |
| 143 | <component name="Git.Settings"> | 142 | <component name="Git.Settings"> |
| @@ -146,10 +145,6 @@ | @@ -146,10 +145,6 @@ | ||
| 146 | <component name="IdeDocumentHistory"> | 145 | <component name="IdeDocumentHistory"> |
| 147 | <option name="CHANGED_PATHS"> | 146 | <option name="CHANGED_PATHS"> |
| 148 | <list> | 147 | <list> |
| 149 | - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" /> | ||
| 150 | - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml" /> | ||
| 151 | - <option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" /> | ||
| 152 | - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" /> | ||
| 153 | <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" /> | 148 | <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" /> |
| 154 | <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml" /> | 149 | <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml" /> |
| 155 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" /> | 150 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" /> |
| @@ -171,32 +166,36 @@ | @@ -171,32 +166,36 @@ | ||
| 171 | <option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" /> | 166 | <option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" /> |
| 172 | <option value="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" /> | 167 | <option value="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" /> |
| 173 | <option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" /> | 168 | <option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" /> |
| 174 | - <option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" /> | ||
| 175 | - <option value="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" /> | ||
| 176 | - <option value="$PROJECT_DIR$/debugtalk.py" /> | ||
| 177 | <option value="$PROJECT_DIR$/api/app_api/order/details_api.yml" /> | 169 | <option value="$PROJECT_DIR$/api/app_api/order/details_api.yml" /> |
| 178 | <option value="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" /> | 170 | <option value="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" /> |
| 179 | <option value="$PROJECT_DIR$/api/app_api/user/userInfo_api.yml" /> | 171 | <option value="$PROJECT_DIR$/api/app_api/user/userInfo_api.yml" /> |
| 180 | <option value="$PROJECT_DIR$/testcases/user/user_userInfo_testcases.yml" /> | 172 | <option value="$PROJECT_DIR$/testcases/user/user_userInfo_testcases.yml" /> |
| 181 | <option value="$PROJECT_DIR$/testcases/login_testcases.yml" /> | 173 | <option value="$PROJECT_DIR$/testcases/login_testcases.yml" /> |
| 182 | <option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" /> | 174 | <option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" /> |
| 183 | - <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" /> | ||
| 184 | - <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" /> | ||
| 185 | - <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" /> | ||
| 186 | - <option value="$PROJECT_DIR$/api/app_api/order/list_api.yml" /> | ||
| 187 | - <option value="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" /> | ||
| 188 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" /> | 175 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" /> |
| 189 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" /> | 176 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" /> |
| 190 | - <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> | ||
| 191 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" /> | 177 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" /> |
| 192 | <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" /> | 178 | <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" /> |
| 193 | <option value="$PROJECT_DIR$/.env" /> | 179 | <option value="$PROJECT_DIR$/.env" /> |
| 194 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" /> | 180 | <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" /> |
| 195 | <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> | 181 | <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> |
| 196 | <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" /> | 182 | <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" /> |
| 197 | - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" /> | ||
| 198 | <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" /> | 183 | <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" /> |
| 184 | + <option value="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" /> | ||
| 185 | + <option value="$PROJECT_DIR$/api/app_api/order/list_api.yml" /> | ||
| 186 | + <option value="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" /> | ||
| 187 | + <option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" /> | ||
| 188 | + <option value="$PROJECT_DIR$/debugtalk.py" /> | ||
| 189 | + <option value="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" /> | ||
| 190 | + <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" /> | ||
| 191 | + <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" /> | ||
| 192 | + <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" /> | ||
| 199 | <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" /> | 193 | <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" /> |
| 194 | + <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" /> | ||
| 195 | + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" /> | ||
| 196 | + <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" /> | ||
| 197 | + <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" /> | ||
| 198 | + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> | ||
| 200 | </list> | 199 | </list> |
| 201 | </option> | 200 | </option> |
| 202 | </component> | 201 | </component> |
| @@ -228,51 +227,30 @@ | @@ -228,51 +227,30 @@ | ||
| 228 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | 227 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> |
| 229 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | 228 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> |
| 230 | <item name="api" type="462c0819:PsiDirectoryNode" /> | 229 | <item name="api" type="462c0819:PsiDirectoryNode" /> |
| 231 | - <item name="app_api" type="462c0819:PsiDirectoryNode" /> | ||
| 232 | - </path> | ||
| 233 | - <path> | ||
| 234 | - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | ||
| 235 | - <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | ||
| 236 | - <item name="api" type="462c0819:PsiDirectoryNode" /> | ||
| 237 | - <item name="app_api" type="462c0819:PsiDirectoryNode" /> | ||
| 238 | - <item name="dividend" type="462c0819:PsiDirectoryNode" /> | ||
| 239 | - </path> | ||
| 240 | - <path> | ||
| 241 | - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | ||
| 242 | - <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | ||
| 243 | - <item name="api" type="462c0819:PsiDirectoryNode" /> | ||
| 244 | - <item name="app_api" type="462c0819:PsiDirectoryNode" /> | ||
| 245 | - <item name="login" type="462c0819:PsiDirectoryNode" /> | ||
| 246 | - </path> | ||
| 247 | - <path> | ||
| 248 | - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | ||
| 249 | - <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | ||
| 250 | - <item name="api" type="462c0819:PsiDirectoryNode" /> | ||
| 251 | - <item name="app_api" type="462c0819:PsiDirectoryNode" /> | ||
| 252 | - <item name="order" type="462c0819:PsiDirectoryNode" /> | 230 | + <item name="m_api" type="462c0819:PsiDirectoryNode" /> |
| 253 | </path> | 231 | </path> |
| 254 | <path> | 232 | <path> |
| 255 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | 233 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> |
| 256 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | 234 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> |
| 257 | <item name="api" type="462c0819:PsiDirectoryNode" /> | 235 | <item name="api" type="462c0819:PsiDirectoryNode" /> |
| 258 | <item name="m_api" type="462c0819:PsiDirectoryNode" /> | 236 | <item name="m_api" type="462c0819:PsiDirectoryNode" /> |
| 237 | + <item name="actual" type="462c0819:PsiDirectoryNode" /> | ||
| 259 | </path> | 238 | </path> |
| 260 | <path> | 239 | <path> |
| 261 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | 240 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> |
| 262 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | 241 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> |
| 263 | - <item name="api" type="462c0819:PsiDirectoryNode" /> | ||
| 264 | - <item name="m_api" type="462c0819:PsiDirectoryNode" /> | ||
| 265 | - <item name="actual" type="462c0819:PsiDirectoryNode" /> | 242 | + <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> |
| 266 | </path> | 243 | </path> |
| 267 | <path> | 244 | <path> |
| 268 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | 245 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> |
| 269 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | 246 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> |
| 270 | - <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> | 247 | + <item name="testcases" type="462c0819:PsiDirectoryNode" /> |
| 271 | </path> | 248 | </path> |
| 272 | <path> | 249 | <path> |
| 273 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | 250 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> |
| 274 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> | 251 | <item name="partner_api" type="462c0819:PsiDirectoryNode" /> |
| 275 | <item name="testcases" type="462c0819:PsiDirectoryNode" /> | 252 | <item name="testcases" type="462c0819:PsiDirectoryNode" /> |
| 253 | + <item name="actual" type="462c0819:PsiDirectoryNode" /> | ||
| 276 | </path> | 254 | </path> |
| 277 | <path> | 255 | <path> |
| 278 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> | 256 | <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> |
| @@ -338,7 +316,7 @@ | @@ -338,7 +316,7 @@ | ||
| 338 | </list> | 316 | </list> |
| 339 | </option> | 317 | </option> |
| 340 | </component> | 318 | </component> |
| 341 | - <component name="RunManager" selected="Python.pg_app_db_func"> | 319 | + <component name="RunManager" selected="Python.pg_db_func"> |
| 342 | <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> | 320 | <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> |
| 343 | <module name="partner_api" /> | 321 | <module name="partner_api" /> |
| 344 | <option name="INTERPRETER_OPTIONS" value="" /> | 322 | <option name="INTERPRETER_OPTIONS" value="" /> |
| @@ -429,8 +407,8 @@ | @@ -429,8 +407,8 @@ | ||
| 429 | </configuration> | 407 | </configuration> |
| 430 | <recent_temporary> | 408 | <recent_temporary> |
| 431 | <list> | 409 | <list> |
| 432 | - <item itemvalue="Python.pg_app_db_func" /> | ||
| 433 | <item itemvalue="Python.pg_db_func" /> | 410 | <item itemvalue="Python.pg_db_func" /> |
| 411 | + <item itemvalue="Python.pg_app_db_func" /> | ||
| 434 | <item itemvalue="Python.debugtalk" /> | 412 | <item itemvalue="Python.debugtalk" /> |
| 435 | <item itemvalue="Python.db_pg_func" /> | 413 | <item itemvalue="Python.db_pg_func" /> |
| 436 | </list> | 414 | </list> |
| @@ -480,12 +458,12 @@ | @@ -480,12 +458,12 @@ | ||
| 480 | <workItem from="1596805266484" duration="1392000" /> | 458 | <workItem from="1596805266484" duration="1392000" /> |
| 481 | <workItem from="1596899522553" duration="58000" /> | 459 | <workItem from="1596899522553" duration="58000" /> |
| 482 | <workItem from="1597197819907" duration="7375000" /> | 460 | <workItem from="1597197819907" duration="7375000" /> |
| 483 | - <workItem from="1597211046716" duration="599000" /> | 461 | + <workItem from="1597211046716" duration="9744000" /> |
| 484 | </task> | 462 | </task> |
| 485 | <servers /> | 463 | <servers /> |
| 486 | </component> | 464 | </component> |
| 487 | <component name="TimeTrackingManager"> | 465 | <component name="TimeTrackingManager"> |
| 488 | - <option name="totallyTimeSpent" value="186062000" /> | 466 | + <option name="totallyTimeSpent" value="195207000" /> |
| 489 | </component> | 467 | </component> |
| 490 | <component name="ToolWindowManager"> | 468 | <component name="ToolWindowManager"> |
| 491 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 469 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
| @@ -497,11 +475,11 @@ | @@ -497,11 +475,11 @@ | ||
| 497 | <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> | 475 | <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> |
| 498 | <window_info anchor="bottom" id="Terminal" order="1" weight="0.2857143" /> | 476 | <window_info anchor="bottom" id="Terminal" order="1" weight="0.2857143" /> |
| 499 | <window_info anchor="bottom" id="Message" order="2" /> | 477 | <window_info anchor="bottom" id="Message" order="2" /> |
| 500 | - <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> | ||
| 501 | - <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" /> | 478 | + <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" /> |
| 479 | + <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" /> | ||
| 502 | <window_info anchor="bottom" id="Python Console" order="5" weight="0.328125" /> | 480 | <window_info anchor="bottom" id="Python Console" order="5" weight="0.328125" /> |
| 503 | <window_info anchor="bottom" id="Database Changes" order="6" /> | 481 | <window_info anchor="bottom" id="Database Changes" order="6" /> |
| 504 | - <window_info active="true" anchor="bottom" id="Run" order="7" visible="true" weight="0.32700893" /> | 482 | + <window_info anchor="bottom" id="Run" order="7" sideWeight="0.49946353" weight="0.32700893" /> |
| 505 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" /> | 483 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" /> |
| 506 | <window_info anchor="bottom" id="Debug" order="9" weight="0.4" /> | 484 | <window_info anchor="bottom" id="Debug" order="9" weight="0.4" /> |
| 507 | <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" /> | 485 | <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" /> |
| @@ -518,41 +496,6 @@ | @@ -518,41 +496,6 @@ | ||
| 518 | <option name="version" value="1" /> | 496 | <option name="version" value="1" /> |
| 519 | </component> | 497 | </component> |
| 520 | <component name="editorHistoryManager"> | 498 | <component name="editorHistoryManager"> |
| 521 | - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml"> | ||
| 522 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 523 | - <state relative-caret-position="110"> | ||
| 524 | - <caret line="14" column="67" selection-start-line="14" selection-start-column="67" selection-end-line="14" selection-end-column="67" /> | ||
| 525 | - </state> | ||
| 526 | - </provider> | ||
| 527 | - </entry> | ||
| 528 | - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml"> | ||
| 529 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 530 | - <state> | ||
| 531 | - <caret column="6" selection-start-column="6" selection-end-column="19" /> | ||
| 532 | - </state> | ||
| 533 | - </provider> | ||
| 534 | - </entry> | ||
| 535 | - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml"> | ||
| 536 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 537 | - <state relative-caret-position="66"> | ||
| 538 | - <caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="27" /> | ||
| 539 | - </state> | ||
| 540 | - </provider> | ||
| 541 | - </entry> | ||
| 542 | - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml"> | ||
| 543 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 544 | - <state> | ||
| 545 | - <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="14" /> | ||
| 546 | - </state> | ||
| 547 | - </provider> | ||
| 548 | - </entry> | ||
| 549 | - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml"> | ||
| 550 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 551 | - <state relative-caret-position="176"> | ||
| 552 | - <caret line="14" column="58" selection-start-line="14" selection-start-column="58" selection-end-line="14" selection-end-column="58" /> | ||
| 553 | - </state> | ||
| 554 | - </provider> | ||
| 555 | - </entry> | ||
| 556 | <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml"> | 499 | <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml"> |
| 557 | <provider selected="true" editor-type-id="text-editor"> | 500 | <provider selected="true" editor-type-id="text-editor"> |
| 558 | <state relative-caret-position="88"> | 501 | <state relative-caret-position="88"> |
| @@ -589,16 +532,6 @@ | @@ -589,16 +532,6 @@ | ||
| 589 | <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml" /> | 532 | <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml" /> |
| 590 | <entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" /> | 533 | <entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" /> |
| 591 | <entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.yml" /> | 534 | <entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.yml" /> |
| 592 | - <entry file="file://$PROJECT_DIR$/debugtalk.py"> | ||
| 593 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 594 | - <state relative-caret-position="1782"> | ||
| 595 | - <caret line="91" selection-start-line="91" selection-end-line="91" /> | ||
| 596 | - <folding> | ||
| 597 | - <element signature="e#0#13#0" expanded="true" /> | ||
| 598 | - </folding> | ||
| 599 | - </state> | ||
| 600 | - </provider> | ||
| 601 | - </entry> | ||
| 602 | <entry file="file://$PROJECT_DIR$/api/app_api/order/details_api.yml"> | 535 | <entry file="file://$PROJECT_DIR$/api/app_api/order/details_api.yml"> |
| 603 | <provider selected="true" editor-type-id="text-editor"> | 536 | <provider selected="true" editor-type-id="text-editor"> |
| 604 | <state> | 537 | <state> |
| @@ -652,185 +585,226 @@ | @@ -652,185 +585,226 @@ | ||
| 652 | </state> | 585 | </state> |
| 653 | </provider> | 586 | </provider> |
| 654 | </entry> | 587 | </entry> |
| 655 | - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml"> | 588 | + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml"> |
| 656 | <provider selected="true" editor-type-id="text-editor"> | 589 | <provider selected="true" editor-type-id="text-editor"> |
| 657 | - <state> | ||
| 658 | - <caret column="6" selection-start-column="6" selection-end-column="16" /> | 590 | + <state relative-caret-position="286"> |
| 591 | + <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" /> | ||
| 659 | </state> | 592 | </state> |
| 660 | </provider> | 593 | </provider> |
| 661 | </entry> | 594 | </entry> |
| 662 | - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml"> | 595 | + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml"> |
| 663 | <provider selected="true" editor-type-id="text-editor"> | 596 | <provider selected="true" editor-type-id="text-editor"> |
| 664 | - <state> | ||
| 665 | - <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="16" /> | 597 | + <state relative-caret-position="154"> |
| 598 | + <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" /> | ||
| 666 | </state> | 599 | </state> |
| 667 | </provider> | 600 | </provider> |
| 668 | </entry> | 601 | </entry> |
| 669 | - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml"> | 602 | + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml"> |
| 670 | <provider selected="true" editor-type-id="text-editor"> | 603 | <provider selected="true" editor-type-id="text-editor"> |
| 671 | - <state relative-caret-position="22"> | ||
| 672 | - <caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="20" /> | 604 | + <state relative-caret-position="154"> |
| 605 | + <caret line="7" column="58" selection-start-line="7" selection-start-column="58" selection-end-line="7" selection-end-column="58" /> | ||
| 673 | </state> | 606 | </state> |
| 674 | </provider> | 607 | </provider> |
| 675 | </entry> | 608 | </entry> |
| 676 | - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml"> | 609 | + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml"> |
| 677 | <provider selected="true" editor-type-id="text-editor"> | 610 | <provider selected="true" editor-type-id="text-editor"> |
| 678 | - <state relative-caret-position="22"> | ||
| 679 | - <caret line="1" column="10" lean-forward="true" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="20" /> | 611 | + <state relative-caret-position="832"> |
| 612 | + <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" /> | ||
| 680 | </state> | 613 | </state> |
| 681 | </provider> | 614 | </provider> |
| 682 | </entry> | 615 | </entry> |
| 683 | - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_testcases.yml"> | 616 | + <entry file="file://$PROJECT_DIR$/.env"> |
| 684 | <provider selected="true" editor-type-id="text-editor"> | 617 | <provider selected="true" editor-type-id="text-editor"> |
| 685 | - <state relative-caret-position="308"> | ||
| 686 | - <caret line="14" column="40" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" /> | 618 | + <state relative-caret-position="182"> |
| 619 | + <caret line="7" selection-start-line="7" selection-end-line="7" /> | ||
| 687 | </state> | 620 | </state> |
| 688 | </provider> | 621 | </provider> |
| 689 | </entry> | 622 | </entry> |
| 690 | - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml"> | 623 | + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml"> |
| 691 | <provider selected="true" editor-type-id="text-editor"> | 624 | <provider selected="true" editor-type-id="text-editor"> |
| 692 | <state relative-caret-position="286"> | 625 | <state relative-caret-position="286"> |
| 693 | - <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" /> | 626 | + <caret line="11" column="52" lean-forward="true" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="52" /> |
| 694 | </state> | 627 | </state> |
| 695 | </provider> | 628 | </provider> |
| 696 | </entry> | 629 | </entry> |
| 697 | - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml"> | 630 | + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py"> |
| 698 | <provider selected="true" editor-type-id="text-editor"> | 631 | <provider selected="true" editor-type-id="text-editor"> |
| 699 | - <state relative-caret-position="154"> | ||
| 700 | - <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" /> | 632 | + <state relative-caret-position="658"> |
| 633 | + <caret line="170" selection-start-line="170" selection-end-line="170" /> | ||
| 701 | </state> | 634 | </state> |
| 702 | </provider> | 635 | </provider> |
| 703 | </entry> | 636 | </entry> |
| 704 | - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> | 637 | + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/report.py"> |
| 705 | <provider selected="true" editor-type-id="text-editor"> | 638 | <provider selected="true" editor-type-id="text-editor"> |
| 706 | - <state relative-caret-position="5854"> | ||
| 707 | - <caret line="316" selection-start-line="316" selection-end-line="316" /> | 639 | + <state relative-caret-position="-905"> |
| 640 | + <folding> | ||
| 641 | + <element signature="e#0#11#0" expanded="true" /> | ||
| 642 | + </folding> | ||
| 708 | </state> | 643 | </state> |
| 709 | </provider> | 644 | </provider> |
| 710 | </entry> | 645 | </entry> |
| 711 | - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml"> | 646 | + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html"> |
| 712 | <provider selected="true" editor-type-id="text-editor"> | 647 | <provider selected="true" editor-type-id="text-editor"> |
| 713 | - <state relative-caret-position="154"> | ||
| 714 | - <caret line="7" column="58" selection-start-line="7" selection-start-column="58" selection-end-line="7" selection-end-column="58" /> | 648 | + <state relative-caret-position="286"> |
| 649 | + <caret line="293" column="50" selection-start-line="293" selection-start-column="50" selection-end-line="293" selection-end-column="50" /> | ||
| 715 | </state> | 650 | </state> |
| 716 | </provider> | 651 | </provider> |
| 717 | </entry> | 652 | </entry> |
| 718 | - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml"> | 653 | + <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml"> |
| 719 | <provider selected="true" editor-type-id="text-editor"> | 654 | <provider selected="true" editor-type-id="text-editor"> |
| 720 | - <state relative-caret-position="832"> | ||
| 721 | - <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" /> | 655 | + <state relative-caret-position="962"> |
| 656 | + <caret line="37" column="54" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="54" /> | ||
| 722 | </state> | 657 | </state> |
| 723 | </provider> | 658 | </provider> |
| 724 | </entry> | 659 | </entry> |
| 725 | - <entry file="file://$PROJECT_DIR$/.env"> | 660 | + <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> |
| 726 | <provider selected="true" editor-type-id="text-editor"> | 661 | <provider selected="true" editor-type-id="text-editor"> |
| 727 | <state relative-caret-position="182"> | 662 | <state relative-caret-position="182"> |
| 728 | - <caret line="7" selection-start-line="7" selection-end-line="7" /> | 663 | + <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="52" /> |
| 729 | </state> | 664 | </state> |
| 730 | </provider> | 665 | </provider> |
| 731 | </entry> | 666 | </entry> |
| 732 | - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml"> | 667 | + <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml"> |
| 733 | <provider selected="true" editor-type-id="text-editor"> | 668 | <provider selected="true" editor-type-id="text-editor"> |
| 734 | - <state relative-caret-position="286"> | ||
| 735 | - <caret line="11" column="52" lean-forward="true" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="52" /> | 669 | + <state relative-caret-position="390"> |
| 670 | + <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" /> | ||
| 736 | </state> | 671 | </state> |
| 737 | </provider> | 672 | </provider> |
| 738 | </entry> | 673 | </entry> |
| 739 | - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_api.yml"> | 674 | + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_testcases.yml"> |
| 740 | <provider selected="true" editor-type-id="text-editor"> | 675 | <provider selected="true" editor-type-id="text-editor"> |
| 741 | - <state relative-caret-position="676"> | ||
| 742 | - <caret line="26" column="22" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" /> | 676 | + <state relative-caret-position="546"> |
| 677 | + <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" /> | ||
| 743 | </state> | 678 | </state> |
| 744 | </provider> | 679 | </provider> |
| 745 | </entry> | 680 | </entry> |
| 746 | - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml"> | 681 | + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml"> |
| 747 | <provider selected="true" editor-type-id="text-editor"> | 682 | <provider selected="true" editor-type-id="text-editor"> |
| 748 | - <state relative-caret-position="26"> | ||
| 749 | - <caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" /> | 683 | + <state relative-caret-position="306"> |
| 684 | + <caret line="38" selection-start-line="38" selection-end-line="44" selection-end-column="22" /> | ||
| 750 | </state> | 685 | </state> |
| 751 | </provider> | 686 | </provider> |
| 752 | </entry> | 687 | </entry> |
| 753 | - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> | 688 | + <entry file="file://$PROJECT_DIR$/debugtalk.py"> |
| 754 | <provider selected="true" editor-type-id="text-editor"> | 689 | <provider selected="true" editor-type-id="text-editor"> |
| 755 | - <state relative-caret-position="338"> | ||
| 756 | - <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> | 690 | + <state relative-caret-position="361"> |
| 691 | + <caret line="85" column="48" selection-start-line="85" selection-start-column="48" selection-end-line="85" selection-end-column="48" /> | ||
| 692 | + <folding> | ||
| 693 | + <element signature="e#0#13#0" expanded="true" /> | ||
| 694 | + </folding> | ||
| 757 | </state> | 695 | </state> |
| 758 | </provider> | 696 | </provider> |
| 759 | </entry> | 697 | </entry> |
| 760 | - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py"> | 698 | + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml"> |
| 761 | <provider selected="true" editor-type-id="text-editor"> | 699 | <provider selected="true" editor-type-id="text-editor"> |
| 762 | - <state relative-caret-position="658"> | ||
| 763 | - <caret line="170" selection-start-line="170" selection-end-line="170" /> | 700 | + <state relative-caret-position="488"> |
| 701 | + <caret line="33" column="10" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="10" /> | ||
| 764 | </state> | 702 | </state> |
| 765 | </provider> | 703 | </provider> |
| 766 | </entry> | 704 | </entry> |
| 767 | - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/report.py"> | 705 | + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_api.yml"> |
| 768 | <provider selected="true" editor-type-id="text-editor"> | 706 | <provider selected="true" editor-type-id="text-editor"> |
| 769 | - <state relative-caret-position="-905"> | ||
| 770 | - <folding> | ||
| 771 | - <element signature="e#0#11#0" expanded="true" /> | ||
| 772 | - </folding> | 707 | + <state relative-caret-position="387"> |
| 708 | + <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" /> | ||
| 773 | </state> | 709 | </state> |
| 774 | </provider> | 710 | </provider> |
| 775 | </entry> | 711 | </entry> |
| 776 | - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html"> | 712 | + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml"> |
| 777 | <provider selected="true" editor-type-id="text-editor"> | 713 | <provider selected="true" editor-type-id="text-editor"> |
| 778 | - <state relative-caret-position="286"> | ||
| 779 | - <caret line="293" column="50" selection-start-line="293" selection-start-column="50" selection-end-line="293" selection-end-column="50" /> | 714 | + <state relative-caret-position="161"> |
| 715 | + <caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="85" /> | ||
| 780 | </state> | 716 | </state> |
| 781 | </provider> | 717 | </provider> |
| 782 | </entry> | 718 | </entry> |
| 783 | - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> | 719 | + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml"> |
| 784 | <provider selected="true" editor-type-id="text-editor"> | 720 | <provider selected="true" editor-type-id="text-editor"> |
| 785 | - <state relative-caret-position="2210"> | ||
| 786 | - <caret line="85" selection-start-line="85" selection-end-line="86" selection-end-column="60" /> | 721 | + <state relative-caret-position="213"> |
| 722 | + <caret line="22" selection-start-line="22" selection-end-line="30" selection-end-column="30" /> | ||
| 787 | </state> | 723 | </state> |
| 788 | </provider> | 724 | </provider> |
| 789 | </entry> | 725 | </entry> |
| 790 | - <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml"> | 726 | + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml"> |
| 791 | <provider selected="true" editor-type-id="text-editor"> | 727 | <provider selected="true" editor-type-id="text-editor"> |
| 792 | - <state relative-caret-position="390"> | ||
| 793 | - <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" /> | 728 | + <state relative-caret-position="104"> |
| 729 | + <caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" /> | ||
| 794 | </state> | 730 | </state> |
| 795 | </provider> | 731 | </provider> |
| 796 | </entry> | 732 | </entry> |
| 797 | - <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml"> | 733 | + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml"> |
| 798 | <provider selected="true" editor-type-id="text-editor"> | 734 | <provider selected="true" editor-type-id="text-editor"> |
| 799 | - <state relative-caret-position="962"> | ||
| 800 | - <caret line="37" column="54" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="54" /> | 735 | + <state relative-caret-position="213"> |
| 736 | + <caret line="9" column="85" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="85" /> | ||
| 801 | </state> | 737 | </state> |
| 802 | </provider> | 738 | </provider> |
| 803 | </entry> | 739 | </entry> |
| 804 | - <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> | 740 | + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml"> |
| 805 | <provider selected="true" editor-type-id="text-editor"> | 741 | <provider selected="true" editor-type-id="text-editor"> |
| 806 | - <state relative-caret-position="182"> | ||
| 807 | - <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="52" /> | 742 | + <state relative-caret-position="364"> |
| 743 | + <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" /> | ||
| 808 | </state> | 744 | </state> |
| 809 | </provider> | 745 | </provider> |
| 810 | </entry> | 746 | </entry> |
| 811 | - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml"> | 747 | + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> |
| 812 | <provider selected="true" editor-type-id="text-editor"> | 748 | <provider selected="true" editor-type-id="text-editor"> |
| 813 | - <state relative-caret-position="208"> | ||
| 814 | - <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> | 749 | + <state relative-caret-position="182"> |
| 750 | + <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> | ||
| 815 | </state> | 751 | </state> |
| 816 | </provider> | 752 | </provider> |
| 817 | </entry> | 753 | </entry> |
| 818 | - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml"> | 754 | + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml"> |
| 819 | <provider selected="true" editor-type-id="text-editor"> | 755 | <provider selected="true" editor-type-id="text-editor"> |
| 820 | - <state relative-caret-position="676"> | ||
| 821 | - <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> | 756 | + <state relative-caret-position="383"> |
| 757 | + <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" /> | ||
| 822 | </state> | 758 | </state> |
| 823 | </provider> | 759 | </provider> |
| 824 | </entry> | 760 | </entry> |
| 825 | <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> | 761 | <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> |
| 826 | <provider selected="true" editor-type-id="text-editor"> | 762 | <provider selected="true" editor-type-id="text-editor"> |
| 827 | - <state relative-caret-position="4170"> | ||
| 828 | - <caret line="344" column="56" selection-start-line="344" selection-start-column="56" selection-end-line="344" selection-end-column="56" /> | 763 | + <state relative-caret-position="74"> |
| 764 | + <caret line="60" column="32" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="32" /> | ||
| 829 | <folding> | 765 | <folding> |
| 830 | <element signature="e#108#123#0" expanded="true" /> | 766 | <element signature="e#108#123#0" expanded="true" /> |
| 831 | </folding> | 767 | </folding> |
| 832 | </state> | 768 | </state> |
| 833 | </provider> | 769 | </provider> |
| 834 | </entry> | 770 | </entry> |
| 771 | + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml"> | ||
| 772 | + <provider selected="true" editor-type-id="text-editor" /> | ||
| 773 | + </entry> | ||
| 774 | + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml"> | ||
| 775 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 776 | + <state relative-caret-position="104"> | ||
| 777 | + <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="46" /> | ||
| 778 | + </state> | ||
| 779 | + </provider> | ||
| 780 | + </entry> | ||
| 781 | + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> | ||
| 782 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 783 | + <state relative-caret-position="1041"> | ||
| 784 | + <caret line="94" selection-start-line="94" selection-start-column="1" selection-end-line="95" selection-end-column="66" /> | ||
| 785 | + </state> | ||
| 786 | + </provider> | ||
| 787 | + </entry> | ||
| 788 | + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml"> | ||
| 789 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 790 | + <state relative-caret-position="520"> | ||
| 791 | + <caret line="20" column="52" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" /> | ||
| 792 | + </state> | ||
| 793 | + </provider> | ||
| 794 | + </entry> | ||
| 795 | + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> | ||
| 796 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 797 | + <state relative-caret-position="78"> | ||
| 798 | + <caret line="3" column="49" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="49" /> | ||
| 799 | + </state> | ||
| 800 | + </provider> | ||
| 801 | + </entry> | ||
| 802 | + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> | ||
| 803 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 804 | + <state relative-caret-position="996"> | ||
| 805 | + <caret line="189" column="24" lean-forward="true" selection-start-line="189" selection-start-column="24" selection-end-line="189" selection-end-column="24" /> | ||
| 806 | + </state> | ||
| 807 | + </provider> | ||
| 808 | + </entry> | ||
| 835 | </component> | 809 | </component> |
| 836 | </project> | 810 | </project> |
不能预览此文件类型
| @@ -5,9 +5,9 @@ variables: | @@ -5,9 +5,9 @@ variables: | ||
| 5 | uuid: ${make_uuid()} | 5 | uuid: ${make_uuid()} |
| 6 | var_access_token: ${get_accesstoken()} | 6 | var_access_token: ${get_accesstoken()} |
| 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} | 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} |
| 8 | -# received: ${get_received_from_database()} | ||
| 9 | - total: ${get_detailAction_0_from_database()} | ||
| 10 | -# startTime: ${get_January_timestamp()} | 8 | + order_code: ${get_detailAction_0_order_code_from_database()} |
| 9 | + plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()} | ||
| 10 | + use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} | ||
| 11 | endTime: ${get_Decembe_timestamp()} | 11 | endTime: ${get_Decembe_timestamp()} |
| 12 | msg: 成功 | 12 | msg: 成功 |
| 13 | request: | 13 | request: |
| @@ -34,6 +34,12 @@ validate: | @@ -34,6 +34,12 @@ validate: | ||
| 34 | - eq: | 34 | - eq: |
| 35 | - content.msg | 35 | - content.msg |
| 36 | - $msg | 36 | - $msg |
| 37 | - - eq: | ||
| 38 | - - content.data.total | ||
| 39 | - - $total | ||
| 37 | + - eq: | ||
| 38 | + - content.data.list.0.deliveryNo | ||
| 39 | + - $order_code | ||
| 40 | + - eq: | ||
| 41 | + - content.data.list.0.orderAmount | ||
| 42 | + - $plan_order_amount | ||
| 43 | + - eq: | ||
| 44 | + - content.data.list.0.dividendReceivable | ||
| 45 | + - $use_partner_bonus |
| @@ -5,9 +5,9 @@ variables: | @@ -5,9 +5,9 @@ variables: | ||
| 5 | uuid: ${make_uuid()} | 5 | uuid: ${make_uuid()} |
| 6 | var_access_token: ${get_accesstoken()} | 6 | var_access_token: ${get_accesstoken()} |
| 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} | 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} |
| 8 | -# received: ${get_received_from_database()} | ||
| 9 | - total: ${get_detailAction_0_from_database()} | ||
| 10 | -# startTime: ${get_January_timestamp()} | 8 | + order_code: ${get_detailAction_0_order_code_from_database()} |
| 9 | + plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()} | ||
| 10 | + use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} | ||
| 11 | endTime: ${get_Decembe_timestamp()} | 11 | endTime: ${get_Decembe_timestamp()} |
| 12 | msg: 成功 | 12 | msg: 成功 |
| 13 | request: | 13 | request: |
| @@ -34,6 +34,12 @@ validate: | @@ -34,6 +34,12 @@ validate: | ||
| 34 | - eq: | 34 | - eq: |
| 35 | - content.msg | 35 | - content.msg |
| 36 | - $msg | 36 | - $msg |
| 37 | - - eq: | ||
| 38 | - - content.data.total | ||
| 39 | - - $total | ||
| 37 | + - eq: | ||
| 38 | + - content.data.list.0.deliveryNo | ||
| 39 | + - $order_code | ||
| 40 | + - eq: | ||
| 41 | + - content.data.list.0.orderAmount | ||
| 42 | + - $plan_order_amount | ||
| 43 | + - eq: | ||
| 44 | + - content.data.list.0.dividendReceivable | ||
| 45 | + - $use_partner_bonus |
| @@ -5,6 +5,7 @@ variables: | @@ -5,6 +5,7 @@ variables: | ||
| 5 | uuid: ${make_uuid()} | 5 | uuid: ${make_uuid()} |
| 6 | var_access_token: ${get_accesstoken()} | 6 | var_access_token: ${get_accesstoken()} |
| 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} | 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} |
| 8 | + receivable: ${get_receivable_from_database()} | ||
| 8 | received: ${get_received_from_database()} | 9 | received: ${get_received_from_database()} |
| 9 | outstanding: ${get_outstanding_from_database()} | 10 | outstanding: ${get_outstanding_from_database()} |
| 10 | startTime: ${get_January_timestamp()} | 11 | startTime: ${get_January_timestamp()} |
| @@ -31,9 +32,14 @@ validate: | @@ -31,9 +32,14 @@ validate: | ||
| 31 | - eq: | 32 | - eq: |
| 32 | - content.msg | 33 | - content.msg |
| 33 | - $msg | 34 | - $msg |
| 34 | - - eq: | ||
| 35 | - - content.data.statistics.received | ||
| 36 | - - $received | ||
| 37 | - - eq: | ||
| 38 | - - content.data.statistics.outstanding | ||
| 39 | - - $outstanding | ||
| 35 | + - eq: | ||
| 36 | + - content.data.statistics.receivable | ||
| 37 | + - $receivable | ||
| 38 | + | ||
| 39 | + - eq: | ||
| 40 | + - content.data.statistics.quarters.1.received | ||
| 41 | + - $received | ||
| 42 | + | ||
| 43 | + - eq: | ||
| 44 | + - content.data.statistics.quarters.1.outstanding | ||
| 45 | + - $outstanding |
| @@ -5,6 +5,7 @@ variables: | @@ -5,6 +5,7 @@ variables: | ||
| 5 | uuid: ${make_uuid()} | 5 | uuid: ${make_uuid()} |
| 6 | var_access_token: ${get_accesstoken()} | 6 | var_access_token: ${get_accesstoken()} |
| 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} | 7 | sign: ${make_sign($currtime, $uuid, $var_access_token)} |
| 8 | + total: ${get_total_from_database()} | ||
| 8 | msg: 成功 | 9 | msg: 成功 |
| 9 | request: | 10 | request: |
| 10 | headers: | 11 | headers: |
| @@ -28,4 +29,7 @@ request: | @@ -28,4 +29,7 @@ request: | ||
| 28 | validate: | 29 | validate: |
| 29 | - eq: | 30 | - eq: |
| 30 | - content.msg | 31 | - content.msg |
| 31 | - - $msg | ||
| 32 | + - $msg | ||
| 33 | + - eq: | ||
| 34 | + - content.data.total | ||
| 35 | + - $total |
| 1 | -name: 意向订单编辑 | ||
| 2 | -base_url: ${ENV(base_manager_url)} | ||
| 3 | -variables: | ||
| 4 | - address: ${get_actual_address_from_database(order)} | ||
| 5 | - id: ${get_actual_id_from_database(order)} | ||
| 6 | - buyer: ${get_actual_buyer_from_database(order)} | ||
| 7 | - buyerPhone: ${get_actual_buyerPhone_from_database(order)} | ||
| 8 | - orderDist: ${get_actual_orderDist_from_database(order)} | ||
| 9 | - orderId: ${get_actual_orderId_from_database(order)} | ||
| 10 | - orderName: ${get_actual_orderName_from_database(order)} | ||
| 11 | -request: | ||
| 12 | - headers: | ||
| 13 | - Content-Type: application/json;charset=utf-8 | ||
| 14 | - User-Agent: okhttp/3.12.3 | ||
| 15 | - Authorization: Bearer ${get_m_accesstoken()} | ||
| 16 | - json: | ||
| 17 | - buyer: $buyer | ||
| 18 | - buyerPhone: $buyerPhone | ||
| 19 | - address: $address | ||
| 20 | - partner: 29 | ||
| 21 | - partnerRatio: 10.1 | ||
| 22 | - salesmanRatio: 20.2 | ||
| 23 | - orderId: $orderId | ||
| 24 | - orderName: $orderName | ||
| 25 | - orderNum: 100 | ||
| 26 | - orderPrice: 100 | ||
| 27 | - orderDist: $orderDist | ||
| 28 | - orderStatue: 2 | ||
| 29 | - id: $id | ||
| 30 | - reason: 修改订单${get_nowtime()} | ||
| 31 | - method: POST | ||
| 32 | - url: v1/order/actual/update | ||
| 33 | -validate: | ||
| 34 | - - eq: | ||
| 35 | - - content.msg | ||
| 36 | - - ok |
| @@ -2,6 +2,7 @@ name: 合伙人搜索——实际订单列表 | @@ -2,6 +2,7 @@ name: 合伙人搜索——实际订单列表 | ||
| 2 | base_url: ${ENV(base_manager_url)} | 2 | base_url: ${ENV(base_manager_url)} |
| 3 | variables: | 3 | variables: |
| 4 | orderStatue: ${get_order_status_from_database(order)} | 4 | orderStatue: ${get_order_status_from_database(order)} |
| 5 | + partner: ${get_partner_id_from_database()} | ||
| 5 | request: | 6 | request: |
| 6 | headers: | 7 | headers: |
| 7 | Content-Type: application/json;charset=utf-8 | 8 | Content-Type: application/json;charset=utf-8 |
| @@ -10,7 +11,7 @@ request: | @@ -10,7 +11,7 @@ request: | ||
| 10 | json: | 11 | json: |
| 11 | pageNumber: 1 | 12 | pageNumber: 1 |
| 12 | pageSize: 10 | 13 | pageSize: 10 |
| 13 | - partner: 29 | 14 | + partner: $partner |
| 14 | searchText: '' | 15 | searchText: '' |
| 15 | method: POST | 16 | method: POST |
| 16 | url: v1/order/actual/list | 17 | url: v1/order/actual/list |
| @@ -2,7 +2,8 @@ name: 搜索订单号——实际订单列表 | @@ -2,7 +2,8 @@ name: 搜索订单号——实际订单列表 | ||
| 2 | base_url: ${ENV(base_manager_url)} | 2 | base_url: ${ENV(base_manager_url)} |
| 3 | variables: | 3 | variables: |
| 4 | orderStatue: ${get_order_status_from_database(order)} | 4 | orderStatue: ${get_order_status_from_database(order)} |
| 5 | - searchText: ${get_actual_orderId_from_database(order)} | 5 | + searchText: ${get_actual_delivery_code_from_database()} |
| 6 | + partner: ${get_partner_id_from_database()} | ||
| 6 | request: | 7 | request: |
| 7 | headers: | 8 | headers: |
| 8 | Content-Type: application/json;charset=utf-8 | 9 | Content-Type: application/json;charset=utf-8 |
| @@ -11,7 +12,7 @@ request: | @@ -11,7 +12,7 @@ request: | ||
| 11 | json: | 12 | json: |
| 12 | pageNumber: 1 | 13 | pageNumber: 1 |
| 13 | pageSize: 10 | 14 | pageSize: 10 |
| 14 | - partner: 29 | 15 | + partner: $partner |
| 15 | searchText: $searchText | 16 | searchText: $searchText |
| 16 | method: POST | 17 | method: POST |
| 17 | url: v1/order/actual/list | 18 | url: v1/order/actual/list |
| @@ -20,5 +21,5 @@ validate: | @@ -20,5 +21,5 @@ validate: | ||
| 20 | - content.msg | 21 | - content.msg |
| 21 | - ok | 22 | - ok |
| 22 | - eq: | 23 | - eq: |
| 23 | - - content.data.gridResult.lists.0.orderStatue | 24 | + - content.data.gridResult.lists.0.status |
| 24 | - $orderStatue | 25 | - $orderStatue |
| 1 | -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTcyNDI2OTcsImlhdCI6MTU5NzE5OTQ5NywiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzE5OTQ5NywidWlkIjoxOH0.GVz6hlPMNJo4xB5Y_hU3WLI5WF7Dk2YzXm9iG7TtfXs | ||
| 1 | +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTcyNjc3NjQsImlhdCI6MTU5NzIyNDU2NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzIyNDU2NCwidWlkIjoxOH0.3LItQh9bAjVXu-77Rl_EbejijxOfA1-CjcpNqWRsXnc |
| @@ -80,10 +80,10 @@ def get_endTimestamp(): | @@ -80,10 +80,10 @@ def get_endTimestamp(): | ||
| 80 | return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000) | 80 | return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000) |
| 81 | 81 | ||
| 82 | def get_January_timestamp(): | 82 | def get_January_timestamp(): |
| 83 | - return int(time.mktime(time.strptime('2020-01-01 00:00:00', '%Y-%m-%d %H:%M:%S'))*1000) | 83 | + return int(time.mktime(time.strptime('2020-04-01 00:00:00', '%Y-%m-%d %H:%M:%S'))*1000) |
| 84 | 84 | ||
| 85 | def get_Decembe_timestamp(): | 85 | def get_Decembe_timestamp(): |
| 86 | - return int(time.mktime(time.strptime('2020-12-31 23:59:59', '%Y-%m-%d %H:%M:%S'))*1000) | 86 | + return int(time.mktime(time.strptime('2021-3-31 23:59:59', '%Y-%m-%d %H:%M:%S'))*1000) |
| 87 | 87 | ||
| 88 | 88 | ||
| 89 | 89 |
| @@ -107,6 +107,7 @@ def get_partner_account_from_database(): | @@ -107,6 +107,7 @@ def get_partner_account_from_database(): | ||
| 107 | print(err) | 107 | print(err) |
| 108 | db.rollback() | 108 | db.rollback() |
| 109 | db.close() | 109 | db.close() |
| 110 | +# print(get_partner_account_from_database()) | ||
| 110 | #获取超级管理员密码 | 111 | #获取超级管理员密码 |
| 111 | def get_partner_password_from_database(tbl): | 112 | def get_partner_password_from_database(tbl): |
| 112 | db = GetConnect() | 113 | db = GetConnect() |
| @@ -202,144 +203,127 @@ def get_receivable_from_database(): | @@ -202,144 +203,127 @@ def get_receivable_from_database(): | ||
| 202 | db = GetConnect() | 203 | db = GetConnect() |
| 203 | cursor = db.cursor() | 204 | cursor = db.cursor() |
| 204 | # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | 205 | # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' |
| 205 | - sql = '''select sum(COALESCE(partner_bonus_has,0)+COALESCE(partner_bonus_not,0)-COALESCE(partner_bonus_expense,0)) from order_base where create_time between \'{}\' and \'{}\' and order_type in (1) '''.format(get_today(),get_tomorrow()) | ||
| 206 | - print(sql) | 206 | + sql = '''select sum(COALESCE(partner_bonus_has,0)+COALESCE(partner_bonus_not,0)-COALESCE(partner_bonus_expense,0)) from order_base where create_time between \'{}\' and \'{}\' and partner_id = {} and order_type in (1) '''.format('2020-04-1','2021-03-31 23:59:59',get_partner_id_from_database()) |
| 207 | + # print(sql) | ||
| 207 | try: | 208 | try: |
| 208 | cursor.execute(sql) | 209 | cursor.execute(sql) |
| 209 | result = cursor.fetchone() | 210 | result = cursor.fetchone() |
| 210 | - return int(result[0]) | 211 | + if round(result[0], 2) == 0: |
| 212 | + return 0 | ||
| 213 | + else: | ||
| 214 | + return round(result[0], 2) | ||
| 215 | + except Exception as err: | ||
| 216 | + # 发生错误时回滚 | ||
| 217 | + print(err) | ||
| 218 | + db.rollback() | ||
| 219 | + db.close() | ||
| 220 | + | ||
| 221 | +#实发订单总数 | ||
| 222 | +def get_total_from_database(): | ||
| 223 | + db = GetConnect() | ||
| 224 | + cursor = db.cursor() | ||
| 225 | + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 226 | + sql = '''select count(id) from order_base where create_time between \'{}\' and \'{}\' and partner_id = {} and order_type in (1) '''.format('2020-04-1','2021-03-31 23:59:59',get_partner_id_from_database()) | ||
| 227 | + # print(sql) | ||
| 228 | + try: | ||
| 229 | + cursor.execute(sql) | ||
| 230 | + result = cursor.fetchone() | ||
| 231 | + return result[0] | ||
| 211 | except Exception as err: | 232 | except Exception as err: |
| 212 | # 发生错误时回滚 | 233 | # 发生错误时回滚 |
| 213 | print(err) | 234 | print(err) |
| 214 | db.rollback() | 235 | db.rollback() |
| 215 | db.close() | 236 | db.close() |
| 216 | -print(get_receivable_from_database()) | ||
| 217 | -#部分发货的订单数量 | ||
| 218 | -# def get_partShipmentQuantity_from_database(tbl): | ||
| 219 | -# db = GetConnect() | ||
| 220 | -# cursor = db.cursor() | ||
| 221 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 222 | -# 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()) | ||
| 223 | -# # print(sql) | ||
| 224 | -# try: | ||
| 225 | -# cursor.execute(sql) | ||
| 226 | -# result = cursor.fetchone() | ||
| 227 | -# return int(result[0]) | ||
| 228 | -# except Exception as err: | ||
| 229 | -# # 发生错误时回滚 | ||
| 230 | -# print(err) | ||
| 231 | -# db.rollback() | ||
| 232 | -# db.close() | ||
| 233 | -# #全部发货的订单数量 | ||
| 234 | -# def get_allShipmentQuantity_from_database(tbl): | ||
| 235 | -# db = GetConnect() | ||
| 236 | -# cursor = db.cursor() | ||
| 237 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 238 | -# 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()) | ||
| 239 | -# print(sql) | ||
| 240 | -# try: | ||
| 241 | -# cursor.execute(sql) | ||
| 242 | -# result = cursor.fetchone() | ||
| 243 | -# return int(result[0]) | ||
| 244 | -# except Exception as err: | ||
| 245 | -# # 发生错误时回滚 | ||
| 246 | -# print(err) | ||
| 247 | -# db.rollback() | ||
| 248 | -# db.close() | ||
| 249 | -# # print(get_allShipmentQuantity_from_database('order')) | ||
| 250 | -# #累计所有年份未收分红 | ||
| 251 | -# def get_outstanding_from_database(): | ||
| 252 | -# db = GetConnect() | ||
| 253 | -# cursor = db.cursor() | ||
| 254 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 255 | -# 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('order',get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp()) | ||
| 256 | -# # print(sql) | ||
| 257 | -# try: | ||
| 258 | -# cursor.execute(sql) | ||
| 259 | -# result = cursor.fetchone() | ||
| 260 | -# if round(result[0], 2) == 0: | ||
| 261 | -# return 0 | ||
| 262 | -# else: | ||
| 263 | -# return round(result[0],2) | ||
| 264 | -# except Exception as err: | ||
| 265 | -# # 发生错误时回滚 | ||
| 266 | -# print(err) | ||
| 267 | -# db.rollback() | ||
| 268 | -# db.close() | ||
| 269 | -# #累计所有年份已收分红 | ||
| 270 | -# def get_received_from_database(): | ||
| 271 | -# db = GetConnect() | ||
| 272 | -# cursor = db.cursor() | ||
| 273 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 274 | -# sql = '''select COALESCE(sum((order_payment_amount * partner_bonus_percent)/100),0) as received from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' '''.format('order',get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp()) | ||
| 275 | -# # print(sql) | ||
| 276 | -# try: | ||
| 277 | -# cursor.execute(sql) | ||
| 278 | -# result = cursor.fetchone() | ||
| 279 | -# if round(result[0],2) == 0: | ||
| 280 | -# return 0 | ||
| 281 | -# else: | ||
| 282 | -# return round(result[0],2) | ||
| 283 | -# except Exception as err: | ||
| 284 | -# # 发生错误时回滚 | ||
| 285 | -# print(err) | ||
| 286 | -# db.rollback() | ||
| 287 | -# db.close() | ||
| 288 | -# | ||
| 289 | -# #已收明细数量 | ||
| 290 | -# def get_detailAction_0_from_database(): | ||
| 291 | -# db = GetConnect() | ||
| 292 | -# cursor = db.cursor() | ||
| 293 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 294 | -# sql = '''select COUNT(id) from \"{}\" where partner_id = {} and order_payment_amount > 0 '''.format('order',get_partner_id_from_database('partner_info')) | ||
| 295 | -# # print(sql)id | ||
| 296 | -# try: | ||
| 297 | -# cursor.execute(sql) | ||
| 298 | -# result = cursor.fetchone() | ||
| 299 | -# return result[0] | ||
| 300 | -# except Exception as err: | ||
| 301 | -# # 发生错误时回滚 | ||
| 302 | -# print(err) | ||
| 303 | -# db.rollback() | ||
| 304 | -# db.close() | ||
| 305 | -# | ||
| 306 | -# #未收明细数量 | ||
| 307 | -# def get_detailAction_1_from_database(): | ||
| 308 | -# db = GetConnect() | ||
| 309 | -# cursor = db.cursor() | ||
| 310 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 311 | -# sql = '''select COUNT(id) from \"{}\" where partner_id = {} and order_actual_amount > order_payment_amount '''.format('order',get_partner_id_from_database('partner_info')) | ||
| 312 | -# # print(sql)id | ||
| 313 | -# try: | ||
| 314 | -# cursor.execute(sql) | ||
| 315 | -# result = cursor.fetchone() | ||
| 316 | -# return result[0] | ||
| 317 | -# except Exception as err: | ||
| 318 | -# # 发生错误时回滚 | ||
| 319 | -# print(err) | ||
| 320 | -# db.rollback() | ||
| 321 | -# db.close() | ||
| 322 | -# | ||
| 323 | -# #季度分红支出 | ||
| 324 | -# def get_expend_from_database(): | ||
| 325 | -# db = GetConnect() | ||
| 326 | -# cursor = db.cursor() | ||
| 327 | -# # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 328 | -# sql = '''select sum(((order_amount- order_actual_amount)* partner_bonus_percent)/100) from \"{}\" where partner_id = {} '''.format('order',get_partner_id_from_database()) | ||
| 329 | -# # print(sql)id | ||
| 330 | -# try: | ||
| 331 | -# cursor.execute(sql) | ||
| 332 | -# result = cursor.fetchone() | ||
| 333 | -# if result[0] == 0: | ||
| 334 | -# return 0 | ||
| 335 | -# else: | ||
| 336 | -# return round(result[0],2) | ||
| 337 | -# except Exception as err: | ||
| 338 | -# # 发生错误时回滚 | ||
| 339 | -# print(err) | ||
| 340 | -# db.rollback() | ||
| 341 | -# db.close() | ||
| 342 | -# # print(get_expend_from_database()) | ||
| 343 | 237 | ||
| 344 | -import calendar | ||
| 345 | -print (range(calendar.monthrange(year, month)[1]+1)[1:]) | ||
| 238 | +#累计所有年份未收分红 | ||
| 239 | +def get_outstanding_from_database(): | ||
| 240 | + db = GetConnect() | ||
| 241 | + cursor = db.cursor() | ||
| 242 | + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 243 | + sql = '''select sum(partner_bonus_not) from order_base where partner_id = {} and order_type=1 and create_time between \'{}\' and \'{}\' '''.format(get_partner_id_from_database(),'2020-04-01 00:00:00','2021-03-31 23:59:59') | ||
| 244 | + # print(sql) | ||
| 245 | + try: | ||
| 246 | + cursor.execute(sql) | ||
| 247 | + result = cursor.fetchone() | ||
| 248 | + if round(result[0], 2) == 0: | ||
| 249 | + return 0 | ||
| 250 | + else: | ||
| 251 | + return round(result[0],2) | ||
| 252 | + except Exception as err: | ||
| 253 | + # 发生错误时回滚 | ||
| 254 | + print(err) | ||
| 255 | + db.rollback() | ||
| 256 | + db.close() | ||
| 257 | +# print(get_outstanding_from_database()) | ||
| 258 | + #累计所有年份已收分红 | ||
| 259 | +def get_received_from_database(): | ||
| 260 | + db = GetConnect() | ||
| 261 | + cursor = db.cursor() | ||
| 262 | + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 263 | + sql = '''select sum(partner_bonus_has) from order_base where partner_id = {} and order_type=1 and create_time between \'{}\' and \'{}\' '''.format(get_partner_id_from_database(),'2020-04-01 00:00:00','2021-03-31 23:59:59') | ||
| 264 | + # print(sql) | ||
| 265 | + try: | ||
| 266 | + cursor.execute(sql) | ||
| 267 | + result = cursor.fetchone() | ||
| 268 | + if round(result[0],2) == 0: | ||
| 269 | + return 0 | ||
| 270 | + else: | ||
| 271 | + return round(result[0],2) | ||
| 272 | + except Exception as err: | ||
| 273 | + # 发生错误时回滚 | ||
| 274 | + print(err) | ||
| 275 | + db.rollback() | ||
| 276 | + db.close() | ||
| 277 | + | ||
| 278 | +#已收/未收明细列表--发货单号 | ||
| 279 | +def get_detailAction_0_order_code_from_database(): | ||
| 280 | + db = GetConnect() | ||
| 281 | + cursor = db.cursor() | ||
| 282 | + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 283 | + sql = '''select order_code from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database()) | ||
| 284 | + # print(sql) | ||
| 285 | + try: | ||
| 286 | + cursor.execute(sql) | ||
| 287 | + result = cursor.fetchone() | ||
| 288 | + return result[0] | ||
| 289 | + except Exception as err: | ||
| 290 | + # 发生错误时回滚 | ||
| 291 | + print(err) | ||
| 292 | + db.rollback() | ||
| 293 | + db.close() | ||
| 294 | + | ||
| 295 | + | ||
| 296 | +#已收/未收明细列表--订单金额 | ||
| 297 | +def get_detailAction_0_plan_order_amount_from_database(): | ||
| 298 | + db = GetConnect() | ||
| 299 | + cursor = db.cursor() | ||
| 300 | + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 301 | + sql = '''select plan_order_amount from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database()) | ||
| 302 | + # print(sql) | ||
| 303 | + try: | ||
| 304 | + cursor.execute(sql) | ||
| 305 | + result = cursor.fetchone() | ||
| 306 | + return result[0] | ||
| 307 | + except Exception as err: | ||
| 308 | + # 发生错误时回滚 | ||
| 309 | + print(err) | ||
| 310 | + db.rollback() | ||
| 311 | + db.close() | ||
| 312 | + | ||
| 313 | +#已收/未收明细列表--应收分红 | ||
| 314 | +def get_detailAction_0_use_partner_bonus_amount_from_database(): | ||
| 315 | + db = GetConnect() | ||
| 316 | + cursor = db.cursor() | ||
| 317 | + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' | ||
| 318 | + sql = '''select use_partner_bonus from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database()) | ||
| 319 | + # print(sql) | ||
| 320 | + try: | ||
| 321 | + cursor.execute(sql) | ||
| 322 | + result = cursor.fetchone() | ||
| 323 | + return result[0] | ||
| 324 | + except Exception as err: | ||
| 325 | + # 发生错误时回滚 | ||
| 326 | + print(err) | ||
| 327 | + db.rollback() | ||
| 328 | + db.close() | ||
| 329 | +# print(get_detailAction_0_use_partner_bonus_amount_from_database()) |
| @@ -179,10 +179,10 @@ def get_partnername_from_database(tbl): | @@ -179,10 +179,10 @@ def get_partnername_from_database(tbl): | ||
| 179 | db.rollback() | 179 | db.rollback() |
| 180 | db.close() | 180 | db.close() |
| 181 | 181 | ||
| 182 | -def get_order_status_from_database(tbl): | 182 | +def get_order_status_from_database(): |
| 183 | db = GetConnect() | 183 | db = GetConnect() |
| 184 | cursor = db.cursor() | 184 | cursor = db.cursor() |
| 185 | - sql = 'select order_status from \"{}\" where order_type = 1 order by id DESC'.format(tbl) | 185 | + sql = '''select bonus_status from order_base where order_type = 1 order by id DESC''' |
| 186 | # print(sql) | 186 | # print(sql) |
| 187 | try: | 187 | try: |
| 188 | cursor.execute(sql) | 188 | cursor.execute(sql) |
| @@ -283,10 +283,10 @@ def get_purpose_orderDist_from_database(tbl): | @@ -283,10 +283,10 @@ def get_purpose_orderDist_from_database(tbl): | ||
| 283 | db.rollback() | 283 | db.rollback() |
| 284 | db.close() | 284 | db.close() |
| 285 | 285 | ||
| 286 | -def get_actual_orderId_from_database(tbl): | 286 | +def get_actual_delivery_code_from_database(): |
| 287 | db = GetConnect() | 287 | db = GetConnect() |
| 288 | cursor = db.cursor() | 288 | cursor = db.cursor() |
| 289 | - sql = 'select order_code from \"{}\" where order_type = 1 order by id DESC'.format(tbl) | 289 | + sql = '''select delivery_code from order_base where order_type = 1 order by id DESC''' |
| 290 | # print(sql) | 290 | # print(sql) |
| 291 | try: | 291 | try: |
| 292 | cursor.execute(sql) | 292 | cursor.execute(sql) |
| @@ -297,7 +297,7 @@ def get_actual_orderId_from_database(tbl): | @@ -297,7 +297,7 @@ def get_actual_orderId_from_database(tbl): | ||
| 297 | print(err) | 297 | print(err) |
| 298 | db.rollback() | 298 | db.rollback() |
| 299 | db.close() | 299 | db.close() |
| 300 | - | 300 | +# print(get_actual_delivery_code_from_database()) |
| 301 | def get_purpose_orderId_from_database(tbl): | 301 | def get_purpose_orderId_from_database(tbl): |
| 302 | db = GetConnect() | 302 | db = GetConnect() |
| 303 | cursor = db.cursor() | 303 | cursor = db.cursor() |
| @@ -313,5 +313,5 @@ def get_purpose_orderId_from_database(tbl): | @@ -313,5 +313,5 @@ def get_purpose_orderId_from_database(tbl): | ||
| 313 | db.rollback() | 313 | db.rollback() |
| 314 | db.close() | 314 | db.close() |
| 315 | 315 | ||
| 316 | -# print(get_order_status_from_database('order')) | 316 | +print(get_order_status_from_database()) |
| 317 | 317 |
reports/20200812T033205.613604.html
已删除
100644 → 0
| 1 | -<head> | ||
| 2 | - <meta content="text/html; charset=utf-8" http-equiv="content-type" /> | ||
| 3 | - <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| 4 | - <title> - TestReport</title> | ||
| 5 | - <style> | ||
| 6 | - body { | ||
| 7 | - background-color: #f2f2f2; | ||
| 8 | - color: #333; | ||
| 9 | - margin: 0 auto; | ||
| 10 | - width: 960px; | ||
| 11 | - } | ||
| 12 | - #summary { | ||
| 13 | - width: 960px; | ||
| 14 | - margin-bottom: 20px; | ||
| 15 | - } | ||
| 16 | - #summary th { | ||
| 17 | - background-color: skyblue; | ||
| 18 | - padding: 5px 12px; | ||
| 19 | - } | ||
| 20 | - #summary td { | ||
| 21 | - background-color: lightblue; | ||
| 22 | - text-align: center; | ||
| 23 | - padding: 4px 8px; | ||
| 24 | - } | ||
| 25 | - .details { | ||
| 26 | - width: 960px; | ||
| 27 | - margin-bottom: 20px; | ||
| 28 | - } | ||
| 29 | - .details th { | ||
| 30 | - background-color: skyblue; | ||
| 31 | - padding: 5px 12px; | ||
| 32 | - } | ||
| 33 | - .details tr .passed { | ||
| 34 | - background-color: lightgreen; | ||
| 35 | - } | ||
| 36 | - .details tr .failed { | ||
| 37 | - background-color: red; | ||
| 38 | - } | ||
| 39 | - .details tr .unchecked { | ||
| 40 | - background-color: gray; | ||
| 41 | - } | ||
| 42 | - .details td { | ||
| 43 | - background-color: lightblue; | ||
| 44 | - padding: 5px 12px; | ||
| 45 | - } | ||
| 46 | - .details .detail { | ||
| 47 | - background-color: lightgrey; | ||
| 48 | - font-size: smaller; | ||
| 49 | - padding: 5px 10px; | ||
| 50 | - line-height: 20px; | ||
| 51 | - text-align: left; | ||
| 52 | - } | ||
| 53 | - .details .success { | ||
| 54 | - background-color: greenyellow; | ||
| 55 | - } | ||
| 56 | - .details .error { | ||
| 57 | - background-color: red; | ||
| 58 | - } | ||
| 59 | - .details .failure { | ||
| 60 | - background-color: salmon; | ||
| 61 | - } | ||
| 62 | - .details .skipped { | ||
| 63 | - background-color: gray; | ||
| 64 | - } | ||
| 65 | - | ||
| 66 | - .button { | ||
| 67 | - font-size: 1em; | ||
| 68 | - padding: 6px; | ||
| 69 | - width: 4em; | ||
| 70 | - text-align: center; | ||
| 71 | - background-color: #06d85f; | ||
| 72 | - border-radius: 20px/50px; | ||
| 73 | - cursor: pointer; | ||
| 74 | - transition: all 0.3s ease-out; | ||
| 75 | - } | ||
| 76 | - a.button{ | ||
| 77 | - color: gray; | ||
| 78 | - text-decoration: none; | ||
| 79 | - display: inline-block; | ||
| 80 | - } | ||
| 81 | - .button:hover { | ||
| 82 | - background: #2cffbd; | ||
| 83 | - } | ||
| 84 | - | ||
| 85 | - .overlay { | ||
| 86 | - position: fixed; | ||
| 87 | - top: 0; | ||
| 88 | - bottom: 0; | ||
| 89 | - left: 0; | ||
| 90 | - right: 0; | ||
| 91 | - background: rgba(0, 0, 0, 0.7); | ||
| 92 | - transition: opacity 500ms; | ||
| 93 | - visibility: hidden; | ||
| 94 | - opacity: 0; | ||
| 95 | - line-height: 25px; | ||
| 96 | - } | ||
| 97 | - .overlay:target { | ||
| 98 | - visibility: visible; | ||
| 99 | - opacity: 1; | ||
| 100 | - } | ||
| 101 | - | ||
| 102 | - .popup { | ||
| 103 | - margin: 70px auto; | ||
| 104 | - padding: 20px; | ||
| 105 | - background: #fff; | ||
| 106 | - border-radius: 10px; | ||
| 107 | - width: 50%; | ||
| 108 | - position: relative; | ||
| 109 | - transition: all 3s ease-in-out; | ||
| 110 | - } | ||
| 111 | - | ||
| 112 | - .popup h2 { | ||
| 113 | - margin-top: 0; | ||
| 114 | - color: #333; | ||
| 115 | - font-family: Tahoma, Arial, sans-serif; | ||
| 116 | - } | ||
| 117 | - .popup .close { | ||
| 118 | - position: absolute; | ||
| 119 | - top: 20px; | ||
| 120 | - right: 30px; | ||
| 121 | - transition: all 200ms; | ||
| 122 | - font-size: 30px; | ||
| 123 | - font-weight: bold; | ||
| 124 | - text-decoration: none; | ||
| 125 | - color: #333; | ||
| 126 | - } | ||
| 127 | - .popup .close:hover { | ||
| 128 | - color: #06d85f; | ||
| 129 | - } | ||
| 130 | - .popup .content { | ||
| 131 | - max-height: 80%; | ||
| 132 | - overflow: auto; | ||
| 133 | - text-align: left; | ||
| 134 | - } | ||
| 135 | - .popup .separator { | ||
| 136 | - color:royalblue | ||
| 137 | - } | ||
| 138 | - | ||
| 139 | - @media screen and (max-width: 700px) { | ||
| 140 | - .box { | ||
| 141 | - width: 70%; | ||
| 142 | - } | ||
| 143 | - .popup { | ||
| 144 | - width: 70%; | ||
| 145 | - } | ||
| 146 | - } | ||
| 147 | - | ||
| 148 | - </style> | ||
| 149 | -</head> | ||
| 150 | - | ||
| 151 | -<body> | ||
| 152 | - <h1>Test Report: </h1> | ||
| 153 | - | ||
| 154 | - <h2>Summary</h2> | ||
| 155 | - <table id="summary"> | ||
| 156 | - <tr> | ||
| 157 | - <th>START AT</th> | ||
| 158 | - <td colspan="4">2020-08-12T03:32:05.613604</td> | ||
| 159 | - </tr> | ||
| 160 | - <tr> | ||
| 161 | - <th>DURATION</th> | ||
| 162 | - <td colspan="4">0.458 seconds</td> | ||
| 163 | - </tr> | ||
| 164 | - <tr> | ||
| 165 | - <th>PLATFORM</th> | ||
| 166 | - <td>HttpRunner 2.5.7 </td> | ||
| 167 | - <td>CPython 3.8.1 </td> | ||
| 168 | - <td colspan="2">Windows-7-6.1.7601-SP1</td> | ||
| 169 | - </tr> | ||
| 170 | - <tr> | ||
| 171 | - <th>STAT</th> | ||
| 172 | - <th colspan="2">TESTCASES (success/fail)</th> | ||
| 173 | - <th colspan="2">TESTSTEPS (success/fail/error/skip)</th> | ||
| 174 | - </tr> | ||
| 175 | - <tr> | ||
| 176 | - <td>total (details) =></td> | ||
| 177 | - <td colspan="2">1 (1/0)</td> | ||
| 178 | - <td colspan="2">2 (2/0/0/0)</td> | ||
| 179 | - </tr> | ||
| 180 | - </table> | ||
| 181 | - | ||
| 182 | - <h2>Details</h2> | ||
| 183 | - | ||
| 184 | - | ||
| 185 | - | ||
| 186 | - <h3>statistics:订单统计</h3> | ||
| 187 | - <table id="suite_1" class="details"> | ||
| 188 | - <tr> | ||
| 189 | - <td>TOTAL: 2</td> | ||
| 190 | - <td>SUCCESS: 2</td> | ||
| 191 | - <td>FAILED: 0</td> | ||
| 192 | - <td>ERROR: 0</td> | ||
| 193 | - <td>SKIPPED: 0</td> | ||
| 194 | - </tr> | ||
| 195 | - <tr> | ||
| 196 | - <th>Status</th> | ||
| 197 | - <th colspan="2">Name</th> | ||
| 198 | - <th>Response Time</th> | ||
| 199 | - <th>Detail</th> | ||
| 200 | - </tr> | ||
| 201 | - | ||
| 202 | - | ||
| 203 | - | ||
| 204 | - | ||
| 205 | - <tr id="record_1_1"> | ||
| 206 | - <th class="success" style="width:5em;">success</th> | ||
| 207 | - <td colspan="2">13459147023 登录系统</td> | ||
| 208 | - <td style="text-align:center;width:6em;">199.00 ms</td> | ||
| 209 | - <td class="detail"> | ||
| 210 | - | ||
| 211 | - | ||
| 212 | - | ||
| 213 | - <a class="button" href="#popup_log_1_1_1">log-1</a> | ||
| 214 | - <div id="popup_log_1_1_1" class="overlay"> | ||
| 215 | - <div class="popup"> | ||
| 216 | - <h2>Request and Response data</h2> | ||
| 217 | - <a class="close" href="#record_1_1_1">×</a> | ||
| 218 | - | ||
| 219 | - <div class="content"> | ||
| 220 | - <h3>Name: 13459147023 登录系统</h3> | ||
| 221 | - | ||
| 222 | - | ||
| 223 | - | ||
| 224 | - | ||
| 225 | - | ||
| 226 | - <h3>Request:</h3> | ||
| 227 | - <div style="overflow: auto"> | ||
| 228 | - <table> | ||
| 229 | - | ||
| 230 | - <tr> | ||
| 231 | - <th>url</th> | ||
| 232 | - <td> | ||
| 233 | - | ||
| 234 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/login | ||
| 235 | - | ||
| 236 | - </td> | ||
| 237 | - </tr> | ||
| 238 | - | ||
| 239 | - <tr> | ||
| 240 | - <th>method</th> | ||
| 241 | - <td> | ||
| 242 | - | ||
| 243 | - POST | ||
| 244 | - | ||
| 245 | - </td> | ||
| 246 | - </tr> | ||
| 247 | - | ||
| 248 | - <tr> | ||
| 249 | - <th>headers</th> | ||
| 250 | - <td> | ||
| 251 | - | ||
| 252 | - <pre>{ | ||
| 253 | - "User-Agent": "okhttp/3.12.3", | ||
| 254 | - "Accept-Encoding": "gzip, deflate", | ||
| 255 | - "Accept": "*/*", | ||
| 256 | - "Connection": "keep-alive", | ||
| 257 | - "Content-Type": "application/json;charset=utf-8", | ||
| 258 | - "X-MMM-AccessToken": "", | ||
| 259 | - "X-MMM-AppName": "com.mmm.partner", | ||
| 260 | - "X-MMM-AppProject": "ability", | ||
| 261 | - "X-MMM-DeviceType": "1", | ||
| 262 | - "X-MMM-Sign": "018c9e6df8c2e933e88c771dc450b3e0ed686ef2912b47fea1d856af3986ccb7", | ||
| 263 | - "X-MMM-Timestamp": "1597203125616", | ||
| 264 | - "X-MMM-Uuid": "64de9785-dc4c-11ea-b83c-e0d55e7159d5", | ||
| 265 | - "X-MMM-Version": "0.1.0", | ||
| 266 | - "Content-Length": "138" | ||
| 267 | -}</pre> | ||
| 268 | - | ||
| 269 | - </td> | ||
| 270 | - </tr> | ||
| 271 | - | ||
| 272 | - <tr> | ||
| 273 | - <th>body</th> | ||
| 274 | - <td> | ||
| 275 | - | ||
| 276 | - <pre>{ | ||
| 277 | - "phone": "13459147023", | ||
| 278 | - "grantType": "signInPassword", | ||
| 279 | - "password": "7c4a8d09ca3762af61e59520943dc26494f8941b", | ||
| 280 | - "clientId": "pdf233Znkjo" | ||
| 281 | -}</pre> | ||
| 282 | - | ||
| 283 | - </td> | ||
| 284 | - </tr> | ||
| 285 | - | ||
| 286 | - </table> | ||
| 287 | - </div> | ||
| 288 | - | ||
| 289 | - <h3>Response:</h3> | ||
| 290 | - <div style="overflow: auto"> | ||
| 291 | - <table> | ||
| 292 | - | ||
| 293 | - <tr> | ||
| 294 | - <th>ok</th> | ||
| 295 | - <td> | ||
| 296 | - | ||
| 297 | - True | ||
| 298 | - | ||
| 299 | - </td> | ||
| 300 | - </tr> | ||
| 301 | - | ||
| 302 | - <tr> | ||
| 303 | - <th>url</th> | ||
| 304 | - <td> | ||
| 305 | - | ||
| 306 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/login | ||
| 307 | - | ||
| 308 | - </td> | ||
| 309 | - </tr> | ||
| 310 | - | ||
| 311 | - <tr> | ||
| 312 | - <th>status_code</th> | ||
| 313 | - <td> | ||
| 314 | - | ||
| 315 | - 200 | ||
| 316 | - | ||
| 317 | - </td> | ||
| 318 | - </tr> | ||
| 319 | - | ||
| 320 | - <tr> | ||
| 321 | - <th>reason</th> | ||
| 322 | - <td> | ||
| 323 | - | ||
| 324 | - OK | ||
| 325 | - | ||
| 326 | - </td> | ||
| 327 | - </tr> | ||
| 328 | - | ||
| 329 | - <tr> | ||
| 330 | - <th>cookies</th> | ||
| 331 | - <td> | ||
| 332 | - | ||
| 333 | - {} | ||
| 334 | - | ||
| 335 | - </td> | ||
| 336 | - </tr> | ||
| 337 | - | ||
| 338 | - <tr> | ||
| 339 | - <th>encoding</th> | ||
| 340 | - <td> | ||
| 341 | - | ||
| 342 | - utf-8 | ||
| 343 | - | ||
| 344 | - </td> | ||
| 345 | - </tr> | ||
| 346 | - | ||
| 347 | - <tr> | ||
| 348 | - <th>headers</th> | ||
| 349 | - <td> | ||
| 350 | - | ||
| 351 | - <pre>{ | ||
| 352 | - "Date": "Wed, 12 Aug 2020 03:32:09 GMT", | ||
| 353 | - "Content-Type": "application/json; charset=utf-8", | ||
| 354 | - "Content-Length": "207", | ||
| 355 | - "Connection": "keep-alive" | ||
| 356 | -}</pre> | ||
| 357 | - | ||
| 358 | - </td> | ||
| 359 | - </tr> | ||
| 360 | - | ||
| 361 | - <tr> | ||
| 362 | - <th>content_type</th> | ||
| 363 | - <td> | ||
| 364 | - | ||
| 365 | - application/json; charset=utf-8 | ||
| 366 | - | ||
| 367 | - </td> | ||
| 368 | - </tr> | ||
| 369 | - | ||
| 370 | - <tr> | ||
| 371 | - <th>body</th> | ||
| 372 | - <td> | ||
| 373 | - | ||
| 374 | - | ||
| 375 | - <pre>{ | ||
| 376 | - "code": 0, | ||
| 377 | - "msg": "成功", | ||
| 378 | - "data": { | ||
| 379 | - "authCode": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMDQwMjksImlzcyI6Imp3dCJ9.FBT6afVY3Y6ryAuSU3aSv-C9AlNByt8QbN6ISxUD0qA" | ||
| 380 | - } | ||
| 381 | -}</pre> | ||
| 382 | - | ||
| 383 | - | ||
| 384 | - </td> | ||
| 385 | - </tr> | ||
| 386 | - | ||
| 387 | - </table> | ||
| 388 | - </div> | ||
| 389 | - | ||
| 390 | - | ||
| 391 | - <h3>Validators:</h3> | ||
| 392 | - <div style="overflow: auto"> | ||
| 393 | - | ||
| 394 | - | ||
| 395 | - | ||
| 396 | - | ||
| 397 | - | ||
| 398 | - </div> | ||
| 399 | - | ||
| 400 | - <h3>Statistics:</h3> | ||
| 401 | - <div style="overflow: auto"> | ||
| 402 | - <table> | ||
| 403 | - <tr> | ||
| 404 | - <th>content_size(bytes)</th> | ||
| 405 | - <td>207</td> | ||
| 406 | - </tr> | ||
| 407 | - <tr> | ||
| 408 | - <th>response_time(ms)</th> | ||
| 409 | - <td>136.0</td> | ||
| 410 | - </tr> | ||
| 411 | - <tr> | ||
| 412 | - <th>elapsed(ms)</th> | ||
| 413 | - <td>123.272</td> | ||
| 414 | - </tr> | ||
| 415 | - </table> | ||
| 416 | - </div> | ||
| 417 | - | ||
| 418 | - </div> | ||
| 419 | - </div> | ||
| 420 | - </div> | ||
| 421 | - | ||
| 422 | - | ||
| 423 | - <a class="button" href="#popup_log_1_1_2">log-2</a> | ||
| 424 | - <div id="popup_log_1_1_2" class="overlay"> | ||
| 425 | - <div class="popup"> | ||
| 426 | - <h2>Request and Response data</h2> | ||
| 427 | - <a class="close" href="#record_1_1_2">×</a> | ||
| 428 | - | ||
| 429 | - <div class="content"> | ||
| 430 | - <h3>Name: 13459147023 获取accessToken</h3> | ||
| 431 | - | ||
| 432 | - | ||
| 433 | - | ||
| 434 | - | ||
| 435 | - | ||
| 436 | - <h3>Request:</h3> | ||
| 437 | - <div style="overflow: auto"> | ||
| 438 | - <table> | ||
| 439 | - | ||
| 440 | - <tr> | ||
| 441 | - <th>url</th> | ||
| 442 | - <td> | ||
| 443 | - | ||
| 444 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/accessToken | ||
| 445 | - | ||
| 446 | - </td> | ||
| 447 | - </tr> | ||
| 448 | - | ||
| 449 | - <tr> | ||
| 450 | - <th>method</th> | ||
| 451 | - <td> | ||
| 452 | - | ||
| 453 | - POST | ||
| 454 | - | ||
| 455 | - </td> | ||
| 456 | - </tr> | ||
| 457 | - | ||
| 458 | - <tr> | ||
| 459 | - <th>headers</th> | ||
| 460 | - <td> | ||
| 461 | - | ||
| 462 | - <pre>{ | ||
| 463 | - "User-Agent": "okhttp/3.12.3", | ||
| 464 | - "Accept-Encoding": "gzip, deflate", | ||
| 465 | - "Accept": "*/*", | ||
| 466 | - "Connection": "keep-alive", | ||
| 467 | - "Content-Type": "application/json;charset=utf-8", | ||
| 468 | - "X-MMM-AccessToken": "", | ||
| 469 | - "X-MMM-AppName": "com.mmm.ability", | ||
| 470 | - "X-MMM-AppProject": "ability", | ||
| 471 | - "X-MMM-DeviceType": "1", | ||
| 472 | - "X-MMM-Sign": "fdfceb8faba0084c9f07298364c856a09bae5fa26f26e629d3c79b9a555f051d", | ||
| 473 | - "X-MMM-Timestamp": "1597203125908", | ||
| 474 | - "X-MMM-Uuid": "650b25c5-dc4c-11ea-a309-e0d55e7159d5", | ||
| 475 | - "X-MMM-Version": "0.4.0", | ||
| 476 | - "Content-Length": "226" | ||
| 477 | -}</pre> | ||
| 478 | - | ||
| 479 | - </td> | ||
| 480 | - </tr> | ||
| 481 | - | ||
| 482 | - <tr> | ||
| 483 | - <th>body</th> | ||
| 484 | - <td> | ||
| 485 | - | ||
| 486 | - <pre>{ | ||
| 487 | - "authCode": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMDQwMjksImlzcyI6Imp3dCJ9.FBT6afVY3Y6ryAuSU3aSv-C9AlNByt8QbN6ISxUD0qA", | ||
| 488 | - "clientId": "lks3Z8Ncn2j", | ||
| 489 | - "clientSecret": "gtfhyjukiol3Qncbvmdwe67khh" | ||
| 490 | -}</pre> | ||
| 491 | - | ||
| 492 | - </td> | ||
| 493 | - </tr> | ||
| 494 | - | ||
| 495 | - </table> | ||
| 496 | - </div> | ||
| 497 | - | ||
| 498 | - <h3>Response:</h3> | ||
| 499 | - <div style="overflow: auto"> | ||
| 500 | - <table> | ||
| 501 | - | ||
| 502 | - <tr> | ||
| 503 | - <th>ok</th> | ||
| 504 | - <td> | ||
| 505 | - | ||
| 506 | - True | ||
| 507 | - | ||
| 508 | - </td> | ||
| 509 | - </tr> | ||
| 510 | - | ||
| 511 | - <tr> | ||
| 512 | - <th>url</th> | ||
| 513 | - <td> | ||
| 514 | - | ||
| 515 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/accessToken | ||
| 516 | - | ||
| 517 | - </td> | ||
| 518 | - </tr> | ||
| 519 | - | ||
| 520 | - <tr> | ||
| 521 | - <th>status_code</th> | ||
| 522 | - <td> | ||
| 523 | - | ||
| 524 | - 200 | ||
| 525 | - | ||
| 526 | - </td> | ||
| 527 | - </tr> | ||
| 528 | - | ||
| 529 | - <tr> | ||
| 530 | - <th>reason</th> | ||
| 531 | - <td> | ||
| 532 | - | ||
| 533 | - OK | ||
| 534 | - | ||
| 535 | - </td> | ||
| 536 | - </tr> | ||
| 537 | - | ||
| 538 | - <tr> | ||
| 539 | - <th>cookies</th> | ||
| 540 | - <td> | ||
| 541 | - | ||
| 542 | - {} | ||
| 543 | - | ||
| 544 | - </td> | ||
| 545 | - </tr> | ||
| 546 | - | ||
| 547 | - <tr> | ||
| 548 | - <th>encoding</th> | ||
| 549 | - <td> | ||
| 550 | - | ||
| 551 | - utf-8 | ||
| 552 | - | ||
| 553 | - </td> | ||
| 554 | - </tr> | ||
| 555 | - | ||
| 556 | - <tr> | ||
| 557 | - <th>headers</th> | ||
| 558 | - <td> | ||
| 559 | - | ||
| 560 | - <pre>{ | ||
| 561 | - "Date": "Wed, 12 Aug 2020 03:32:09 GMT", | ||
| 562 | - "Content-Type": "application/json; charset=utf-8", | ||
| 563 | - "Transfer-Encoding": "chunked", | ||
| 564 | - "Connection": "keep-alive", | ||
| 565 | - "Vary": "Accept-Encoding", | ||
| 566 | - "Content-Encoding": "gzip" | ||
| 567 | -}</pre> | ||
| 568 | - | ||
| 569 | - </td> | ||
| 570 | - </tr> | ||
| 571 | - | ||
| 572 | - <tr> | ||
| 573 | - <th>content_type</th> | ||
| 574 | - <td> | ||
| 575 | - | ||
| 576 | - application/json; charset=utf-8 | ||
| 577 | - | ||
| 578 | - </td> | ||
| 579 | - </tr> | ||
| 580 | - | ||
| 581 | - <tr> | ||
| 582 | - <th>body</th> | ||
| 583 | - <td> | ||
| 584 | - | ||
| 585 | - | ||
| 586 | - <pre>{ | ||
| 587 | - "code": 0, | ||
| 588 | - "msg": "成功", | ||
| 589 | - "data": { | ||
| 590 | - "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTk3OTUxMjksImlzcyI6Imp3dCJ9.PDB98NaZEmBZJHLmx8SvMJeTzFsyzx9r7k8DQGW2690", | ||
| 591 | - "accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMTAzMjksImlzcyI6Imp3dCJ9.ZzMwZ-gC-c_Ykn6GVhs6CczuDkCdHQGaG1A2tI1BqVE", | ||
| 592 | - "expiresIn": 7200 | ||
| 593 | - } | ||
| 594 | -}</pre> | ||
| 595 | - | ||
| 596 | - | ||
| 597 | - </td> | ||
| 598 | - </tr> | ||
| 599 | - | ||
| 600 | - </table> | ||
| 601 | - </div> | ||
| 602 | - | ||
| 603 | - | ||
| 604 | - <h3>Validators:</h3> | ||
| 605 | - <div style="overflow: auto"> | ||
| 606 | - | ||
| 607 | - | ||
| 608 | - | ||
| 609 | - | ||
| 610 | - | ||
| 611 | - </div> | ||
| 612 | - | ||
| 613 | - <h3>Statistics:</h3> | ||
| 614 | - <div style="overflow: auto"> | ||
| 615 | - <table> | ||
| 616 | - <tr> | ||
| 617 | - <th>content_size(bytes)</th> | ||
| 618 | - <td>394</td> | ||
| 619 | - </tr> | ||
| 620 | - <tr> | ||
| 621 | - <th>response_time(ms)</th> | ||
| 622 | - <td>32.0</td> | ||
| 623 | - </tr> | ||
| 624 | - <tr> | ||
| 625 | - <th>elapsed(ms)</th> | ||
| 626 | - <td>24.103</td> | ||
| 627 | - </tr> | ||
| 628 | - </table> | ||
| 629 | - </div> | ||
| 630 | - | ||
| 631 | - </div> | ||
| 632 | - </div> | ||
| 633 | - </div> | ||
| 634 | - | ||
| 635 | - | ||
| 636 | - <a class="button" href="#popup_log_1_1_3">log-3</a> | ||
| 637 | - <div id="popup_log_1_1_3" class="overlay"> | ||
| 638 | - <div class="popup"> | ||
| 639 | - <h2>Request and Response data</h2> | ||
| 640 | - <a class="close" href="#record_1_1_3">×</a> | ||
| 641 | - | ||
| 642 | - <div class="content"> | ||
| 643 | - <h3>Name: 13459147023 获取用户信息</h3> | ||
| 644 | - | ||
| 645 | - | ||
| 646 | - | ||
| 647 | - | ||
| 648 | - | ||
| 649 | - <h3>Request:</h3> | ||
| 650 | - <div style="overflow: auto"> | ||
| 651 | - <table> | ||
| 652 | - | ||
| 653 | - <tr> | ||
| 654 | - <th>url</th> | ||
| 655 | - <td> | ||
| 656 | - | ||
| 657 | - http://mmm-partner-test.fjmaimaimai.com/v1/user/userInfo | ||
| 658 | - | ||
| 659 | - </td> | ||
| 660 | - </tr> | ||
| 661 | - | ||
| 662 | - <tr> | ||
| 663 | - <th>method</th> | ||
| 664 | - <td> | ||
| 665 | - | ||
| 666 | - POST | ||
| 667 | - | ||
| 668 | - </td> | ||
| 669 | - </tr> | ||
| 670 | - | ||
| 671 | - <tr> | ||
| 672 | - <th>headers</th> | ||
| 673 | - <td> | ||
| 674 | - | ||
| 675 | - <pre>{ | ||
| 676 | - "User-Agent": "okhttp/3.12.3", | ||
| 677 | - "Accept-Encoding": "gzip, deflate", | ||
| 678 | - "Accept": "*/*", | ||
| 679 | - "Connection": "keep-alive", | ||
| 680 | - "Content-Type": "application/json;charset=utf-8", | ||
| 681 | - "X-MMM-AccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMTAzMjksImlzcyI6Imp3dCJ9.ZzMwZ-gC-c_Ykn6GVhs6CczuDkCdHQGaG1A2tI1BqVE", | ||
| 682 | - "X-MMM-AppName": "com.mmm.ability", | ||
| 683 | - "X-MMM-AppProject": "ability", | ||
| 684 | - "X-MMM-DeviceType": "1", | ||
| 685 | - "X-MMM-Sign": "da349ffa05bb63fc0038ff22e1c816891a4be1c6765b565a83bf63f6bbbb792c", | ||
| 686 | - "X-MMM-Timestamp": "1597203125973", | ||
| 687 | - "X-MMM-Uuid": "651510d5-dc4c-11ea-b3bf-e0d55e7159d5", | ||
| 688 | - "X-MMM-Version": "0.4.0", | ||
| 689 | - "Content-Length": "0" | ||
| 690 | -}</pre> | ||
| 691 | - | ||
| 692 | - </td> | ||
| 693 | - </tr> | ||
| 694 | - | ||
| 695 | - </table> | ||
| 696 | - </div> | ||
| 697 | - | ||
| 698 | - <h3>Response:</h3> | ||
| 699 | - <div style="overflow: auto"> | ||
| 700 | - <table> | ||
| 701 | - | ||
| 702 | - <tr> | ||
| 703 | - <th>ok</th> | ||
| 704 | - <td> | ||
| 705 | - | ||
| 706 | - True | ||
| 707 | - | ||
| 708 | - </td> | ||
| 709 | - </tr> | ||
| 710 | - | ||
| 711 | - <tr> | ||
| 712 | - <th>url</th> | ||
| 713 | - <td> | ||
| 714 | - | ||
| 715 | - http://mmm-partner-test.fjmaimaimai.com/v1/user/userInfo | ||
| 716 | - | ||
| 717 | - </td> | ||
| 718 | - </tr> | ||
| 719 | - | ||
| 720 | - <tr> | ||
| 721 | - <th>status_code</th> | ||
| 722 | - <td> | ||
| 723 | - | ||
| 724 | - 200 | ||
| 725 | - | ||
| 726 | - </td> | ||
| 727 | - </tr> | ||
| 728 | - | ||
| 729 | - <tr> | ||
| 730 | - <th>reason</th> | ||
| 731 | - <td> | ||
| 732 | - | ||
| 733 | - OK | ||
| 734 | - | ||
| 735 | - </td> | ||
| 736 | - </tr> | ||
| 737 | - | ||
| 738 | - <tr> | ||
| 739 | - <th>cookies</th> | ||
| 740 | - <td> | ||
| 741 | - | ||
| 742 | - {} | ||
| 743 | - | ||
| 744 | - </td> | ||
| 745 | - </tr> | ||
| 746 | - | ||
| 747 | - <tr> | ||
| 748 | - <th>encoding</th> | ||
| 749 | - <td> | ||
| 750 | - | ||
| 751 | - utf-8 | ||
| 752 | - | ||
| 753 | - </td> | ||
| 754 | - </tr> | ||
| 755 | - | ||
| 756 | - <tr> | ||
| 757 | - <th>headers</th> | ||
| 758 | - <td> | ||
| 759 | - | ||
| 760 | - <pre>{ | ||
| 761 | - "Date": "Wed, 12 Aug 2020 03:32:09 GMT", | ||
| 762 | - "Content-Type": "application/json; charset=utf-8", | ||
| 763 | - "Transfer-Encoding": "chunked", | ||
| 764 | - "Connection": "keep-alive", | ||
| 765 | - "Vary": "Accept-Encoding", | ||
| 766 | - "Content-Encoding": "gzip" | ||
| 767 | -}</pre> | ||
| 768 | - | ||
| 769 | - </td> | ||
| 770 | - </tr> | ||
| 771 | - | ||
| 772 | - <tr> | ||
| 773 | - <th>content_type</th> | ||
| 774 | - <td> | ||
| 775 | - | ||
| 776 | - application/json; charset=utf-8 | ||
| 777 | - | ||
| 778 | - </td> | ||
| 779 | - </tr> | ||
| 780 | - | ||
| 781 | - <tr> | ||
| 782 | - <th>body</th> | ||
| 783 | - <td> | ||
| 784 | - | ||
| 785 | - | ||
| 786 | - <pre>{ | ||
| 787 | - "code": 0, | ||
| 788 | - "msg": "成功", | ||
| 789 | - "data": { | ||
| 790 | - "user": { | ||
| 791 | - "uid": 29, | ||
| 792 | - "uname": "卞信华", | ||
| 793 | - "phone": "13459147023", | ||
| 794 | - "company": { | ||
| 795 | - "id": 1, | ||
| 796 | - "name": "福建买买买信息科技有限公司", | ||
| 797 | - "phone": "0591-83845802" | ||
| 798 | - }, | ||
| 799 | - "joinWay": { | ||
| 800 | - "id": 1, | ||
| 801 | - "name": "事业合伙人" | ||
| 802 | - }, | ||
| 803 | - "district": { | ||
| 804 | - "id": 0, | ||
| 805 | - "name": "福建省福州市XXXXX区" | ||
| 806 | - }, | ||
| 807 | - "serialNo": 29, | ||
| 808 | - "cooperationTime": 1590940800000, | ||
| 809 | - "salesman": { | ||
| 810 | - "phone": "13459147023", | ||
| 811 | - "uname": "小屁孩" | ||
| 812 | - }, | ||
| 813 | - "accid": 2994483695433811968, | ||
| 814 | - "imToken": "e965ed61e2dd80d629fd137c01ba50d6", | ||
| 815 | - "csAccountID": "3492238958608384" | ||
| 816 | - } | ||
| 817 | - } | ||
| 818 | -}</pre> | ||
| 819 | - | ||
| 820 | - | ||
| 821 | - </td> | ||
| 822 | - </tr> | ||
| 823 | - | ||
| 824 | - </table> | ||
| 825 | - </div> | ||
| 826 | - | ||
| 827 | - | ||
| 828 | - <h3>Validators:</h3> | ||
| 829 | - <div style="overflow: auto"> | ||
| 830 | - | ||
| 831 | - | ||
| 832 | - <table> | ||
| 833 | - <tr> | ||
| 834 | - <th>check</th> | ||
| 835 | - <th>comparator</th> | ||
| 836 | - <th>expect value</th> | ||
| 837 | - <th>actual value</th> | ||
| 838 | - </tr> | ||
| 839 | - | ||
| 840 | - <tr> | ||
| 841 | - | ||
| 842 | - <td class="passed"> | ||
| 843 | - | ||
| 844 | - content.msg | ||
| 845 | - </td> | ||
| 846 | - <td>equals</td> | ||
| 847 | - <td>LazyString($msg)</td> | ||
| 848 | - <td>成功</td> | ||
| 849 | - </tr> | ||
| 850 | - | ||
| 851 | - </table> | ||
| 852 | - | ||
| 853 | - | ||
| 854 | - | ||
| 855 | - | ||
| 856 | - </div> | ||
| 857 | - | ||
| 858 | - <h3>Statistics:</h3> | ||
| 859 | - <div style="overflow: auto"> | ||
| 860 | - <table> | ||
| 861 | - <tr> | ||
| 862 | - <th>content_size(bytes)</th> | ||
| 863 | - <td>734</td> | ||
| 864 | - </tr> | ||
| 865 | - <tr> | ||
| 866 | - <th>response_time(ms)</th> | ||
| 867 | - <td>31.0</td> | ||
| 868 | - </tr> | ||
| 869 | - <tr> | ||
| 870 | - <th>elapsed(ms)</th> | ||
| 871 | - <td>28.797</td> | ||
| 872 | - </tr> | ||
| 873 | - </table> | ||
| 874 | - </div> | ||
| 875 | - | ||
| 876 | - </div> | ||
| 877 | - </div> | ||
| 878 | - </div> | ||
| 879 | - | ||
| 880 | - | ||
| 881 | - | ||
| 882 | - | ||
| 883 | - </td> | ||
| 884 | - </tr> | ||
| 885 | - | ||
| 886 | - | ||
| 887 | - | ||
| 888 | - <tr id="record_1_2"> | ||
| 889 | - <th class="success" style="width:5em;">success</th> | ||
| 890 | - <td colspan="2">13459147023 订单统计</td> | ||
| 891 | - <td style="text-align:center;width:6em;">30.00 ms</td> | ||
| 892 | - <td class="detail"> | ||
| 893 | - | ||
| 894 | - | ||
| 895 | - | ||
| 896 | - <a class="button" href="#popup_log_1_2_1">log-1</a> | ||
| 897 | - <div id="popup_log_1_2_1" class="overlay"> | ||
| 898 | - <div class="popup"> | ||
| 899 | - <h2>Request and Response data</h2> | ||
| 900 | - <a class="close" href="#record_1_2_1">×</a> | ||
| 901 | - | ||
| 902 | - <div class="content"> | ||
| 903 | - <h3>Name: 13459147023 订单统计</h3> | ||
| 904 | - | ||
| 905 | - | ||
| 906 | - | ||
| 907 | - | ||
| 908 | - | ||
| 909 | - <h3>Request:</h3> | ||
| 910 | - <div style="overflow: auto"> | ||
| 911 | - <table> | ||
| 912 | - | ||
| 913 | - <tr> | ||
| 914 | - <th>url</th> | ||
| 915 | - <td> | ||
| 916 | - | ||
| 917 | - http://mmm-partner-test.fjmaimaimai.com/v1/order/statistics | ||
| 918 | - | ||
| 919 | - </td> | ||
| 920 | - </tr> | ||
| 921 | - | ||
| 922 | - <tr> | ||
| 923 | - <th>method</th> | ||
| 924 | - <td> | ||
| 925 | - | ||
| 926 | - POST | ||
| 927 | - | ||
| 928 | - </td> | ||
| 929 | - </tr> | ||
| 930 | - | ||
| 931 | - <tr> | ||
| 932 | - <th>headers</th> | ||
| 933 | - <td> | ||
| 934 | - | ||
| 935 | - <pre>{ | ||
| 936 | - "User-Agent": "okhttp/3.12.3", | ||
| 937 | - "Accept-Encoding": "gzip, deflate", | ||
| 938 | - "Accept": "*/*", | ||
| 939 | - "Connection": "keep-alive", | ||
| 940 | - "Content-Type": "application/json;charset=utf-8", | ||
| 941 | - "X-MMM-AccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMTAzMjksImlzcyI6Imp3dCJ9.ZzMwZ-gC-c_Ykn6GVhs6CczuDkCdHQGaG1A2tI1BqVE", | ||
| 942 | - "X-MMM-AppName": "com.mmm.ability", | ||
| 943 | - "X-MMM-AppProject": "ability", | ||
| 944 | - "X-MMM-DeviceType": "1", | ||
| 945 | - "X-MMM-Sign": "09652c4d0da0dbad62b515c8edcf9a6c3259012020675faff25529f1b6a18c3a", | ||
| 946 | - "X-MMM-Timestamp": "1597203126021", | ||
| 947 | - "X-MMM-Uuid": "651c63d5-dc4c-11ea-bddf-e0d55e7159d5", | ||
| 948 | - "X-MMM-Version": "0.4.0", | ||
| 949 | - "Content-Length": "0" | ||
| 950 | -}</pre> | ||
| 951 | - | ||
| 952 | - </td> | ||
| 953 | - </tr> | ||
| 954 | - | ||
| 955 | - </table> | ||
| 956 | - </div> | ||
| 957 | - | ||
| 958 | - <h3>Response:</h3> | ||
| 959 | - <div style="overflow: auto"> | ||
| 960 | - <table> | ||
| 961 | - | ||
| 962 | - <tr> | ||
| 963 | - <th>ok</th> | ||
| 964 | - <td> | ||
| 965 | - | ||
| 966 | - True | ||
| 967 | - | ||
| 968 | - </td> | ||
| 969 | - </tr> | ||
| 970 | - | ||
| 971 | - <tr> | ||
| 972 | - <th>url</th> | ||
| 973 | - <td> | ||
| 974 | - | ||
| 975 | - http://mmm-partner-test.fjmaimaimai.com/v1/order/statistics | ||
| 976 | - | ||
| 977 | - </td> | ||
| 978 | - </tr> | ||
| 979 | - | ||
| 980 | - <tr> | ||
| 981 | - <th>status_code</th> | ||
| 982 | - <td> | ||
| 983 | - | ||
| 984 | - 200 | ||
| 985 | - | ||
| 986 | - </td> | ||
| 987 | - </tr> | ||
| 988 | - | ||
| 989 | - <tr> | ||
| 990 | - <th>reason</th> | ||
| 991 | - <td> | ||
| 992 | - | ||
| 993 | - OK | ||
| 994 | - | ||
| 995 | - </td> | ||
| 996 | - </tr> | ||
| 997 | - | ||
| 998 | - <tr> | ||
| 999 | - <th>cookies</th> | ||
| 1000 | - <td> | ||
| 1001 | - | ||
| 1002 | - {} | ||
| 1003 | - | ||
| 1004 | - </td> | ||
| 1005 | - </tr> | ||
| 1006 | - | ||
| 1007 | - <tr> | ||
| 1008 | - <th>encoding</th> | ||
| 1009 | - <td> | ||
| 1010 | - | ||
| 1011 | - utf-8 | ||
| 1012 | - | ||
| 1013 | - </td> | ||
| 1014 | - </tr> | ||
| 1015 | - | ||
| 1016 | - <tr> | ||
| 1017 | - <th>headers</th> | ||
| 1018 | - <td> | ||
| 1019 | - | ||
| 1020 | - <pre>{ | ||
| 1021 | - "Date": "Wed, 12 Aug 2020 03:32:09 GMT", | ||
| 1022 | - "Content-Type": "application/json; charset=utf-8", | ||
| 1023 | - "Content-Length": "205", | ||
| 1024 | - "Connection": "keep-alive" | ||
| 1025 | -}</pre> | ||
| 1026 | - | ||
| 1027 | - </td> | ||
| 1028 | - </tr> | ||
| 1029 | - | ||
| 1030 | - <tr> | ||
| 1031 | - <th>content_type</th> | ||
| 1032 | - <td> | ||
| 1033 | - | ||
| 1034 | - application/json; charset=utf-8 | ||
| 1035 | - | ||
| 1036 | - </td> | ||
| 1037 | - </tr> | ||
| 1038 | - | ||
| 1039 | - <tr> | ||
| 1040 | - <th>body</th> | ||
| 1041 | - <td> | ||
| 1042 | - | ||
| 1043 | - | ||
| 1044 | - <pre>{ | ||
| 1045 | - "code": 0, | ||
| 1046 | - "msg": "成功", | ||
| 1047 | - "data": { | ||
| 1048 | - "statistics": { | ||
| 1049 | - "todayRealQuantity": 2, | ||
| 1050 | - "todayRealMoney": 17.86, | ||
| 1051 | - "cumulativeQuantity": 54, | ||
| 1052 | - "cumulativeMoney": 106734.62 | ||
| 1053 | - } | ||
| 1054 | - } | ||
| 1055 | -}</pre> | ||
| 1056 | - | ||
| 1057 | - | ||
| 1058 | - </td> | ||
| 1059 | - </tr> | ||
| 1060 | - | ||
| 1061 | - </table> | ||
| 1062 | - </div> | ||
| 1063 | - | ||
| 1064 | - | ||
| 1065 | - <h3>Validators:</h3> | ||
| 1066 | - <div style="overflow: auto"> | ||
| 1067 | - | ||
| 1068 | - | ||
| 1069 | - <table> | ||
| 1070 | - <tr> | ||
| 1071 | - <th>check</th> | ||
| 1072 | - <th>comparator</th> | ||
| 1073 | - <th>expect value</th> | ||
| 1074 | - <th>actual value</th> | ||
| 1075 | - </tr> | ||
| 1076 | - | ||
| 1077 | - <tr> | ||
| 1078 | - | ||
| 1079 | - <td class="passed"> | ||
| 1080 | - | ||
| 1081 | - content.msg | ||
| 1082 | - </td> | ||
| 1083 | - <td>equals</td> | ||
| 1084 | - <td>LazyString($msg)</td> | ||
| 1085 | - <td>成功</td> | ||
| 1086 | - </tr> | ||
| 1087 | - | ||
| 1088 | - <tr> | ||
| 1089 | - | ||
| 1090 | - <td class="passed"> | ||
| 1091 | - | ||
| 1092 | - content.data.statistics.cumulativeMoney | ||
| 1093 | - </td> | ||
| 1094 | - <td>equals</td> | ||
| 1095 | - <td>LazyString($cumulativeMoney)</td> | ||
| 1096 | - <td>106734.62</td> | ||
| 1097 | - </tr> | ||
| 1098 | - | ||
| 1099 | - <tr> | ||
| 1100 | - | ||
| 1101 | - <td class="passed"> | ||
| 1102 | - | ||
| 1103 | - content.data.statistics.cumulativeQuantity | ||
| 1104 | - </td> | ||
| 1105 | - <td>equals</td> | ||
| 1106 | - <td>LazyString($cumulativeQuantity)</td> | ||
| 1107 | - <td>54</td> | ||
| 1108 | - </tr> | ||
| 1109 | - | ||
| 1110 | - <tr> | ||
| 1111 | - | ||
| 1112 | - <td class="passed"> | ||
| 1113 | - | ||
| 1114 | - content.data.statistics.todayRealMoney | ||
| 1115 | - </td> | ||
| 1116 | - <td>equals</td> | ||
| 1117 | - <td>LazyString($todayRealMoney)</td> | ||
| 1118 | - <td>17.86</td> | ||
| 1119 | - </tr> | ||
| 1120 | - | ||
| 1121 | - <tr> | ||
| 1122 | - | ||
| 1123 | - <td class="passed"> | ||
| 1124 | - | ||
| 1125 | - content.data.statistics.todayRealQuantity | ||
| 1126 | - </td> | ||
| 1127 | - <td>equals</td> | ||
| 1128 | - <td>LazyString($todayRealQuantity)</td> | ||
| 1129 | - <td>2</td> | ||
| 1130 | - </tr> | ||
| 1131 | - | ||
| 1132 | - </table> | ||
| 1133 | - | ||
| 1134 | - | ||
| 1135 | - | ||
| 1136 | - | ||
| 1137 | - </div> | ||
| 1138 | - | ||
| 1139 | - <h3>Statistics:</h3> | ||
| 1140 | - <div style="overflow: auto"> | ||
| 1141 | - <table> | ||
| 1142 | - <tr> | ||
| 1143 | - <th>content_size(bytes)</th> | ||
| 1144 | - <td>205</td> | ||
| 1145 | - </tr> | ||
| 1146 | - <tr> | ||
| 1147 | - <th>response_time(ms)</th> | ||
| 1148 | - <td>30.0</td> | ||
| 1149 | - </tr> | ||
| 1150 | - <tr> | ||
| 1151 | - <th>elapsed(ms)</th> | ||
| 1152 | - <td>27.126</td> | ||
| 1153 | - </tr> | ||
| 1154 | - </table> | ||
| 1155 | - </div> | ||
| 1156 | - | ||
| 1157 | - </div> | ||
| 1158 | - </div> | ||
| 1159 | - </div> | ||
| 1160 | - | ||
| 1161 | - | ||
| 1162 | - | ||
| 1163 | - | ||
| 1164 | - </td> | ||
| 1165 | - </tr> | ||
| 1166 | - | ||
| 1167 | - </table> | ||
| 1168 | - | ||
| 1169 | -</body> |
reports/20200812T033521.571604.html
已删除
100644 → 0
| 1 | -<head> | ||
| 2 | - <meta content="text/html; charset=utf-8" http-equiv="content-type" /> | ||
| 3 | - <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| 4 | - <title> - TestReport</title> | ||
| 5 | - <style> | ||
| 6 | - body { | ||
| 7 | - background-color: #f2f2f2; | ||
| 8 | - color: #333; | ||
| 9 | - margin: 0 auto; | ||
| 10 | - width: 960px; | ||
| 11 | - } | ||
| 12 | - #summary { | ||
| 13 | - width: 960px; | ||
| 14 | - margin-bottom: 20px; | ||
| 15 | - } | ||
| 16 | - #summary th { | ||
| 17 | - background-color: skyblue; | ||
| 18 | - padding: 5px 12px; | ||
| 19 | - } | ||
| 20 | - #summary td { | ||
| 21 | - background-color: lightblue; | ||
| 22 | - text-align: center; | ||
| 23 | - padding: 4px 8px; | ||
| 24 | - } | ||
| 25 | - .details { | ||
| 26 | - width: 960px; | ||
| 27 | - margin-bottom: 20px; | ||
| 28 | - } | ||
| 29 | - .details th { | ||
| 30 | - background-color: skyblue; | ||
| 31 | - padding: 5px 12px; | ||
| 32 | - } | ||
| 33 | - .details tr .passed { | ||
| 34 | - background-color: lightgreen; | ||
| 35 | - } | ||
| 36 | - .details tr .failed { | ||
| 37 | - background-color: red; | ||
| 38 | - } | ||
| 39 | - .details tr .unchecked { | ||
| 40 | - background-color: gray; | ||
| 41 | - } | ||
| 42 | - .details td { | ||
| 43 | - background-color: lightblue; | ||
| 44 | - padding: 5px 12px; | ||
| 45 | - } | ||
| 46 | - .details .detail { | ||
| 47 | - background-color: lightgrey; | ||
| 48 | - font-size: smaller; | ||
| 49 | - padding: 5px 10px; | ||
| 50 | - line-height: 20px; | ||
| 51 | - text-align: left; | ||
| 52 | - } | ||
| 53 | - .details .success { | ||
| 54 | - background-color: greenyellow; | ||
| 55 | - } | ||
| 56 | - .details .error { | ||
| 57 | - background-color: red; | ||
| 58 | - } | ||
| 59 | - .details .failure { | ||
| 60 | - background-color: salmon; | ||
| 61 | - } | ||
| 62 | - .details .skipped { | ||
| 63 | - background-color: gray; | ||
| 64 | - } | ||
| 65 | - | ||
| 66 | - .button { | ||
| 67 | - font-size: 1em; | ||
| 68 | - padding: 6px; | ||
| 69 | - width: 4em; | ||
| 70 | - text-align: center; | ||
| 71 | - background-color: #06d85f; | ||
| 72 | - border-radius: 20px/50px; | ||
| 73 | - cursor: pointer; | ||
| 74 | - transition: all 0.3s ease-out; | ||
| 75 | - } | ||
| 76 | - a.button{ | ||
| 77 | - color: gray; | ||
| 78 | - text-decoration: none; | ||
| 79 | - display: inline-block; | ||
| 80 | - } | ||
| 81 | - .button:hover { | ||
| 82 | - background: #2cffbd; | ||
| 83 | - } | ||
| 84 | - | ||
| 85 | - .overlay { | ||
| 86 | - position: fixed; | ||
| 87 | - top: 0; | ||
| 88 | - bottom: 0; | ||
| 89 | - left: 0; | ||
| 90 | - right: 0; | ||
| 91 | - background: rgba(0, 0, 0, 0.7); | ||
| 92 | - transition: opacity 500ms; | ||
| 93 | - visibility: hidden; | ||
| 94 | - opacity: 0; | ||
| 95 | - line-height: 25px; | ||
| 96 | - } | ||
| 97 | - .overlay:target { | ||
| 98 | - visibility: visible; | ||
| 99 | - opacity: 1; | ||
| 100 | - } | ||
| 101 | - | ||
| 102 | - .popup { | ||
| 103 | - margin: 70px auto; | ||
| 104 | - padding: 20px; | ||
| 105 | - background: #fff; | ||
| 106 | - border-radius: 10px; | ||
| 107 | - width: 50%; | ||
| 108 | - position: relative; | ||
| 109 | - transition: all 3s ease-in-out; | ||
| 110 | - } | ||
| 111 | - | ||
| 112 | - .popup h2 { | ||
| 113 | - margin-top: 0; | ||
| 114 | - color: #333; | ||
| 115 | - font-family: Tahoma, Arial, sans-serif; | ||
| 116 | - } | ||
| 117 | - .popup .close { | ||
| 118 | - position: absolute; | ||
| 119 | - top: 20px; | ||
| 120 | - right: 30px; | ||
| 121 | - transition: all 200ms; | ||
| 122 | - font-size: 30px; | ||
| 123 | - font-weight: bold; | ||
| 124 | - text-decoration: none; | ||
| 125 | - color: #333; | ||
| 126 | - } | ||
| 127 | - .popup .close:hover { | ||
| 128 | - color: #06d85f; | ||
| 129 | - } | ||
| 130 | - .popup .content { | ||
| 131 | - max-height: 80%; | ||
| 132 | - overflow: auto; | ||
| 133 | - text-align: left; | ||
| 134 | - } | ||
| 135 | - .popup .separator { | ||
| 136 | - color:royalblue | ||
| 137 | - } | ||
| 138 | - | ||
| 139 | - @media screen and (max-width: 700px) { | ||
| 140 | - .box { | ||
| 141 | - width: 70%; | ||
| 142 | - } | ||
| 143 | - .popup { | ||
| 144 | - width: 70%; | ||
| 145 | - } | ||
| 146 | - } | ||
| 147 | - | ||
| 148 | - </style> | ||
| 149 | -</head> | ||
| 150 | - | ||
| 151 | -<body> | ||
| 152 | - <h1>Test Report: </h1> | ||
| 153 | - | ||
| 154 | - <h2>Summary</h2> | ||
| 155 | - <table id="summary"> | ||
| 156 | - <tr> | ||
| 157 | - <th>START AT</th> | ||
| 158 | - <td colspan="4">2020-08-12T03:35:21.571604</td> | ||
| 159 | - </tr> | ||
| 160 | - <tr> | ||
| 161 | - <th>DURATION</th> | ||
| 162 | - <td colspan="4">0.371 seconds</td> | ||
| 163 | - </tr> | ||
| 164 | - <tr> | ||
| 165 | - <th>PLATFORM</th> | ||
| 166 | - <td>HttpRunner 2.5.7 </td> | ||
| 167 | - <td>CPython 3.8.1 </td> | ||
| 168 | - <td colspan="2">Windows-7-6.1.7601-SP1</td> | ||
| 169 | - </tr> | ||
| 170 | - <tr> | ||
| 171 | - <th>STAT</th> | ||
| 172 | - <th colspan="2">TESTCASES (success/fail)</th> | ||
| 173 | - <th colspan="2">TESTSTEPS (success/fail/error/skip)</th> | ||
| 174 | - </tr> | ||
| 175 | - <tr> | ||
| 176 | - <td>total (details) =></td> | ||
| 177 | - <td colspan="2">1 (1/0)</td> | ||
| 178 | - <td colspan="2">2 (2/0/0/0)</td> | ||
| 179 | - </tr> | ||
| 180 | - </table> | ||
| 181 | - | ||
| 182 | - <h2>Details</h2> | ||
| 183 | - | ||
| 184 | - | ||
| 185 | - | ||
| 186 | - <h3>statistics:订单统计</h3> | ||
| 187 | - <table id="suite_1" class="details"> | ||
| 188 | - <tr> | ||
| 189 | - <td>TOTAL: 2</td> | ||
| 190 | - <td>SUCCESS: 2</td> | ||
| 191 | - <td>FAILED: 0</td> | ||
| 192 | - <td>ERROR: 0</td> | ||
| 193 | - <td>SKIPPED: 0</td> | ||
| 194 | - </tr> | ||
| 195 | - <tr> | ||
| 196 | - <th>Status</th> | ||
| 197 | - <th colspan="2">Name</th> | ||
| 198 | - <th>Response Time</th> | ||
| 199 | - <th>Detail</th> | ||
| 200 | - </tr> | ||
| 201 | - | ||
| 202 | - | ||
| 203 | - | ||
| 204 | - | ||
| 205 | - <tr id="record_1_1"> | ||
| 206 | - <th class="success" style="width:5em;">success</th> | ||
| 207 | - <td colspan="2">13459147023 登录系统</td> | ||
| 208 | - <td style="text-align:center;width:6em;">168.00 ms</td> | ||
| 209 | - <td class="detail"> | ||
| 210 | - | ||
| 211 | - | ||
| 212 | - | ||
| 213 | - <a class="button" href="#popup_log_1_1_1">log-1</a> | ||
| 214 | - <div id="popup_log_1_1_1" class="overlay"> | ||
| 215 | - <div class="popup"> | ||
| 216 | - <h2>Request and Response data</h2> | ||
| 217 | - <a class="close" href="#record_1_1_1">×</a> | ||
| 218 | - | ||
| 219 | - <div class="content"> | ||
| 220 | - <h3>Name: 13459147023 登录系统</h3> | ||
| 221 | - | ||
| 222 | - | ||
| 223 | - | ||
| 224 | - | ||
| 225 | - | ||
| 226 | - <h3>Request:</h3> | ||
| 227 | - <div style="overflow: auto"> | ||
| 228 | - <table> | ||
| 229 | - | ||
| 230 | - <tr> | ||
| 231 | - <th>url</th> | ||
| 232 | - <td> | ||
| 233 | - | ||
| 234 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/login | ||
| 235 | - | ||
| 236 | - </td> | ||
| 237 | - </tr> | ||
| 238 | - | ||
| 239 | - <tr> | ||
| 240 | - <th>method</th> | ||
| 241 | - <td> | ||
| 242 | - | ||
| 243 | - POST | ||
| 244 | - | ||
| 245 | - </td> | ||
| 246 | - </tr> | ||
| 247 | - | ||
| 248 | - <tr> | ||
| 249 | - <th>headers</th> | ||
| 250 | - <td> | ||
| 251 | - | ||
| 252 | - <pre>{ | ||
| 253 | - "User-Agent": "okhttp/3.12.3", | ||
| 254 | - "Accept-Encoding": "gzip, deflate", | ||
| 255 | - "Accept": "*/*", | ||
| 256 | - "Connection": "keep-alive", | ||
| 257 | - "Content-Type": "application/json;charset=utf-8", | ||
| 258 | - "X-MMM-AccessToken": "", | ||
| 259 | - "X-MMM-AppName": "com.mmm.partner", | ||
| 260 | - "X-MMM-AppProject": "ability", | ||
| 261 | - "X-MMM-DeviceType": "1", | ||
| 262 | - "X-MMM-Sign": "8d2cd02cdab47635d18e12a3e454347b831eb7fa662f0a677c5e03156a07d6a6", | ||
| 263 | - "X-MMM-Timestamp": "1597203321572", | ||
| 264 | - "X-MMM-Uuid": "d9ab1ac5-dc4c-11ea-b282-e0d55e7159d5", | ||
| 265 | - "X-MMM-Version": "0.1.0", | ||
| 266 | - "Content-Length": "138" | ||
| 267 | -}</pre> | ||
| 268 | - | ||
| 269 | - </td> | ||
| 270 | - </tr> | ||
| 271 | - | ||
| 272 | - <tr> | ||
| 273 | - <th>body</th> | ||
| 274 | - <td> | ||
| 275 | - | ||
| 276 | - <pre>{ | ||
| 277 | - "phone": "13459147023", | ||
| 278 | - "grantType": "signInPassword", | ||
| 279 | - "password": "7c4a8d09ca3762af61e59520943dc26494f8941b", | ||
| 280 | - "clientId": "pdf233Znkjo" | ||
| 281 | -}</pre> | ||
| 282 | - | ||
| 283 | - </td> | ||
| 284 | - </tr> | ||
| 285 | - | ||
| 286 | - </table> | ||
| 287 | - </div> | ||
| 288 | - | ||
| 289 | - <h3>Response:</h3> | ||
| 290 | - <div style="overflow: auto"> | ||
| 291 | - <table> | ||
| 292 | - | ||
| 293 | - <tr> | ||
| 294 | - <th>ok</th> | ||
| 295 | - <td> | ||
| 296 | - | ||
| 297 | - True | ||
| 298 | - | ||
| 299 | - </td> | ||
| 300 | - </tr> | ||
| 301 | - | ||
| 302 | - <tr> | ||
| 303 | - <th>url</th> | ||
| 304 | - <td> | ||
| 305 | - | ||
| 306 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/login | ||
| 307 | - | ||
| 308 | - </td> | ||
| 309 | - </tr> | ||
| 310 | - | ||
| 311 | - <tr> | ||
| 312 | - <th>status_code</th> | ||
| 313 | - <td> | ||
| 314 | - | ||
| 315 | - 200 | ||
| 316 | - | ||
| 317 | - </td> | ||
| 318 | - </tr> | ||
| 319 | - | ||
| 320 | - <tr> | ||
| 321 | - <th>reason</th> | ||
| 322 | - <td> | ||
| 323 | - | ||
| 324 | - OK | ||
| 325 | - | ||
| 326 | - </td> | ||
| 327 | - </tr> | ||
| 328 | - | ||
| 329 | - <tr> | ||
| 330 | - <th>cookies</th> | ||
| 331 | - <td> | ||
| 332 | - | ||
| 333 | - {} | ||
| 334 | - | ||
| 335 | - </td> | ||
| 336 | - </tr> | ||
| 337 | - | ||
| 338 | - <tr> | ||
| 339 | - <th>encoding</th> | ||
| 340 | - <td> | ||
| 341 | - | ||
| 342 | - utf-8 | ||
| 343 | - | ||
| 344 | - </td> | ||
| 345 | - </tr> | ||
| 346 | - | ||
| 347 | - <tr> | ||
| 348 | - <th>headers</th> | ||
| 349 | - <td> | ||
| 350 | - | ||
| 351 | - <pre>{ | ||
| 352 | - "Date": "Wed, 12 Aug 2020 03:35:25 GMT", | ||
| 353 | - "Content-Type": "application/json; charset=utf-8", | ||
| 354 | - "Content-Length": "207", | ||
| 355 | - "Connection": "keep-alive" | ||
| 356 | -}</pre> | ||
| 357 | - | ||
| 358 | - </td> | ||
| 359 | - </tr> | ||
| 360 | - | ||
| 361 | - <tr> | ||
| 362 | - <th>content_type</th> | ||
| 363 | - <td> | ||
| 364 | - | ||
| 365 | - application/json; charset=utf-8 | ||
| 366 | - | ||
| 367 | - </td> | ||
| 368 | - </tr> | ||
| 369 | - | ||
| 370 | - <tr> | ||
| 371 | - <th>body</th> | ||
| 372 | - <td> | ||
| 373 | - | ||
| 374 | - | ||
| 375 | - <pre>{ | ||
| 376 | - "code": 0, | ||
| 377 | - "msg": "成功", | ||
| 378 | - "data": { | ||
| 379 | - "authCode": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMDQyMjQsImlzcyI6Imp3dCJ9.Dgwkb4m8Hwwj5ViMmOp5cOL_L0Hatw2qqPIUI0wkQpI" | ||
| 380 | - } | ||
| 381 | -}</pre> | ||
| 382 | - | ||
| 383 | - | ||
| 384 | - </td> | ||
| 385 | - </tr> | ||
| 386 | - | ||
| 387 | - </table> | ||
| 388 | - </div> | ||
| 389 | - | ||
| 390 | - | ||
| 391 | - <h3>Validators:</h3> | ||
| 392 | - <div style="overflow: auto"> | ||
| 393 | - | ||
| 394 | - | ||
| 395 | - | ||
| 396 | - | ||
| 397 | - | ||
| 398 | - </div> | ||
| 399 | - | ||
| 400 | - <h3>Statistics:</h3> | ||
| 401 | - <div style="overflow: auto"> | ||
| 402 | - <table> | ||
| 403 | - <tr> | ||
| 404 | - <th>content_size(bytes)</th> | ||
| 405 | - <td>207</td> | ||
| 406 | - </tr> | ||
| 407 | - <tr> | ||
| 408 | - <th>response_time(ms)</th> | ||
| 409 | - <td>103.0</td> | ||
| 410 | - </tr> | ||
| 411 | - <tr> | ||
| 412 | - <th>elapsed(ms)</th> | ||
| 413 | - <td>98.953</td> | ||
| 414 | - </tr> | ||
| 415 | - </table> | ||
| 416 | - </div> | ||
| 417 | - | ||
| 418 | - </div> | ||
| 419 | - </div> | ||
| 420 | - </div> | ||
| 421 | - | ||
| 422 | - | ||
| 423 | - <a class="button" href="#popup_log_1_1_2">log-2</a> | ||
| 424 | - <div id="popup_log_1_1_2" class="overlay"> | ||
| 425 | - <div class="popup"> | ||
| 426 | - <h2>Request and Response data</h2> | ||
| 427 | - <a class="close" href="#record_1_1_2">×</a> | ||
| 428 | - | ||
| 429 | - <div class="content"> | ||
| 430 | - <h3>Name: 13459147023 获取accessToken</h3> | ||
| 431 | - | ||
| 432 | - | ||
| 433 | - | ||
| 434 | - | ||
| 435 | - | ||
| 436 | - <h3>Request:</h3> | ||
| 437 | - <div style="overflow: auto"> | ||
| 438 | - <table> | ||
| 439 | - | ||
| 440 | - <tr> | ||
| 441 | - <th>url</th> | ||
| 442 | - <td> | ||
| 443 | - | ||
| 444 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/accessToken | ||
| 445 | - | ||
| 446 | - </td> | ||
| 447 | - </tr> | ||
| 448 | - | ||
| 449 | - <tr> | ||
| 450 | - <th>method</th> | ||
| 451 | - <td> | ||
| 452 | - | ||
| 453 | - POST | ||
| 454 | - | ||
| 455 | - </td> | ||
| 456 | - </tr> | ||
| 457 | - | ||
| 458 | - <tr> | ||
| 459 | - <th>headers</th> | ||
| 460 | - <td> | ||
| 461 | - | ||
| 462 | - <pre>{ | ||
| 463 | - "User-Agent": "okhttp/3.12.3", | ||
| 464 | - "Accept-Encoding": "gzip, deflate", | ||
| 465 | - "Accept": "*/*", | ||
| 466 | - "Connection": "keep-alive", | ||
| 467 | - "Content-Type": "application/json;charset=utf-8", | ||
| 468 | - "X-MMM-AccessToken": "", | ||
| 469 | - "X-MMM-AppName": "com.mmm.ability", | ||
| 470 | - "X-MMM-AppProject": "ability", | ||
| 471 | - "X-MMM-DeviceType": "1", | ||
| 472 | - "X-MMM-Sign": "335f3174f4140a8b782ac5415bc02d4cc15e07d535ac89678a75272bc3ef782e", | ||
| 473 | - "X-MMM-Timestamp": "1597203321804", | ||
| 474 | - "X-MMM-Uuid": "d9ce8145-dc4c-11ea-9355-e0d55e7159d5", | ||
| 475 | - "X-MMM-Version": "0.4.0", | ||
| 476 | - "Content-Length": "226" | ||
| 477 | -}</pre> | ||
| 478 | - | ||
| 479 | - </td> | ||
| 480 | - </tr> | ||
| 481 | - | ||
| 482 | - <tr> | ||
| 483 | - <th>body</th> | ||
| 484 | - <td> | ||
| 485 | - | ||
| 486 | - <pre>{ | ||
| 487 | - "authCode": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMDQyMjQsImlzcyI6Imp3dCJ9.Dgwkb4m8Hwwj5ViMmOp5cOL_L0Hatw2qqPIUI0wkQpI", | ||
| 488 | - "clientId": "lks3Z8Ncn2j", | ||
| 489 | - "clientSecret": "gtfhyjukiol3Qncbvmdwe67khh" | ||
| 490 | -}</pre> | ||
| 491 | - | ||
| 492 | - </td> | ||
| 493 | - </tr> | ||
| 494 | - | ||
| 495 | - </table> | ||
| 496 | - </div> | ||
| 497 | - | ||
| 498 | - <h3>Response:</h3> | ||
| 499 | - <div style="overflow: auto"> | ||
| 500 | - <table> | ||
| 501 | - | ||
| 502 | - <tr> | ||
| 503 | - <th>ok</th> | ||
| 504 | - <td> | ||
| 505 | - | ||
| 506 | - True | ||
| 507 | - | ||
| 508 | - </td> | ||
| 509 | - </tr> | ||
| 510 | - | ||
| 511 | - <tr> | ||
| 512 | - <th>url</th> | ||
| 513 | - <td> | ||
| 514 | - | ||
| 515 | - http://mmm-partner-test.fjmaimaimai.com/v1/auth/accessToken | ||
| 516 | - | ||
| 517 | - </td> | ||
| 518 | - </tr> | ||
| 519 | - | ||
| 520 | - <tr> | ||
| 521 | - <th>status_code</th> | ||
| 522 | - <td> | ||
| 523 | - | ||
| 524 | - 200 | ||
| 525 | - | ||
| 526 | - </td> | ||
| 527 | - </tr> | ||
| 528 | - | ||
| 529 | - <tr> | ||
| 530 | - <th>reason</th> | ||
| 531 | - <td> | ||
| 532 | - | ||
| 533 | - OK | ||
| 534 | - | ||
| 535 | - </td> | ||
| 536 | - </tr> | ||
| 537 | - | ||
| 538 | - <tr> | ||
| 539 | - <th>cookies</th> | ||
| 540 | - <td> | ||
| 541 | - | ||
| 542 | - {} | ||
| 543 | - | ||
| 544 | - </td> | ||
| 545 | - </tr> | ||
| 546 | - | ||
| 547 | - <tr> | ||
| 548 | - <th>encoding</th> | ||
| 549 | - <td> | ||
| 550 | - | ||
| 551 | - utf-8 | ||
| 552 | - | ||
| 553 | - </td> | ||
| 554 | - </tr> | ||
| 555 | - | ||
| 556 | - <tr> | ||
| 557 | - <th>headers</th> | ||
| 558 | - <td> | ||
| 559 | - | ||
| 560 | - <pre>{ | ||
| 561 | - "Date": "Wed, 12 Aug 2020 03:35:25 GMT", | ||
| 562 | - "Content-Type": "application/json; charset=utf-8", | ||
| 563 | - "Transfer-Encoding": "chunked", | ||
| 564 | - "Connection": "keep-alive", | ||
| 565 | - "Vary": "Accept-Encoding", | ||
| 566 | - "Content-Encoding": "gzip" | ||
| 567 | -}</pre> | ||
| 568 | - | ||
| 569 | - </td> | ||
| 570 | - </tr> | ||
| 571 | - | ||
| 572 | - <tr> | ||
| 573 | - <th>content_type</th> | ||
| 574 | - <td> | ||
| 575 | - | ||
| 576 | - application/json; charset=utf-8 | ||
| 577 | - | ||
| 578 | - </td> | ||
| 579 | - </tr> | ||
| 580 | - | ||
| 581 | - <tr> | ||
| 582 | - <th>body</th> | ||
| 583 | - <td> | ||
| 584 | - | ||
| 585 | - | ||
| 586 | - <pre>{ | ||
| 587 | - "code": 0, | ||
| 588 | - "msg": "成功", | ||
| 589 | - "data": { | ||
| 590 | - "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTk3OTUzMjUsImlzcyI6Imp3dCJ9.8XGDZICB7lu03ItOSL7psvQhyMtn0DHne9unDhSXK5U", | ||
| 591 | - "accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMTA1MjUsImlzcyI6Imp3dCJ9.RUTWbqfQEq7QGvsWtJ_s7k8J-rsM4ZEk--q8RIZy1tc", | ||
| 592 | - "expiresIn": 7200 | ||
| 593 | - } | ||
| 594 | -}</pre> | ||
| 595 | - | ||
| 596 | - | ||
| 597 | - </td> | ||
| 598 | - </tr> | ||
| 599 | - | ||
| 600 | - </table> | ||
| 601 | - </div> | ||
| 602 | - | ||
| 603 | - | ||
| 604 | - <h3>Validators:</h3> | ||
| 605 | - <div style="overflow: auto"> | ||
| 606 | - | ||
| 607 | - | ||
| 608 | - | ||
| 609 | - | ||
| 610 | - | ||
| 611 | - </div> | ||
| 612 | - | ||
| 613 | - <h3>Statistics:</h3> | ||
| 614 | - <div style="overflow: auto"> | ||
| 615 | - <table> | ||
| 616 | - <tr> | ||
| 617 | - <th>content_size(bytes)</th> | ||
| 618 | - <td>394</td> | ||
| 619 | - </tr> | ||
| 620 | - <tr> | ||
| 621 | - <th>response_time(ms)</th> | ||
| 622 | - <td>31.0</td> | ||
| 623 | - </tr> | ||
| 624 | - <tr> | ||
| 625 | - <th>elapsed(ms)</th> | ||
| 626 | - <td>25.447</td> | ||
| 627 | - </tr> | ||
| 628 | - </table> | ||
| 629 | - </div> | ||
| 630 | - | ||
| 631 | - </div> | ||
| 632 | - </div> | ||
| 633 | - </div> | ||
| 634 | - | ||
| 635 | - | ||
| 636 | - <a class="button" href="#popup_log_1_1_3">log-3</a> | ||
| 637 | - <div id="popup_log_1_1_3" class="overlay"> | ||
| 638 | - <div class="popup"> | ||
| 639 | - <h2>Request and Response data</h2> | ||
| 640 | - <a class="close" href="#record_1_1_3">×</a> | ||
| 641 | - | ||
| 642 | - <div class="content"> | ||
| 643 | - <h3>Name: 13459147023 获取用户信息</h3> | ||
| 644 | - | ||
| 645 | - | ||
| 646 | - | ||
| 647 | - | ||
| 648 | - | ||
| 649 | - <h3>Request:</h3> | ||
| 650 | - <div style="overflow: auto"> | ||
| 651 | - <table> | ||
| 652 | - | ||
| 653 | - <tr> | ||
| 654 | - <th>url</th> | ||
| 655 | - <td> | ||
| 656 | - | ||
| 657 | - http://mmm-partner-test.fjmaimaimai.com/v1/user/userInfo | ||
| 658 | - | ||
| 659 | - </td> | ||
| 660 | - </tr> | ||
| 661 | - | ||
| 662 | - <tr> | ||
| 663 | - <th>method</th> | ||
| 664 | - <td> | ||
| 665 | - | ||
| 666 | - POST | ||
| 667 | - | ||
| 668 | - </td> | ||
| 669 | - </tr> | ||
| 670 | - | ||
| 671 | - <tr> | ||
| 672 | - <th>headers</th> | ||
| 673 | - <td> | ||
| 674 | - | ||
| 675 | - <pre>{ | ||
| 676 | - "User-Agent": "okhttp/3.12.3", | ||
| 677 | - "Accept-Encoding": "gzip, deflate", | ||
| 678 | - "Accept": "*/*", | ||
| 679 | - "Connection": "keep-alive", | ||
| 680 | - "Content-Type": "application/json;charset=utf-8", | ||
| 681 | - "X-MMM-AccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMTA1MjUsImlzcyI6Imp3dCJ9.RUTWbqfQEq7QGvsWtJ_s7k8J-rsM4ZEk--q8RIZy1tc", | ||
| 682 | - "X-MMM-AppName": "com.mmm.ability", | ||
| 683 | - "X-MMM-AppProject": "ability", | ||
| 684 | - "X-MMM-DeviceType": "1", | ||
| 685 | - "X-MMM-Sign": "17e65aef3e6640f8aee1ae564a0268e727048ca0fdd7ac8a9afef7e412d775ca", | ||
| 686 | - "X-MMM-Timestamp": "1597203321857", | ||
| 687 | - "X-MMM-Uuid": "d9d69795-dc4c-11ea-8743-e0d55e7159d5", | ||
| 688 | - "X-MMM-Version": "0.4.0", | ||
| 689 | - "Content-Length": "0" | ||
| 690 | -}</pre> | ||
| 691 | - | ||
| 692 | - </td> | ||
| 693 | - </tr> | ||
| 694 | - | ||
| 695 | - </table> | ||
| 696 | - </div> | ||
| 697 | - | ||
| 698 | - <h3>Response:</h3> | ||
| 699 | - <div style="overflow: auto"> | ||
| 700 | - <table> | ||
| 701 | - | ||
| 702 | - <tr> | ||
| 703 | - <th>ok</th> | ||
| 704 | - <td> | ||
| 705 | - | ||
| 706 | - True | ||
| 707 | - | ||
| 708 | - </td> | ||
| 709 | - </tr> | ||
| 710 | - | ||
| 711 | - <tr> | ||
| 712 | - <th>url</th> | ||
| 713 | - <td> | ||
| 714 | - | ||
| 715 | - http://mmm-partner-test.fjmaimaimai.com/v1/user/userInfo | ||
| 716 | - | ||
| 717 | - </td> | ||
| 718 | - </tr> | ||
| 719 | - | ||
| 720 | - <tr> | ||
| 721 | - <th>status_code</th> | ||
| 722 | - <td> | ||
| 723 | - | ||
| 724 | - 200 | ||
| 725 | - | ||
| 726 | - </td> | ||
| 727 | - </tr> | ||
| 728 | - | ||
| 729 | - <tr> | ||
| 730 | - <th>reason</th> | ||
| 731 | - <td> | ||
| 732 | - | ||
| 733 | - OK | ||
| 734 | - | ||
| 735 | - </td> | ||
| 736 | - </tr> | ||
| 737 | - | ||
| 738 | - <tr> | ||
| 739 | - <th>cookies</th> | ||
| 740 | - <td> | ||
| 741 | - | ||
| 742 | - {} | ||
| 743 | - | ||
| 744 | - </td> | ||
| 745 | - </tr> | ||
| 746 | - | ||
| 747 | - <tr> | ||
| 748 | - <th>encoding</th> | ||
| 749 | - <td> | ||
| 750 | - | ||
| 751 | - utf-8 | ||
| 752 | - | ||
| 753 | - </td> | ||
| 754 | - </tr> | ||
| 755 | - | ||
| 756 | - <tr> | ||
| 757 | - <th>headers</th> | ||
| 758 | - <td> | ||
| 759 | - | ||
| 760 | - <pre>{ | ||
| 761 | - "Date": "Wed, 12 Aug 2020 03:35:25 GMT", | ||
| 762 | - "Content-Type": "application/json; charset=utf-8", | ||
| 763 | - "Transfer-Encoding": "chunked", | ||
| 764 | - "Connection": "keep-alive", | ||
| 765 | - "Vary": "Accept-Encoding", | ||
| 766 | - "Content-Encoding": "gzip" | ||
| 767 | -}</pre> | ||
| 768 | - | ||
| 769 | - </td> | ||
| 770 | - </tr> | ||
| 771 | - | ||
| 772 | - <tr> | ||
| 773 | - <th>content_type</th> | ||
| 774 | - <td> | ||
| 775 | - | ||
| 776 | - application/json; charset=utf-8 | ||
| 777 | - | ||
| 778 | - </td> | ||
| 779 | - </tr> | ||
| 780 | - | ||
| 781 | - <tr> | ||
| 782 | - <th>body</th> | ||
| 783 | - <td> | ||
| 784 | - | ||
| 785 | - | ||
| 786 | - <pre>{ | ||
| 787 | - "code": 0, | ||
| 788 | - "msg": "成功", | ||
| 789 | - "data": { | ||
| 790 | - "user": { | ||
| 791 | - "uid": 29, | ||
| 792 | - "uname": "卞信华", | ||
| 793 | - "phone": "13459147023", | ||
| 794 | - "company": { | ||
| 795 | - "id": 1, | ||
| 796 | - "name": "福建买买买信息科技有限公司", | ||
| 797 | - "phone": "0591-83845802" | ||
| 798 | - }, | ||
| 799 | - "joinWay": { | ||
| 800 | - "id": 1, | ||
| 801 | - "name": "事业合伙人" | ||
| 802 | - }, | ||
| 803 | - "district": { | ||
| 804 | - "id": 0, | ||
| 805 | - "name": "福建省福州市XXXXX区" | ||
| 806 | - }, | ||
| 807 | - "serialNo": 29, | ||
| 808 | - "cooperationTime": 1590940800000, | ||
| 809 | - "salesman": { | ||
| 810 | - "phone": "13459147023", | ||
| 811 | - "uname": "小屁孩" | ||
| 812 | - }, | ||
| 813 | - "accid": 2994483695433811968, | ||
| 814 | - "imToken": "4d45a35ba23ac8a11e5fbe43668b4850", | ||
| 815 | - "csAccountID": "3492238958608384" | ||
| 816 | - } | ||
| 817 | - } | ||
| 818 | -}</pre> | ||
| 819 | - | ||
| 820 | - | ||
| 821 | - </td> | ||
| 822 | - </tr> | ||
| 823 | - | ||
| 824 | - </table> | ||
| 825 | - </div> | ||
| 826 | - | ||
| 827 | - | ||
| 828 | - <h3>Validators:</h3> | ||
| 829 | - <div style="overflow: auto"> | ||
| 830 | - | ||
| 831 | - | ||
| 832 | - <table> | ||
| 833 | - <tr> | ||
| 834 | - <th>check</th> | ||
| 835 | - <th>comparator</th> | ||
| 836 | - <th>expect value</th> | ||
| 837 | - <th>actual value</th> | ||
| 838 | - </tr> | ||
| 839 | - | ||
| 840 | - <tr> | ||
| 841 | - | ||
| 842 | - <td class="passed"> | ||
| 843 | - | ||
| 844 | - content.msg | ||
| 845 | - </td> | ||
| 846 | - <td>equals</td> | ||
| 847 | - <td>成功</td> | ||
| 848 | - <td>成功</td> | ||
| 849 | - </tr> | ||
| 850 | - | ||
| 851 | - </table> | ||
| 852 | - | ||
| 853 | - | ||
| 854 | - | ||
| 855 | - | ||
| 856 | - </div> | ||
| 857 | - | ||
| 858 | - <h3>Statistics:</h3> | ||
| 859 | - <div style="overflow: auto"> | ||
| 860 | - <table> | ||
| 861 | - <tr> | ||
| 862 | - <th>content_size(bytes)</th> | ||
| 863 | - <td>734</td> | ||
| 864 | - </tr> | ||
| 865 | - <tr> | ||
| 866 | - <th>response_time(ms)</th> | ||
| 867 | - <td>34.0</td> | ||
| 868 | - </tr> | ||
| 869 | - <tr> | ||
| 870 | - <th>elapsed(ms)</th> | ||
| 871 | - <td>30.188</td> | ||
| 872 | - </tr> | ||
| 873 | - </table> | ||
| 874 | - </div> | ||
| 875 | - | ||
| 876 | - </div> | ||
| 877 | - </div> | ||
| 878 | - </div> | ||
| 879 | - | ||
| 880 | - | ||
| 881 | - | ||
| 882 | - | ||
| 883 | - </td> | ||
| 884 | - </tr> | ||
| 885 | - | ||
| 886 | - | ||
| 887 | - | ||
| 888 | - <tr id="record_1_2"> | ||
| 889 | - <th class="success" style="width:5em;">success</th> | ||
| 890 | - <td colspan="2">13459147023 订单统计</td> | ||
| 891 | - <td style="text-align:center;width:6em;">29.00 ms</td> | ||
| 892 | - <td class="detail"> | ||
| 893 | - | ||
| 894 | - | ||
| 895 | - | ||
| 896 | - <a class="button" href="#popup_log_1_2_1">log-1</a> | ||
| 897 | - <div id="popup_log_1_2_1" class="overlay"> | ||
| 898 | - <div class="popup"> | ||
| 899 | - <h2>Request and Response data</h2> | ||
| 900 | - <a class="close" href="#record_1_2_1">×</a> | ||
| 901 | - | ||
| 902 | - <div class="content"> | ||
| 903 | - <h3>Name: 13459147023 订单统计</h3> | ||
| 904 | - | ||
| 905 | - | ||
| 906 | - | ||
| 907 | - | ||
| 908 | - | ||
| 909 | - <h3>Request:</h3> | ||
| 910 | - <div style="overflow: auto"> | ||
| 911 | - <table> | ||
| 912 | - | ||
| 913 | - <tr> | ||
| 914 | - <th>url</th> | ||
| 915 | - <td> | ||
| 916 | - | ||
| 917 | - http://mmm-partner-test.fjmaimaimai.com/v1/order/statistics | ||
| 918 | - | ||
| 919 | - </td> | ||
| 920 | - </tr> | ||
| 921 | - | ||
| 922 | - <tr> | ||
| 923 | - <th>method</th> | ||
| 924 | - <td> | ||
| 925 | - | ||
| 926 | - POST | ||
| 927 | - | ||
| 928 | - </td> | ||
| 929 | - </tr> | ||
| 930 | - | ||
| 931 | - <tr> | ||
| 932 | - <th>headers</th> | ||
| 933 | - <td> | ||
| 934 | - | ||
| 935 | - <pre>{ | ||
| 936 | - "User-Agent": "okhttp/3.12.3", | ||
| 937 | - "Accept-Encoding": "gzip, deflate", | ||
| 938 | - "Accept": "*/*", | ||
| 939 | - "Connection": "keep-alive", | ||
| 940 | - "Content-Type": "application/json;charset=utf-8", | ||
| 941 | - "X-MMM-AccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMTA1MjUsImlzcyI6Imp3dCJ9.RUTWbqfQEq7QGvsWtJ_s7k8J-rsM4ZEk--q8RIZy1tc", | ||
| 942 | - "X-MMM-AppName": "com.mmm.ability", | ||
| 943 | - "X-MMM-AppProject": "ability", | ||
| 944 | - "X-MMM-DeviceType": "1", | ||
| 945 | - "X-MMM-Sign": "6fe8ea4611c4294d56f5a5a224770a920ab2b4c87596b2b9581a35f8d0bce2c7", | ||
| 946 | - "X-MMM-Timestamp": "1597203321900", | ||
| 947 | - "X-MMM-Uuid": "d9dd2745-dc4c-11ea-b086-e0d55e7159d5", | ||
| 948 | - "X-MMM-Version": "0.4.0", | ||
| 949 | - "Content-Length": "0" | ||
| 950 | -}</pre> | ||
| 951 | - | ||
| 952 | - </td> | ||
| 953 | - </tr> | ||
| 954 | - | ||
| 955 | - </table> | ||
| 956 | - </div> | ||
| 957 | - | ||
| 958 | - <h3>Response:</h3> | ||
| 959 | - <div style="overflow: auto"> | ||
| 960 | - <table> | ||
| 961 | - | ||
| 962 | - <tr> | ||
| 963 | - <th>ok</th> | ||
| 964 | - <td> | ||
| 965 | - | ||
| 966 | - True | ||
| 967 | - | ||
| 968 | - </td> | ||
| 969 | - </tr> | ||
| 970 | - | ||
| 971 | - <tr> | ||
| 972 | - <th>url</th> | ||
| 973 | - <td> | ||
| 974 | - | ||
| 975 | - http://mmm-partner-test.fjmaimaimai.com/v1/order/statistics | ||
| 976 | - | ||
| 977 | - </td> | ||
| 978 | - </tr> | ||
| 979 | - | ||
| 980 | - <tr> | ||
| 981 | - <th>status_code</th> | ||
| 982 | - <td> | ||
| 983 | - | ||
| 984 | - 200 | ||
| 985 | - | ||
| 986 | - </td> | ||
| 987 | - </tr> | ||
| 988 | - | ||
| 989 | - <tr> | ||
| 990 | - <th>reason</th> | ||
| 991 | - <td> | ||
| 992 | - | ||
| 993 | - OK | ||
| 994 | - | ||
| 995 | - </td> | ||
| 996 | - </tr> | ||
| 997 | - | ||
| 998 | - <tr> | ||
| 999 | - <th>cookies</th> | ||
| 1000 | - <td> | ||
| 1001 | - | ||
| 1002 | - {} | ||
| 1003 | - | ||
| 1004 | - </td> | ||
| 1005 | - </tr> | ||
| 1006 | - | ||
| 1007 | - <tr> | ||
| 1008 | - <th>encoding</th> | ||
| 1009 | - <td> | ||
| 1010 | - | ||
| 1011 | - utf-8 | ||
| 1012 | - | ||
| 1013 | - </td> | ||
| 1014 | - </tr> | ||
| 1015 | - | ||
| 1016 | - <tr> | ||
| 1017 | - <th>headers</th> | ||
| 1018 | - <td> | ||
| 1019 | - | ||
| 1020 | - <pre>{ | ||
| 1021 | - "Date": "Wed, 12 Aug 2020 03:35:25 GMT", | ||
| 1022 | - "Content-Type": "application/json; charset=utf-8", | ||
| 1023 | - "Content-Length": "205", | ||
| 1024 | - "Connection": "keep-alive" | ||
| 1025 | -}</pre> | ||
| 1026 | - | ||
| 1027 | - </td> | ||
| 1028 | - </tr> | ||
| 1029 | - | ||
| 1030 | - <tr> | ||
| 1031 | - <th>content_type</th> | ||
| 1032 | - <td> | ||
| 1033 | - | ||
| 1034 | - application/json; charset=utf-8 | ||
| 1035 | - | ||
| 1036 | - </td> | ||
| 1037 | - </tr> | ||
| 1038 | - | ||
| 1039 | - <tr> | ||
| 1040 | - <th>body</th> | ||
| 1041 | - <td> | ||
| 1042 | - | ||
| 1043 | - | ||
| 1044 | - <pre>{ | ||
| 1045 | - "code": 0, | ||
| 1046 | - "msg": "成功", | ||
| 1047 | - "data": { | ||
| 1048 | - "statistics": { | ||
| 1049 | - "todayRealQuantity": 2, | ||
| 1050 | - "todayRealMoney": 17.86, | ||
| 1051 | - "cumulativeQuantity": 54, | ||
| 1052 | - "cumulativeMoney": 106734.62 | ||
| 1053 | - } | ||
| 1054 | - } | ||
| 1055 | -}</pre> | ||
| 1056 | - | ||
| 1057 | - | ||
| 1058 | - </td> | ||
| 1059 | - </tr> | ||
| 1060 | - | ||
| 1061 | - </table> | ||
| 1062 | - </div> | ||
| 1063 | - | ||
| 1064 | - | ||
| 1065 | - <h3>Validators:</h3> | ||
| 1066 | - <div style="overflow: auto"> | ||
| 1067 | - | ||
| 1068 | - | ||
| 1069 | - <table> | ||
| 1070 | - <tr> | ||
| 1071 | - <th>check</th> | ||
| 1072 | - <th>comparator</th> | ||
| 1073 | - <th>expect value</th> | ||
| 1074 | - <th>actual value</th> | ||
| 1075 | - </tr> | ||
| 1076 | - | ||
| 1077 | - <tr> | ||
| 1078 | - | ||
| 1079 | - <td class="passed"> | ||
| 1080 | - | ||
| 1081 | - content.msg | ||
| 1082 | - </td> | ||
| 1083 | - <td>equals</td> | ||
| 1084 | - <td>成功</td> | ||
| 1085 | - <td>成功</td> | ||
| 1086 | - </tr> | ||
| 1087 | - | ||
| 1088 | - <tr> | ||
| 1089 | - | ||
| 1090 | - <td class="passed"> | ||
| 1091 | - | ||
| 1092 | - content.data.statistics.cumulativeMoney | ||
| 1093 | - </td> | ||
| 1094 | - <td>equals</td> | ||
| 1095 | - <td>106734.62</td> | ||
| 1096 | - <td>106734.62</td> | ||
| 1097 | - </tr> | ||
| 1098 | - | ||
| 1099 | - <tr> | ||
| 1100 | - | ||
| 1101 | - <td class="passed"> | ||
| 1102 | - | ||
| 1103 | - content.data.statistics.cumulativeQuantity | ||
| 1104 | - </td> | ||
| 1105 | - <td>equals</td> | ||
| 1106 | - <td>54</td> | ||
| 1107 | - <td>54</td> | ||
| 1108 | - </tr> | ||
| 1109 | - | ||
| 1110 | - <tr> | ||
| 1111 | - | ||
| 1112 | - <td class="passed"> | ||
| 1113 | - | ||
| 1114 | - content.data.statistics.todayRealMoney | ||
| 1115 | - </td> | ||
| 1116 | - <td>equals</td> | ||
| 1117 | - <td>17.86</td> | ||
| 1118 | - <td>17.86</td> | ||
| 1119 | - </tr> | ||
| 1120 | - | ||
| 1121 | - <tr> | ||
| 1122 | - | ||
| 1123 | - <td class="passed"> | ||
| 1124 | - | ||
| 1125 | - content.data.statistics.todayRealQuantity | ||
| 1126 | - </td> | ||
| 1127 | - <td>equals</td> | ||
| 1128 | - <td>2</td> | ||
| 1129 | - <td>2</td> | ||
| 1130 | - </tr> | ||
| 1131 | - | ||
| 1132 | - </table> | ||
| 1133 | - | ||
| 1134 | - | ||
| 1135 | - | ||
| 1136 | - | ||
| 1137 | - </div> | ||
| 1138 | - | ||
| 1139 | - <h3>Statistics:</h3> | ||
| 1140 | - <div style="overflow: auto"> | ||
| 1141 | - <table> | ||
| 1142 | - <tr> | ||
| 1143 | - <th>content_size(bytes)</th> | ||
| 1144 | - <td>205</td> | ||
| 1145 | - </tr> | ||
| 1146 | - <tr> | ||
| 1147 | - <th>response_time(ms)</th> | ||
| 1148 | - <td>29.0</td> | ||
| 1149 | - </tr> | ||
| 1150 | - <tr> | ||
| 1151 | - <th>elapsed(ms)</th> | ||
| 1152 | - <td>27.183</td> | ||
| 1153 | - </tr> | ||
| 1154 | - </table> | ||
| 1155 | - </div> | ||
| 1156 | - | ||
| 1157 | - </div> | ||
| 1158 | - </div> | ||
| 1159 | - </div> | ||
| 1160 | - | ||
| 1161 | - | ||
| 1162 | - | ||
| 1163 | - | ||
| 1164 | - </td> | ||
| 1165 | - </tr> | ||
| 1166 | - | ||
| 1167 | - </table> | ||
| 1168 | - | ||
| 1169 | -</body> |
| 1 | -config: | ||
| 2 | - name: 编辑实际订单 | ||
| 3 | - base_url: ${ENV(base_manager_url)} | ||
| 4 | - variables: | ||
| 5 | - phone: ${get_admin_account_from_database(admin_user)} | ||
| 6 | - teardown_hooks: | ||
| 7 | - - ${sleep(2)} | ||
| 8 | - | ||
| 9 | -teststeps: | ||
| 10 | -- name: $phone 登录系统 | ||
| 11 | - testcase: testcases/m_login_testcases.yml | ||
| 12 | - | ||
| 13 | -- name: $phone 编辑实际订单 | ||
| 14 | - api: api/m_api/actual/m_edit_order_actual_api.yml | ||
| 15 | - validate: | ||
| 16 | - - eq: | ||
| 17 | - - content.msg | ||
| 18 | - - ok |
| @@ -2,9 +2,11 @@ config: | @@ -2,9 +2,11 @@ config: | ||
| 2 | name: 已收明细——分红订单 | 2 | name: 已收明细——分红订单 |
| 3 | base_url: ${ENV(base_manager_url)} | 3 | base_url: ${ENV(base_manager_url)} |
| 4 | variables: | 4 | variables: |
| 5 | - phone: ${get_partner_account_from_database(partner_info)} | ||
| 6 | - received: ${get_received_from_database()} | ||
| 7 | - outstanding: ${get_outstanding_from_database()} | 5 | + phone: ${get_partner_account_from_database()} |
| 6 | + order_code: ${get_detailAction_0_order_code_from_database()} | ||
| 7 | + plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()} | ||
| 8 | + use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} | ||
| 9 | + msg: 成功 | ||
| 8 | teardown_hooks: | 10 | teardown_hooks: |
| 9 | - ${sleep(3)} | 11 | - ${sleep(3)} |
| 10 | 12 | ||
| @@ -18,3 +20,12 @@ teststeps: | @@ -18,3 +20,12 @@ teststeps: | ||
| 18 | - eq: | 20 | - eq: |
| 19 | - content.msg | 21 | - content.msg |
| 20 | - $msg | 22 | - $msg |
| 23 | + - eq: | ||
| 24 | + - content.data.list.0.deliveryNo | ||
| 25 | + - $order_code | ||
| 26 | + - eq: | ||
| 27 | + - content.data.list.0.orderAmount | ||
| 28 | + - $plan_order_amount | ||
| 29 | + - eq: | ||
| 30 | + - content.data.list.0.dividendReceivable | ||
| 31 | + - $use_partner_bonus |
| @@ -2,9 +2,11 @@ config: | @@ -2,9 +2,11 @@ config: | ||
| 2 | name: 未收明细——分红订单 | 2 | name: 未收明细——分红订单 |
| 3 | base_url: ${ENV(base_manager_url)} | 3 | base_url: ${ENV(base_manager_url)} |
| 4 | variables: | 4 | variables: |
| 5 | - phone: ${get_partner_account_from_database(partner_info)} | ||
| 6 | - received: ${get_received_from_database()} | ||
| 7 | - outstanding: ${get_outstanding_from_database()} | 5 | + phone: ${get_partner_account_from_database()} |
| 6 | + order_code: ${get_detailAction_0_order_code_from_database()} | ||
| 7 | + plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()} | ||
| 8 | + use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} | ||
| 9 | + msg: 成功 | ||
| 8 | teardown_hooks: | 10 | teardown_hooks: |
| 9 | - ${sleep(3)} | 11 | - ${sleep(3)} |
| 10 | 12 | ||
| @@ -18,3 +20,12 @@ teststeps: | @@ -18,3 +20,12 @@ teststeps: | ||
| 18 | - eq: | 20 | - eq: |
| 19 | - content.msg | 21 | - content.msg |
| 20 | - $msg | 22 | - $msg |
| 23 | + - eq: | ||
| 24 | + - content.data.list.0.deliveryNo | ||
| 25 | + - $order_code | ||
| 26 | + - eq: | ||
| 27 | + - content.data.list.0.orderAmount | ||
| 28 | + - $plan_order_amount | ||
| 29 | + - eq: | ||
| 30 | + - content.data.list.0.dividendReceivable | ||
| 31 | + - $use_partner_bonus |
| @@ -2,9 +2,11 @@ config: | @@ -2,9 +2,11 @@ config: | ||
| 2 | name: 分红统计 | 2 | name: 分红统计 |
| 3 | base_url: ${ENV(base_manager_url)} | 3 | base_url: ${ENV(base_manager_url)} |
| 4 | variables: | 4 | variables: |
| 5 | - phone: ${get_partner_account_from_database(partner_info)} | 5 | + phone: ${get_partner_account_from_database()} |
| 6 | + receivable: ${get_receivable_from_database()} | ||
| 6 | received: ${get_received_from_database()} | 7 | received: ${get_received_from_database()} |
| 7 | outstanding: ${get_outstanding_from_database()} | 8 | outstanding: ${get_outstanding_from_database()} |
| 9 | + msg: 成功 | ||
| 8 | teardown_hooks: | 10 | teardown_hooks: |
| 9 | - ${sleep(3)} | 11 | - ${sleep(3)} |
| 10 | 12 | ||
| @@ -18,9 +20,15 @@ teststeps: | @@ -18,9 +20,15 @@ teststeps: | ||
| 18 | - eq: | 20 | - eq: |
| 19 | - content.msg | 21 | - content.msg |
| 20 | - $msg | 22 | - $msg |
| 23 | + | ||
| 24 | + - eq: | ||
| 25 | + - content.data.statistics.receivable | ||
| 26 | + - $receivable | ||
| 27 | + | ||
| 21 | - eq: | 28 | - eq: |
| 22 | - - content.data.statistics.received | 29 | + - content.data.statistics.quarters.1.received |
| 23 | - $received | 30 | - $received |
| 31 | + | ||
| 24 | - eq: | 32 | - eq: |
| 25 | - - content.data.statistics.outstanding | 33 | + - content.data.statistics.quarters.1.outstanding |
| 26 | - $outstanding | 34 | - $outstanding |
| @@ -2,7 +2,8 @@ config: | @@ -2,7 +2,8 @@ config: | ||
| 2 | name: 实发订单列表 | 2 | name: 实发订单列表 |
| 3 | base_url: ${ENV(base_manager_url)} | 3 | base_url: ${ENV(base_manager_url)} |
| 4 | variables: | 4 | variables: |
| 5 | - phone: ${get_partner_account_from_database(partner_info)} | 5 | + phone: ${get_partner_account_from_database()} |
| 6 | + total: ${get_total_from_database()} | ||
| 6 | msg: 成功 | 7 | msg: 成功 |
| 7 | teardown_hooks: | 8 | teardown_hooks: |
| 8 | - ${sleep(2)} | 9 | - ${sleep(2)} |
| @@ -16,4 +17,7 @@ teststeps: | @@ -16,4 +17,7 @@ teststeps: | ||
| 16 | validate: | 17 | validate: |
| 17 | - eq: | 18 | - eq: |
| 18 | - content.msg | 19 | - content.msg |
| 19 | - - $msg | ||
| 20 | + - $msg | ||
| 21 | + - eq: | ||
| 22 | + - content.data.total | ||
| 23 | + - $total |
不能预览此文件类型
| @@ -50,15 +50,12 @@ testcases: | @@ -50,15 +50,12 @@ testcases: | ||
| 50 | # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml | 50 | # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml |
| 51 | # parameters: | 51 | # parameters: |
| 52 | # account: ${create_phone_number(1)} | 52 | # account: ${create_phone_number(1)} |
| 53 | - | ||
| 54 | -#- name: ACTUAL002:编辑实际订单 | ||
| 55 | -# testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml | ||
| 56 | # | 53 | # |
| 57 | #- name: ACTUAL003:合伙人搜索——实际订单列表 | 54 | #- name: ACTUAL003:合伙人搜索——实际订单列表 |
| 58 | # testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml | 55 | # testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml |
| 59 | # | 56 | # |
| 60 | -#- name: ACTUAL004:搜索订单号——实际订单列表 | ||
| 61 | -# testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml | 57 | +- name: ACTUAL004:搜索订单号——实际订单列表 |
| 58 | + testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml | ||
| 62 | # | 59 | # |
| 63 | #- name: ACTUAL005:查看实际订单详情 | 60 | #- name: ACTUAL005:查看实际订单详情 |
| 64 | # testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml | 61 | # testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml |
| @@ -83,8 +80,8 @@ testcases: | @@ -83,8 +80,8 @@ testcases: | ||
| 83 | #- name: PURPOSE006:查看意向订单详情 | 80 | #- name: PURPOSE006:查看意向订单详情 |
| 84 | # testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml | 81 | # testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml |
| 85 | 82 | ||
| 86 | -- name: statistics:订单统计 | ||
| 87 | - testcase: testcases/order/order_statistics_testcases.yml | 83 | +#- name: statistics:订单统计 |
| 84 | +# testcase: testcases/order/order_statistics_testcases.yml | ||
| 88 | 85 | ||
| 89 | #- name: statistics:订单详情 | 86 | #- name: statistics:订单详情 |
| 90 | # testcase: testcases/order/order_details_testcases.yml | 87 | # testcase: testcases/order/order_details_testcases.yml |
-
请 注册 或 登录 后发表评论