bianxinhua / partner_api · 提交

转到一个项目

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

add README

内嵌 并排对比
正在显示 19 个修改的文件 包含 411 行增加 和 153 行删除
@@ -2,13 +2,12 @@ @@ -2,13 +2,12 @@
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$/api/app_api/order/list_0_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" /> 5 + <change afterPath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" afterDir="false" />
  8 + <change afterPath="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" afterDir="false" />
9 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10 - <change beforePath="$PROJECT_DIR$/api/app_api/accessToken_api.yml" beforeDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/api/app_api/login_api.yml" beforeDir="false" /> 10 + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" afterDir="false" />
12 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" /> 12 <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
14 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
@@ -16,7 +15,7 @@ @@ -16,7 +15,7 @@
16 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 15 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.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$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" />
18 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" /> 17 <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$/testcases/login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/login_testcases.yml" afterDir="false" /> 18 + <change beforePath="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" afterDir="false" />
20 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 19 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
21 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 20 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
22 </list> 21 </list>
@@ -27,78 +26,75 @@ @@ -27,78 +26,75 @@
27 <option name="LAST_RESOLUTION" value="IGNORE" /> 26 <option name="LAST_RESOLUTION" value="IGNORE" />
28 </component> 27 </component>
29 <component name="CoverageDataManager"> 28 <component name="CoverageDataManager">
30 - <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594810655333" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />  
31 - <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1594801138165" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 29 + <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594915080159" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  30 + <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1594915424465" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
32 <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" /> 31 <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" />
33 <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594826376790" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 32 <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594826376790" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
34 </component> 33 </component>
35 <component name="FileEditorManager"> 34 <component name="FileEditorManager">
36 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 35 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
37 - <file pinned="false" current-in-tab="false"> 36 + <file pinned="false" current-in-tab="true">
38 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 37 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
39 <provider selected="true" editor-type-id="text-editor"> 38 <provider selected="true" editor-type-id="text-editor">
40 - <state relative-caret-position="268">  
41 - <caret line="90" column="56" selection-start-line="90" selection-start-column="56" selection-end-line="90" selection-end-column="56" /> 39 + <state relative-caret-position="1056">
  40 + <caret line="48" selection-start-line="48" selection-start-column="1" selection-end-line="51" selection-end-column="43" />
42 </state> 41 </state>
43 </provider> 42 </provider>
44 </entry> 43 </entry>
45 </file> 44 </file>
46 <file pinned="false" current-in-tab="false"> 45 <file pinned="false" current-in-tab="false">
47 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 46 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
48 <provider selected="true" editor-type-id="text-editor"> 47 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="147">  
50 - <caret line="74" column="20" selection-start-line="74" selection-start-column="4" selection-end-line="74" selection-end-column="20" />  
51 - <folding>  
52 - <element signature="e#0#13#0" expanded="true" />  
53 - </folding> 48 + <state relative-caret-position="44">
  49 + <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
54 </state> 50 </state>
55 </provider> 51 </provider>
56 </entry> 52 </entry>
57 </file> 53 </file>
58 <file pinned="false" current-in-tab="false"> 54 <file pinned="false" current-in-tab="false">
59 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml"> 55 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
60 <provider selected="true" editor-type-id="text-editor"> 56 <provider selected="true" editor-type-id="text-editor">
61 - <state relative-caret-position="66">  
62 - <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" /> 57 + <state relative-caret-position="72">
  58 + <caret line="22" selection-start-line="22" selection-end-line="26" />
63 </state> 59 </state>
64 </provider> 60 </provider>
65 </entry> 61 </entry>
66 </file> 62 </file>
67 <file pinned="false" current-in-tab="false"> 63 <file pinned="false" current-in-tab="false">
68 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 64 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">
69 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
70 - <state relative-caret-position="213">  
71 - <caret line="390" column="36" selection-start-line="390" selection-start-column="6" selection-end-line="390" selection-end-column="36" /> 66 + <state relative-caret-position="-220">
  67 + <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
72 </state> 68 </state>
73 </provider> 69 </provider>
74 </entry> 70 </entry>
75 </file> 71 </file>
76 <file pinned="false" current-in-tab="false"> 72 <file pinned="false" current-in-tab="false">
77 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml"> 73 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
78 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
79 - <state relative-caret-position="176">  
80 - <caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" /> 75 + <state relative-caret-position="488">
  76 + <caret line="39" column="24" lean-forward="true" selection-start-line="39" selection-start-column="24" selection-end-line="39" selection-end-column="24" />
81 </state> 77 </state>
82 </provider> 78 </provider>
83 </entry> 79 </entry>
84 </file> 80 </file>
85 <file pinned="false" current-in-tab="false"> 81 <file pinned="false" current-in-tab="false">
86 - <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> 82 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
87 <provider selected="true" editor-type-id="text-editor"> 83 <provider selected="true" editor-type-id="text-editor">
88 - <state relative-caret-position="374">  
89 - <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" /> 84 + <state relative-caret-position="169">
  85 + <caret line="273" column="21" lean-forward="true" selection-start-line="273" selection-start-column="21" selection-end-line="273" selection-end-column="21" />
  86 + <folding>
  87 + <element signature="e#108#123#0" expanded="true" />
  88 + </folding>
90 </state> 89 </state>
91 </provider> 90 </provider>
92 </entry> 91 </entry>
93 </file> 92 </file>
94 - <file pinned="false" current-in-tab="true">  
95 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 93 + <file pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">
96 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
97 - <state relative-caret-position="136">  
98 - <caret line="180" column="21" selection-start-line="180" selection-start-column="21" selection-end-line="180" selection-end-column="21" />  
99 - <folding>  
100 - <element signature="e#108#123#0" expanded="true" />  
101 - </folding> 96 + <state relative-caret-position="532">
  97 + <caret line="34" column="54" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="54" />
102 </state> 98 </state>
103 </provider> 99 </provider>
104 </entry> 100 </entry>
@@ -115,12 +111,17 @@ @@ -115,12 +111,17 @@
115 <component name="FindInProjectRecents"> 111 <component name="FindInProjectRecents">
116 <findStrings> 112 <findStrings>
117 <find>今日新增意向订单</find> 113 <find>今日新增意向订单</find>
118 - <find>todayIntentionMoney</find>  
119 <find>todayRealQuantity</find> 114 <find>todayRealQuantity</find>
120 <find>todayRealMoney</find> 115 <find>todayRealMoney</find>
121 - <find>cumulativeQuantity</find>  
122 <find>todayIntentionQuantity</find> 116 <find>todayIntentionQuantity</find>
123 <find>cumulativeMoney</find> 117 <find>cumulativeMoney</find>
  118 + <find>todayIntentionMoney</find>
  119 + <find>orderQuantity</find>
  120 + <find>partShipmentQuantity</find>
  121 + <find>cumulativeQuantity</find>
  122 + <find>allShipmentQuantity</find>
  123 + <find>allShipmentQuantity</find>
  124 + <find>get_allShipmentQuantity_from_database</find>
124 </findStrings> 125 </findStrings>
125 </component> 126 </component>
126 <component name="Git.Settings"> 127 <component name="Git.Settings">
@@ -129,10 +130,6 @@ @@ -129,10 +130,6 @@
129 <component name="IdeDocumentHistory"> 130 <component name="IdeDocumentHistory">
130 <option name="CHANGED_PATHS"> 131 <option name="CHANGED_PATHS">
131 <list> 132 <list>
132 - <option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />  
133 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_api.yml" />  
134 - <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />  
135 - <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />  
136 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" /> 133 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
137 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" /> 134 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
138 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" /> 135 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />
@@ -173,13 +170,17 @@ @@ -173,13 +170,17 @@
173 <option value="$PROJECT_DIR$/api/app_api/login/accessToken_api.yml" /> 170 <option value="$PROJECT_DIR$/api/app_api/login/accessToken_api.yml" />
174 <option value="$PROJECT_DIR$/testcases/login_testcases.yml" /> 171 <option value="$PROJECT_DIR$/testcases/login_testcases.yml" />
175 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> 172 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
176 - <option value="$PROJECT_DIR$/debugtalk.py" />  
177 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
178 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" /> 173 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
179 - <option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />  
180 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 174 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
181 <option value="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" /> 175 <option value="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" />
  176 + <option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />
  177 + <option value="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />
  178 + <option value="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />
  179 + <option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />
  180 + <option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />
  181 + <option value="$PROJECT_DIR$/debugtalk.py" />
182 <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" /> 182 <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
  183 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
183 </list> 184 </list>
184 </option> 185 </option>
185 </component> 186 </component>
@@ -194,6 +195,7 @@ @@ -194,6 +195,7 @@
194 <foldersAlwaysOnTop value="true" /> 195 <foldersAlwaysOnTop value="true" />
195 </navigator> 196 </navigator>
196 <panes> 197 <panes>
  198 + <pane id="Scope" />
197 <pane id="ProjectPane"> 199 <pane id="ProjectPane">
198 <subPane> 200 <subPane>
199 <expand> 201 <expand>
@@ -222,6 +224,19 @@ @@ -222,6 +224,19 @@
222 <path> 224 <path>
223 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 225 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
224 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 226 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  227 + <item name="api" type="462c0819:PsiDirectoryNode" />
  228 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  229 + </path>
  230 + <path>
  231 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  232 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  233 + <item name="api" type="462c0819:PsiDirectoryNode" />
  234 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  235 + <item name="actual" type="462c0819:PsiDirectoryNode" />
  236 + </path>
  237 + <path>
  238 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  239 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
225 <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> 240 <item name="helpfunc" type="462c0819:PsiDirectoryNode" />
226 </path> 241 </path>
227 <path> 242 <path>
@@ -233,6 +248,12 @@ @@ -233,6 +248,12 @@
233 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 248 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
234 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 249 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
235 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 250 <item name="testcases" type="462c0819:PsiDirectoryNode" />
  251 + <item name="actual" type="462c0819:PsiDirectoryNode" />
  252 + </path>
  253 + <path>
  254 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  255 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  256 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
236 <item name="order" type="462c0819:PsiDirectoryNode" /> 257 <item name="order" type="462c0819:PsiDirectoryNode" />
237 </path> 258 </path>
238 <path> 259 <path>
@@ -244,7 +265,6 @@ @@ -244,7 +265,6 @@
244 <select /> 265 <select />
245 </subPane> 266 </subPane>
246 </pane> 267 </pane>
247 - <pane id="Scope" />  
248 </panes> 268 </panes>
249 </component> 269 </component>
250 <component name="PropertiesComponent"> 270 <component name="PropertiesComponent">
@@ -255,10 +275,6 @@ @@ -255,10 +275,6 @@
255 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 275 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
256 </component> 276 </component>
257 <component name="RecentsManager"> 277 <component name="RecentsManager">
258 - <key name="MoveFile.RECENT_KEYS">  
259 - <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />  
260 - <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />  
261 - </key>  
262 <key name="CopyFile.RECENT_KEYS"> 278 <key name="CopyFile.RECENT_KEYS">
263 <recent name="E:\mmm_auto\partner_api\testcases\order" /> 279 <recent name="E:\mmm_auto\partner_api\testcases\order" />
264 <recent name="E:\mmm_auto\partner_api\api\app_api\order" /> 280 <recent name="E:\mmm_auto\partner_api\api\app_api\order" />
@@ -266,6 +282,10 @@ @@ -266,6 +282,10 @@
266 <recent name="E:\mmm_auto\partner_api\testcases\purpose" /> 282 <recent name="E:\mmm_auto\partner_api\testcases\purpose" />
267 <recent name="E:\mmm_auto\partner_api\testcases\actual" /> 283 <recent name="E:\mmm_auto\partner_api\testcases\actual" />
268 </key> 284 </key>
  285 + <key name="MoveFile.RECENT_KEYS">
  286 + <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
  287 + <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
  288 + </key>
269 </component> 289 </component>
270 <component name="RunDashboard"> 290 <component name="RunDashboard">
271 <option name="ruleStates"> 291 <option name="ruleStates">
@@ -279,7 +299,7 @@ @@ -279,7 +299,7 @@
279 </list> 299 </list>
280 </option> 300 </option>
281 </component> 301 </component>
282 - <component name="RunManager" selected="Python.pg_db_func"> 302 + <component name="RunManager" selected="Python.pg_app_db_func">
283 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 303 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
284 <module name="partner_api" /> 304 <module name="partner_api" />
285 <option name="INTERPRETER_OPTIONS" value="" /> 305 <option name="INTERPRETER_OPTIONS" value="" />
@@ -370,9 +390,9 @@ @@ -370,9 +390,9 @@
370 </configuration> 390 </configuration>
371 <recent_temporary> 391 <recent_temporary>
372 <list> 392 <list>
373 - <item itemvalue="Python.pg_db_func" />  
374 - <item itemvalue="Python.debugtalk" />  
375 <item itemvalue="Python.pg_app_db_func" /> 393 <item itemvalue="Python.pg_app_db_func" />
  394 + <item itemvalue="Python.debugtalk" />
  395 + <item itemvalue="Python.pg_db_func" />
376 <item itemvalue="Python.db_pg_func" /> 396 <item itemvalue="Python.db_pg_func" />
377 </list> 397 </list>
378 </recent_temporary> 398 </recent_temporary>
@@ -398,28 +418,29 @@ @@ -398,28 +418,29 @@
398 <workItem from="1594565757545" duration="5110000" /> 418 <workItem from="1594565757545" duration="5110000" />
399 <workItem from="1594608711608" duration="14402000" /> 419 <workItem from="1594608711608" duration="14402000" />
400 <workItem from="1594710916949" duration="12278000" /> 420 <workItem from="1594710916949" duration="12278000" />
401 - <workItem from="1594781185636" duration="14441000" /> 421 + <workItem from="1594781185636" duration="15342000" />
  422 + <workItem from="1594868693482" duration="7846000" />
  423 + <workItem from="1594914151652" duration="1652000" />
402 </task> 424 </task>
403 <servers /> 425 <servers />
404 </component> 426 </component>
405 <component name="TimeTrackingManager"> 427 <component name="TimeTrackingManager">
406 - <option name="totallyTimeSpent" value="89647000" /> 428 + <option name="totallyTimeSpent" value="100046000" />
407 </component> 429 </component>
408 <component name="ToolWindowManager"> 430 <component name="ToolWindowManager">
409 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 431 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
410 - <editor active="true" />  
411 <layout> 432 <layout>
412 <window_info id="Favorites" order="0" side_tool="true" /> 433 <window_info id="Favorites" order="0" side_tool="true" />
413 - <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.30257186" /> 434 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.31164902" />
414 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 435 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
415 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 436 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
416 - <window_info anchor="bottom" id="Terminal" order="1" weight="0.42078364" /> 437 + <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" />
417 <window_info anchor="bottom" id="Message" order="2" /> 438 <window_info anchor="bottom" id="Message" order="2" />
418 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> 439 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
419 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" /> 440 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
420 <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" /> 441 <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" />
421 <window_info anchor="bottom" id="Database Changes" order="6" /> 442 <window_info anchor="bottom" id="Database Changes" order="6" />
422 - <window_info anchor="bottom" id="Run" order="7" visible="true" weight="0.3270869" /> 443 + <window_info anchor="bottom" id="Run" order="7" weight="0.3270869" />
423 <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" /> 444 <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" />
424 <window_info anchor="bottom" id="Debug" order="9" weight="0.4" /> 445 <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
425 <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" /> 446 <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
@@ -436,34 +457,6 @@ @@ -436,34 +457,6 @@
436 <option name="version" value="1" /> 457 <option name="version" value="1" />
437 </component> 458 </component>
438 <component name="editorHistoryManager"> 459 <component name="editorHistoryManager">
439 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">  
440 - <provider selected="true" editor-type-id="text-editor">  
441 - <state relative-caret-position="50">  
442 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
443 - </state>  
444 - </provider>  
445 - </entry>  
446 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">  
447 - <provider selected="true" editor-type-id="text-editor">  
448 - <state relative-caret-position="88">  
449 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
450 - </state>  
451 - </provider>  
452 - </entry>  
453 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">  
454 - <provider selected="true" editor-type-id="text-editor">  
455 - <state relative-caret-position="88">  
456 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
457 - </state>  
458 - </provider>  
459 - </entry>  
460 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">  
461 - <provider selected="true" editor-type-id="text-editor">  
462 - <state relative-caret-position="22">  
463 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
464 - </state>  
465 - </provider>  
466 - </entry>  
467 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml"> 460 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml">
468 <provider selected="true" editor-type-id="text-editor"> 461 <provider selected="true" editor-type-id="text-editor">
469 <state relative-caret-position="88"> 462 <state relative-caret-position="88">
@@ -541,13 +534,6 @@ @@ -541,13 +534,6 @@
541 </state> 534 </state>
542 </provider> 535 </provider>
543 </entry> 536 </entry>
544 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">  
545 - <provider selected="true" editor-type-id="text-editor">  
546 - <state relative-caret-position="484">  
547 - <caret line="22" selection-start-line="22" selection-end-line="26" />  
548 - </state>  
549 - </provider>  
550 - </entry>  
551 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml"> 537 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
552 <provider selected="true" editor-type-id="text-editor"> 538 <provider selected="true" editor-type-id="text-editor">
553 <state> 539 <state>
@@ -562,13 +548,6 @@ @@ -562,13 +548,6 @@
562 </state> 548 </state>
563 </provider> 549 </provider>
564 </entry> 550 </entry>
565 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">  
566 - <provider selected="true" editor-type-id="text-editor">  
567 - <state relative-caret-position="176">  
568 - <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />  
569 - </state>  
570 - </provider>  
571 - </entry>  
572 <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml"> 551 <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml">
573 <provider selected="true" editor-type-id="text-editor"> 552 <provider selected="true" editor-type-id="text-editor">
574 <state relative-caret-position="88"> 553 <state relative-caret-position="88">
@@ -730,74 +709,116 @@ @@ -730,74 +709,116 @@
730 </state> 709 </state>
731 </provider> 710 </provider>
732 </entry> 711 </entry>
733 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 712 + <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
734 <provider selected="true" editor-type-id="text-editor"> 713 <provider selected="true" editor-type-id="text-editor">
735 - <state relative-caret-position="147">  
736 - <caret line="74" column="20" selection-start-line="74" selection-start-column="4" selection-end-line="74" selection-end-column="20" />  
737 - <folding>  
738 - <element signature="e#0#13#0" expanded="true" />  
739 - </folding> 714 + <state relative-caret-position="-88">
  715 + <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
740 </state> 716 </state>
741 </provider> 717 </provider>
742 </entry> 718 </entry>
743 - <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml"> 719 + <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml">
744 <provider selected="true" editor-type-id="text-editor"> 720 <provider selected="true" editor-type-id="text-editor">
745 - <state relative-caret-position="-88">  
746 - <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" /> 721 + <state relative-caret-position="110">
  722 + <caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="42" />
747 </state> 723 </state>
748 </provider> 724 </provider>
749 </entry> 725 </entry>
750 <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> 726 <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml">
751 <provider selected="true" editor-type-id="text-editor"> 727 <provider selected="true" editor-type-id="text-editor">
752 - <state relative-caret-position="374"> 728 + <state relative-caret-position="301">
753 <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" /> 729 <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
754 </state> 730 </state>
755 </provider> 731 </provider>
756 </entry> 732 </entry>
757 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml"> 733 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
758 <provider selected="true" editor-type-id="text-editor"> 734 <provider selected="true" editor-type-id="text-editor">
759 - <state relative-caret-position="176">  
760 - <caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" /> 735 + <state relative-caret-position="3427">
  736 + <caret line="390" lean-forward="true" selection-start-line="390" selection-end-line="390" />
761 </state> 737 </state>
762 </provider> 738 </provider>
763 </entry> 739 </entry>
764 - <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml"> 740 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">
765 <provider selected="true" editor-type-id="text-editor"> 741 <provider selected="true" editor-type-id="text-editor">
766 - <state relative-caret-position="110">  
767 - <caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="42" /> 742 + <state relative-caret-position="-220">
  743 + <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
768 </state> 744 </state>
769 </provider> 745 </provider>
770 </entry> 746 </entry>
771 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 747 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
772 <provider selected="true" editor-type-id="text-editor"> 748 <provider selected="true" editor-type-id="text-editor">
773 - <state relative-caret-position="213">  
774 - <caret line="390" column="36" selection-start-line="390" selection-start-column="6" selection-end-line="390" selection-end-column="36" /> 749 + <state relative-caret-position="488">
  750 + <caret line="39" column="24" lean-forward="true" selection-start-line="39" selection-start-column="24" selection-end-line="39" selection-end-column="24" />
775 </state> 751 </state>
776 </provider> 752 </provider>
777 </entry> 753 </entry>
778 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml"> 754 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml">
779 <provider selected="true" editor-type-id="text-editor"> 755 <provider selected="true" editor-type-id="text-editor">
780 - <state relative-caret-position="66">  
781 - <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" /> 756 + <state relative-caret-position="198">
  757 + <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
782 </state> 758 </state>
783 </provider> 759 </provider>
784 </entry> 760 </entry>
785 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 761 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
  762 + <provider selected="true" editor-type-id="text-editor">
  763 + <state relative-caret-position="506">
  764 + <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
  765 + </state>
  766 + </provider>
  767 + </entry>
  768 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml">
  769 + <provider selected="true" editor-type-id="text-editor">
  770 + <state relative-caret-position="110">
  771 + <caret line="5" column="68" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="68" />
  772 + </state>
  773 + </provider>
  774 + </entry>
  775 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
  776 + <provider selected="true" editor-type-id="text-editor">
  777 + <state relative-caret-position="235">
  778 + <caret line="48" column="23" selection-start-line="48" selection-start-column="23" selection-end-line="48" selection-end-column="23" />
  779 + <folding>
  780 + <element signature="e#0#13#0" expanded="true" />
  781 + </folding>
  782 + </state>
  783 + </provider>
  784 + </entry>
  785 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">
786 <provider selected="true" editor-type-id="text-editor"> 786 <provider selected="true" editor-type-id="text-editor">
787 - <state relative-caret-position="268">  
788 - <caret line="90" column="56" selection-start-line="90" selection-start-column="56" selection-end-line="90" selection-end-column="56" /> 787 + <state relative-caret-position="532">
  788 + <caret line="34" column="54" selection-start-line="34" selection-start-column="34" selection-end-line="34" selection-end-column="54" />
789 </state> 789 </state>
790 </provider> 790 </provider>
791 </entry> 791 </entry>
792 <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 792 <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
793 <provider selected="true" editor-type-id="text-editor"> 793 <provider selected="true" editor-type-id="text-editor">
794 - <state relative-caret-position="136">  
795 - <caret line="180" column="21" selection-start-line="180" selection-start-column="21" selection-end-line="180" selection-end-column="21" /> 794 + <state relative-caret-position="169">
  795 + <caret line="273" column="21" lean-forward="true" selection-start-line="273" selection-start-column="21" selection-end-line="273" selection-end-column="21" />
796 <folding> 796 <folding>
797 <element signature="e#108#123#0" expanded="true" /> 797 <element signature="e#108#123#0" expanded="true" />
798 </folding> 798 </folding>
799 </state> 799 </state>
800 </provider> 800 </provider>
801 </entry> 801 </entry>
  802 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
  803 + <provider selected="true" editor-type-id="text-editor">
  804 + <state relative-caret-position="44">
  805 + <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
  806 + </state>
  807 + </provider>
  808 + </entry>
  809 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
  810 + <provider selected="true" editor-type-id="text-editor">
  811 + <state relative-caret-position="72">
  812 + <caret line="22" selection-start-line="22" selection-end-line="26" />
  813 + </state>
  814 + </provider>
  815 + </entry>
  816 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
  817 + <provider selected="true" editor-type-id="text-editor">
  818 + <state relative-caret-position="1056">
  819 + <caret line="48" selection-start-line="48" selection-start-column="1" selection-end-line="51" selection-end-column="43" />
  820 + </state>
  821 + </provider>
  822 + </entry>
802 </component> 823 </component>
803 </project> 824 </project>
@@ -5,9 +5,8 @@ variables: @@ -5,9 +5,8 @@ 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 - id: ${get_actual_id_from_database(order)}  
9 - orderNo: ${get_actual_orderId_from_database(order)}  
10 - orderStatus: ${get_order_status_from_database(order)} 8 + cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}
  9 + orderQuantity: ${get_orderQuantity_from_database(order)}
11 msg: 成功 10 msg: 成功
12 request: 11 request:
13 headers: 12 headers:
@@ -33,3 +32,9 @@ validate: @@ -33,3 +32,9 @@ validate:
33 - eq: 32 - eq:
34 - content.msg 33 - content.msg
35 - $msg 34 - $msg
  35 + - eq:
  36 + - content.data.statistics.cumulativeQuantity
  37 + - $cumulativeQuantity
  38 + - eq:
  39 + - content.data.statistics.orderQuantity
  40 + - $orderQuantity
  1 +name: 部分发货-实发订单列表
  2 +base_url: ${ENV(base_url)}
  3 +variables:
  4 + currtime: ${make_time()}
  5 + uuid: ${make_uuid()}
  6 + var_access_token: ${get_accesstoken()}
  7 + sign: ${make_sign($currtime, $uuid, $var_access_token)}
  8 + partShipmentQuantity: ${get_partShipmentQuantity_from_database(order)}
  9 + msg: 成功
  10 +request:
  11 + headers:
  12 + Content-Type: application/json;charset=utf-8
  13 + User-Agent: okhttp/3.12.3
  14 + X-MMM-AccessToken: $var_access_token
  15 + X-MMM-AppName: com.mmm.ability
  16 + X-MMM-AppProject: ability
  17 + X-MMM-DeviceType: '1'
  18 + X-MMM-Sign: $sign
  19 + X-MMM-Timestamp: $currtime
  20 + X-MMM-Uuid: $uuid
  21 + X-MMM-Version: 0.4.0
  22 + json:
  23 + orderAction: 1
  24 + pageIndex: 0
  25 + startTime: ${get_starTimestamp()}
  26 + pageSize: 20
  27 + endTime: ${get_endTimestamp()}
  28 + method: POST
  29 + url: v1/order/list
  30 +validate:
  31 + - eq:
  32 + - content.msg
  33 + - $msg
  34 + - eq:
  35 + - content.data.statistics.partShipmentQuantity
  36 + - $partShipmentQuantity
  1 +name: 全部发货-实发订单列表
  2 +base_url: ${ENV(base_url)}
  3 +variables:
  4 + currtime: ${make_time()}
  5 + uuid: ${make_uuid()}
  6 + var_access_token: ${get_accesstoken()}
  7 + sign: ${make_sign($currtime, $uuid, $var_access_token)}
  8 + allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}
  9 + msg: 成功
  10 +request:
  11 + headers:
  12 + Content-Type: application/json;charset=utf-8
  13 + User-Agent: okhttp/3.12.3
  14 + X-MMM-AccessToken: $var_access_token
  15 + X-MMM-AppName: com.mmm.ability
  16 + X-MMM-AppProject: ability
  17 + X-MMM-DeviceType: '1'
  18 + X-MMM-Sign: $sign
  19 + X-MMM-Timestamp: $currtime
  20 + X-MMM-Uuid: $uuid
  21 + X-MMM-Version: 0.4.0
  22 + json:
  23 + orderAction: 2
  24 + pageIndex: 0
  25 + startTime: ${get_starTimestamp()}
  26 + pageSize: 20
  27 + endTime: ${get_endTimestamp()}
  28 + method: POST
  29 + url: v1/order/list
  30 +validate:
  31 + - eq:
  32 + - content.msg
  33 + - $msg
  34 + - eq:
  35 + - content.data.statistics.allShipmentQuantity
  36 + - $allShipmentQuantity
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ4MzI5NzEsImlzcyI6Imp3dCJ9.yioVEjZs7VoHzFFW573tMs-ZIYUc2ocTZN4bFsrbhV0  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MjI4NTcsImlzcyI6Imp3dCJ9.6hBdA8s3julIsmqU93C_dTd43bXWl54bDIwrNjERuvs
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ4MjY2NzEsImlzcyI6Imp3dCJ9.DFikxWqRmmEiN_Db1bOVgfkdOBKaAHwcLol3Ig6jJBY  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MTY1NTcsImlzcyI6Imp3dCJ9.4USIvY0TA3FIVBHKTIu9wT-ywMzoIj5adZYc4T3h1-Y
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ4Njg5MTEsImlhdCI6MTU5NDgyNTcxMSwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDgyNTcxMSwidWlkIjoxOH0.cYpLfuPmOkj46VUyocuwxii7LPc3YlkEKqcuciUX_sA  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ5NTg3NjgsImlhdCI6MTU5NDkxNTU2OCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDkxNTU2OCwidWlkIjoxOH0.Qy8wCF0KL4Z_5a_Hp6lrw2F_QIb98rsxqBCuqsPZRPg
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc0MTc3NzEsImlzcyI6Imp3dCJ9.rrZJntWukDoJkrgAT6Kx564vlj9klwCLgb6R236_pTU  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc1MDc2NTcsImlzcyI6Imp3dCJ9.hxXuUiXJIMtPB1Ppfoy8u8Cw_8dJKqoKOzsl522WrXc
@@ -37,13 +37,16 @@ def create_channel(num): @@ -37,13 +37,16 @@ def create_channel(num):
37 channel.append(i) 37 channel.append(i)
38 return channel 38 return channel
39 39
  40 +def get_minute():
  41 + i = datetime.datetime.now()
  42 + return i.minute
  43 +
40 def create_phone_number(num): 44 def create_phone_number(num):
41 phone_number = [] 45 phone_number = []
42 for i in range(num): 46 for i in range(num):
43 number = random.randint(0,9) 47 number = random.randint(0,9)
44 - phone_number.append('1%d%d%08d'%(number,number+1,number+2)) 48 + phone_number.append('1%d%d%08d'%(get_minute(),number+1,number+2))
45 return phone_number 49 return phone_number
46 -  
47 def getMonth(): 50 def getMonth():
48 year = str(datetime.date.today().year) 51 year = str(datetime.date.today().year)
49 d = datetime.date.today() 52 d = datetime.date.today()
@@ -75,3 +78,4 @@ def get_starTimestamp(): @@ -75,3 +78,4 @@ def get_starTimestamp():
75 def get_endTimestamp(): 78 def get_endTimestamp():
76 return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000) 79 return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
77 80
  81 +
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 # @file: pg_db_func.py 5 # @file: pg_db_func.py
6 import psycopg2 6 import psycopg2
7 from datetime import date, timedelta 7 from datetime import date, timedelta
8 -import datetime 8 +import datetime,time
  9 +
9 10
10 def get_today(): 11 def get_today():
11 now_today = datetime.datetime.now() 12 now_today = datetime.datetime.now()
@@ -15,7 +16,36 @@ def get_today(): @@ -15,7 +16,36 @@ def get_today():
15 def get_tomorrow(): 16 def get_tomorrow():
16 tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d") 17 tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
17 return tomorrow 18 return tomorrow
18 - 19 +def getMonth():
  20 + year = str(datetime.date.today().year)
  21 + d = datetime.date.today()
  22 + month = '%02d' % d.month
  23 + if month in ['01', '03', '05', '07', '08', '10', '12']:
  24 + s = str("-01 00:00:00")
  25 + e = str("-31 23:59:59")
  26 + startTime = year + "-" + str(month) + s
  27 + endTime = year + "-" + str(month) + e
  28 + list = [startTime, endTime]
  29 + return list
  30 + elif month == '02':
  31 + s = str("-01 00:00:00")
  32 + e = str("-28 23:59:59")
  33 + startTime = year + "-" + str(month) + s
  34 + endTime = year + "-" + str(month) + e
  35 + list = [startTime, endTime]
  36 + return list
  37 + else:
  38 + s = str("-01 00:00:00")
  39 + e = str("-30 23:59:59")
  40 + startTime = year + "-" + str(month) + s
  41 + endTime = year + "-" + str(month) + e
  42 + list = [startTime, endTime]
  43 + return list
  44 +list_time = getMonth()
  45 +def get_starTimestamp():
  46 + return list_time[0]
  47 +def get_endTimestamp():
  48 + return list_time[1]
19 # 获得连接 49 # 获得连接
20 def GetConnect(): 50 def GetConnect():
21 conn = False 51 conn = False
@@ -115,7 +145,7 @@ def get_todayRealMoney_from_database(tbl): @@ -115,7 +145,7 @@ def get_todayRealMoney_from_database(tbl):
115 db = GetConnect() 145 db = GetConnect()
116 cursor = db.cursor() 146 cursor = db.cursor()
117 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 147 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
118 - sql = '''select sum(order_actual_amount) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (2,3) '''.format(tbl,get_today(),get_tomorrow()) 148 + sql = '''select COALESCE(sum(order_actual_amount),0) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (2,3) '''.format(tbl,get_today(),get_tomorrow())
119 # print(sql) 149 # print(sql)
120 try: 150 try:
121 cursor.execute(sql) 151 cursor.execute(sql)
@@ -149,7 +179,7 @@ def get_todayIntentionQuantity_from_database(tbl): @@ -149,7 +179,7 @@ def get_todayIntentionQuantity_from_database(tbl):
149 db = GetConnect() 179 db = GetConnect()
150 cursor = db.cursor() 180 cursor = db.cursor()
151 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 181 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
152 - sql = '''select COUNT(id) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow()) 182 + sql = '''select COUNT(id) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow())
153 # print(sql) 183 # print(sql)
154 try: 184 try:
155 cursor.execute(sql) 185 cursor.execute(sql)
@@ -166,7 +196,7 @@ def get_todayIntentionMoney_from_database(tbl): @@ -166,7 +196,7 @@ def get_todayIntentionMoney_from_database(tbl):
166 db = GetConnect() 196 db = GetConnect()
167 cursor = db.cursor() 197 cursor = db.cursor()
168 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 198 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
169 - sql = '''select sum(order_actual_amount) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow()) 199 + sql = '''select COALESCE(sum(order_actual_amount),0) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow())
170 # print(sql) 200 # print(sql)
171 try: 201 try:
172 cursor.execute(sql) 202 cursor.execute(sql)
@@ -182,7 +212,74 @@ def get_orderQuantity_from_database(tbl): @@ -182,7 +212,74 @@ def get_orderQuantity_from_database(tbl):
182 db = GetConnect() 212 db = GetConnect()
183 cursor = db.cursor() 213 cursor = db.cursor()
184 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 214 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
185 - sql = '''select COUNT(id) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow()) 215 + sql = '''select COUNT(id) from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' and order_type = 1 and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
  216 + # print(sql)
  217 + try:
  218 + cursor.execute(sql)
  219 + result = cursor.fetchone()
  220 + return int(result[0])
  221 + except Exception as err:
  222 + # 发生错误时回滚
  223 + print(err)
  224 + db.rollback()
  225 + db.close()
  226 +
  227 +#累计实发订单
  228 +def get_cumulativeQuantity_from_database(tbl):
  229 + db = GetConnect()
  230 + cursor = db.cursor()
  231 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  232 + sql = '''select COUNT(id) from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' and order_type = 1 and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
  233 + # print(sql)
  234 + try:
  235 + cursor.execute(sql)
  236 + result = cursor.fetchone()
  237 + return int(result[0])
  238 + except Exception as err:
  239 + # 发生错误时回滚
  240 + print(err)
  241 + db.rollback()
  242 + db.close()
  243 +
  244 +#部分发货的订单数量
  245 +def get_partShipmentQuantity_from_database(tbl):
  246 + db = GetConnect()
  247 + cursor = db.cursor()
  248 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  249 + 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())
  250 + # print(sql)
  251 + try:
  252 + cursor.execute(sql)
  253 + result = cursor.fetchone()
  254 + return int(result[0])
  255 + except Exception as err:
  256 + # 发生错误时回滚
  257 + print(err)
  258 + db.rollback()
  259 + db.close()
  260 +#全部发货的订单数量
  261 +def get_allShipmentQuantity_from_database(tbl):
  262 + db = GetConnect()
  263 + cursor = db.cursor()
  264 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  265 + 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())
  266 + print(sql)
  267 + try:
  268 + cursor.execute(sql)
  269 + result = cursor.fetchone()
  270 + return int(result[0])
  271 + except Exception as err:
  272 + # 发生错误时回滚
  273 + print(err)
  274 + db.rollback()
  275 + db.close()
  276 +print(get_allShipmentQuantity_from_database('order'))
  277 +#累计意向订单
  278 +def get_intentionQuantity_from_database(tbl):
  279 + db = GetConnect()
  280 + cursor = db.cursor()
  281 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  282 + sql = '''select COUNT(id) from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' and order_type = 2 '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
186 # print(sql) 283 # print(sql)
187 try: 284 try:
188 cursor.execute(sql) 285 cursor.execute(sql)
@@ -194,5 +291,5 @@ def get_orderQuantity_from_database(tbl): @@ -194,5 +291,5 @@ def get_orderQuantity_from_database(tbl):
194 db.rollback() 291 db.rollback()
195 db.close() 292 db.close()
196 293
197 -print(get_partner_account_from_database('partner_info')) 294 +# print(get_intentionQuantity_from_database('order'))
198 295
@@ -388,4 +388,4 @@ def get_purpose_orderName_from_database(tbl): @@ -388,4 +388,4 @@ def get_purpose_orderName_from_database(tbl):
388 db.rollback() 388 db.rollback()
389 db.close() 389 db.close()
390 390
391 -print(get_order_status_from_database('order'))  
  391 +# print(get_order_status_from_database('order'))
@@ -3,6 +3,8 @@ config: @@ -3,6 +3,8 @@ config:
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(partner_info)}
  6 + cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}
  7 + orderQuantity: ${get_orderQuantity_from_database(order)}
6 msg: 成功 8 msg: 成功
7 teardown_hooks: 9 teardown_hooks:
8 - ${sleep(2)} 10 - ${sleep(2)}
@@ -14,6 +16,12 @@ teststeps: @@ -14,6 +16,12 @@ teststeps:
14 - name: $phone 全部订单-实发订单列表 16 - name: $phone 全部订单-实发订单列表
15 api: api/app_api/order/list_0_api.yml 17 api: api/app_api/order/list_0_api.yml
16 validate: 18 validate:
17 - - eq:  
18 - - content.msg  
19 - - $msg  
  19 + - eq:
  20 + - content.msg
  21 + - $msg
  22 + - eq:
  23 + - content.data.statistics.cumulativeQuantity
  24 + - $cumulativeQuantity
  25 + - eq:
  26 + - content.data.statistics.orderQuantity
  27 + - $orderQuantity
  1 +config:
  2 + name: 部分发货-实发订单列表
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_partner_account_from_database(partner_info)}
  6 + partShipmentQuantity: ${get_partShipmentQuantity_from_database(order)}
  7 + msg: 成功
  8 + teardown_hooks:
  9 + - ${sleep(2)}
  10 +
  11 +teststeps:
  12 +- name: $phone 登录系统
  13 + testcase: testcases/login_testcases.yml
  14 +
  15 +- name: $phone 部分发货-实发订单列表
  16 + api: api/app_api/order/list_1_api.yml
  17 + validate:
  18 + - eq:
  19 + - content.msg
  20 + - $msg
  21 + - eq:
  22 + - content.data.statistics.partShipmentQuantity
  23 + - $partShipmentQuantity
  1 +config:
  2 + name: 全部发货-实发订单列表
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_partner_account_from_database(partner_info)}
  6 + allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}
  7 + msg: 成功
  8 + teardown_hooks:
  9 + - ${sleep(2)}
  10 +
  11 +teststeps:
  12 +- name: $phone 登录系统
  13 + testcase: testcases/login_testcases.yml
  14 +
  15 +- name: $phone 全部发货-实发订单列表
  16 + api: api/app_api/order/list_2_api.yml
  17 + validate:
  18 + - eq:
  19 + - content.msg
  20 + - $msg
  21 + - eq:
  22 + - content.data.statistics.allShipmentQuantity
  23 + - $allShipmentQuantity
1 1
2 config: 2 config:
3 name: 合伙人测试集 3 name: 合伙人测试集
4 -  
5 testcases: 4 testcases:
6 5
7 #- name: ADMIN001：新增管理员 6 #- name: ADMIN001：新增管理员
@@ -50,7 +49,7 @@ testcases: @@ -50,7 +49,7 @@ testcases:
50 #- name: ACTUAL001：新增实际订单 49 #- name: ACTUAL001：新增实际订单
51 # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml 50 # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
52 # parameters: 51 # parameters:
53 -# account: ${create_phone_number(3)} 52 +# account: ${create_phone_number(1)}
54 # 53 #
55 #- name: ACTUAL002：编辑实际订单 54 #- name: ACTUAL002：编辑实际订单
56 # testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml 55 # testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
@@ -87,5 +86,11 @@ testcases: @@ -87,5 +86,11 @@ testcases:
87 #- name: statistics：订单统计 86 #- name: statistics：订单统计
88 # testcase: testcases/order/order_statistics_testcases.yml 87 # testcase: testcases/order/order_statistics_testcases.yml
89 88
90 -- name: statistics：订单统计  
91 - testcase: testcases/order/order_list_0_testcases.yml  
  89 +#- name: list_0：全部订单-实发订单列表
  90 +# testcase: testcases/order/order_list_0_testcases.yml
  91 +
  92 +#- name: list_1：部分发货-实发订单列表
  93 +# testcase: testcases/order/order_list_1_testcases.yml
  94 +
  95 +- name: list_2：全部发货-实发订单列表
  96 + testcase: testcases/order/order_list_2_testcases.yml