bianxinhua / partner_api · 提交

转到一个项目

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

add README

内嵌 并排对比
正在显示 19 个修改的文件 包含 236 行增加 和 144 行删除
@@ -2,20 +2,21 @@ @@ -2,20 +2,21 @@
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_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" /> 5 + <change afterPath="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" afterDir="false" />
9 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 7 <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/order/list_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" afterDir="false" /> 8 <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" />
  9 + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" afterDir="false" />
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" />
15 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 16 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.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" /> 17 <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_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" 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" /> 18 + <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" afterDir="false" />
19 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 20 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
20 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 21 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
21 </list> 22 </list>
@@ -26,27 +27,30 @@ @@ -26,27 +27,30 @@
26 <option name="LAST_RESOLUTION" value="IGNORE" /> 27 <option name="LAST_RESOLUTION" value="IGNORE" />
27 </component> 28 </component>
28 <component name="CoverageDataManager"> 29 <component name="CoverageDataManager">
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" /> 30 + <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595000563833" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  31 + <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1595001825451" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
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" /> 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" />
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" /> 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" />
33 </component> 34 </component>
34 <component name="FileEditorManager"> 35 <component name="FileEditorManager">
35 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 36 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
36 - <file pinned="false" current-in-tab="true"> 37 + <file pinned="false" current-in-tab="false">
37 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 38 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
38 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
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" /> 40 + <state relative-caret-position="26">
  41 + <caret line="47" selection-start-line="47" selection-end-line="47" />
41 </state> 42 </state>
42 </provider> 43 </provider>
43 </entry> 44 </entry>
44 </file> 45 </file>
45 - <file pinned="false" current-in-tab="false">  
46 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 46 + <file pinned="false" current-in-tab="true">
  47 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
47 <provider selected="true" editor-type-id="text-editor"> 48 <provider selected="true" editor-type-id="text-editor">
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" /> 49 + <state relative-caret-position="358">
  50 + <caret line="326" lean-forward="true" selection-start-line="326" selection-end-line="326" />
  51 + <folding>
  52 + <element signature="e#108#123#0" expanded="true" />
  53 + </folding>
50 </state> 54 </state>
51 </provider> 55 </provider>
52 </entry> 56 </entry>
@@ -54,51 +58,24 @@ @@ -54,51 +58,24 @@
54 <file pinned="false" current-in-tab="false"> 58 <file pinned="false" current-in-tab="false">
55 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 59 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
56 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
57 - <state relative-caret-position="72">  
58 - <caret line="22" selection-start-line="22" selection-end-line="26" />  
59 - </state>  
60 - </provider>  
61 - </entry>  
62 - </file>  
63 - <file pinned="false" current-in-tab="false">  
64 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">  
65 - <provider selected="true" editor-type-id="text-editor">  
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" />  
68 - </state>  
69 - </provider>  
70 - </entry>  
71 - </file>  
72 - <file pinned="false" current-in-tab="false">  
73 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">  
74 - <provider selected="true" editor-type-id="text-editor">  
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" /> 61 + <state relative-caret-position="213">
  62 + <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
77 </state> 63 </state>
78 </provider> 64 </provider>
79 </entry> 65 </entry>
80 </file> 66 </file>
81 <file pinned="false" current-in-tab="false"> 67 <file pinned="false" current-in-tab="false">
82 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 68 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
83 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
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" /> 70 + <state relative-caret-position="199">
  71 + <caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
86 <folding> 72 <folding>
87 - <element signature="e#108#123#0" expanded="true" /> 73 + <element signature="e#0#13#0" expanded="true" />
88 </folding> 74 </folding>
89 </state> 75 </state>
90 </provider> 76 </provider>
91 </entry> 77 </entry>
92 </file> 78 </file>
93 - <file pinned="false" current-in-tab="false">  
94 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">  
95 - <provider selected="true" editor-type-id="text-editor">  
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" />  
98 - </state>  
99 - </provider>  
100 - </entry>  
101 - </file>  
102 </leaf> 79 </leaf>
103 </component> 80 </component>
104 <component name="FileTemplateManagerImpl"> 81 <component name="FileTemplateManagerImpl">
@@ -120,8 +97,8 @@ @@ -120,8 +97,8 @@
120 <find>partShipmentQuantity</find> 97 <find>partShipmentQuantity</find>
121 <find>cumulativeQuantity</find> 98 <find>cumulativeQuantity</find>
122 <find>allShipmentQuantity</find> 99 <find>allShipmentQuantity</find>
123 - <find>allShipmentQuantity</find>  
124 <find>get_allShipmentQuantity_from_database</find> 100 <find>get_allShipmentQuantity_from_database</find>
  101 + <find>intentionQuantity</find>
125 </findStrings> 102 </findStrings>
126 </component> 103 </component>
127 <component name="Git.Settings"> 104 <component name="Git.Settings">
@@ -130,10 +107,6 @@ @@ -130,10 +107,6 @@
130 <component name="IdeDocumentHistory"> 107 <component name="IdeDocumentHistory">
131 <option name="CHANGED_PATHS"> 108 <option name="CHANGED_PATHS">
132 <list> 109 <list>
133 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />  
134 - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />  
135 - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />  
136 - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" />  
137 <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" /> 110 <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
138 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" /> 111 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
139 <option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" /> 112 <option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" />
@@ -172,15 +145,19 @@ @@ -172,15 +145,19 @@
172 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> 145 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
173 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" /> 146 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
174 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 147 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
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" /> 148 <option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />
177 - <option value="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" /> 149 + <option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />
  150 + <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
178 <option value="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" /> 151 <option value="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />
  152 + <option value="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />
  153 + <option value="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" />
179 <option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" /> 154 <option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />
180 - <option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" /> 155 + <option value="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" />
  156 + <option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" />
  157 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
  158 + <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
181 <option value="$PROJECT_DIR$/debugtalk.py" /> 159 <option value="$PROJECT_DIR$/debugtalk.py" />
182 <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" /> 160 <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
183 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
184 </list> 161 </list>
185 </option> 162 </option>
186 </component> 163 </component>
@@ -219,36 +196,37 @@ @@ -219,36 +196,37 @@
219 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 196 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
220 <item name="api" type="462c0819:PsiDirectoryNode" /> 197 <item name="api" type="462c0819:PsiDirectoryNode" />
221 <item name="app_api" type="462c0819:PsiDirectoryNode" /> 198 <item name="app_api" type="462c0819:PsiDirectoryNode" />
222 - <item name="order" type="462c0819:PsiDirectoryNode" /> 199 + <item name="login" type="462c0819:PsiDirectoryNode" />
223 </path> 200 </path>
224 <path> 201 <path>
225 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 202 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
226 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 203 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
227 <item name="api" type="462c0819:PsiDirectoryNode" /> 204 <item name="api" type="462c0819:PsiDirectoryNode" />
228 - <item name="m_api" type="462c0819:PsiDirectoryNode" /> 205 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  206 + <item name="order" type="462c0819:PsiDirectoryNode" />
229 </path> 207 </path>
230 <path> 208 <path>
231 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 209 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
232 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 210 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
233 <item name="api" type="462c0819:PsiDirectoryNode" /> 211 <item name="api" type="462c0819:PsiDirectoryNode" />
234 <item name="m_api" type="462c0819:PsiDirectoryNode" /> 212 <item name="m_api" type="462c0819:PsiDirectoryNode" />
235 - <item name="actual" type="462c0819:PsiDirectoryNode" />  
236 </path> 213 </path>
237 <path> 214 <path>
238 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 215 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
239 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 216 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
240 - <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> 217 + <item name="api" type="462c0819:PsiDirectoryNode" />
  218 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  219 + <item name="actual" type="462c0819:PsiDirectoryNode" />
241 </path> 220 </path>
242 <path> 221 <path>
243 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 222 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
244 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 223 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
245 - <item name="testcases" type="462c0819:PsiDirectoryNode" /> 224 + <item name="helpfunc" type="462c0819:PsiDirectoryNode" />
246 </path> 225 </path>
247 <path> 226 <path>
248 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 227 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
249 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 228 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
250 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 229 <item name="testcases" type="462c0819:PsiDirectoryNode" />
251 - <item name="actual" type="462c0819:PsiDirectoryNode" />  
252 </path> 230 </path>
253 <path> 231 <path>
254 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 232 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -275,6 +253,10 @@ @@ -275,6 +253,10 @@
275 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 253 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
276 </component> 254 </component>
277 <component name="RecentsManager"> 255 <component name="RecentsManager">
  256 + <key name="MoveFile.RECENT_KEYS">
  257 + <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
  258 + <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
  259 + </key>
278 <key name="CopyFile.RECENT_KEYS"> 260 <key name="CopyFile.RECENT_KEYS">
279 <recent name="E:\mmm_auto\partner_api\testcases\order" /> 261 <recent name="E:\mmm_auto\partner_api\testcases\order" />
280 <recent name="E:\mmm_auto\partner_api\api\app_api\order" /> 262 <recent name="E:\mmm_auto\partner_api\api\app_api\order" />
@@ -282,10 +264,6 @@ @@ -282,10 +264,6 @@
282 <recent name="E:\mmm_auto\partner_api\testcases\purpose" /> 264 <recent name="E:\mmm_auto\partner_api\testcases\purpose" />
283 <recent name="E:\mmm_auto\partner_api\testcases\actual" /> 265 <recent name="E:\mmm_auto\partner_api\testcases\actual" />
284 </key> 266 </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>  
289 </component> 267 </component>
290 <component name="RunDashboard"> 268 <component name="RunDashboard">
291 <option name="ruleStates"> 269 <option name="ruleStates">
@@ -421,20 +399,22 @@ @@ -421,20 +399,22 @@
421 <workItem from="1594781185636" duration="15342000" /> 399 <workItem from="1594781185636" duration="15342000" />
422 <workItem from="1594868693482" duration="7846000" /> 400 <workItem from="1594868693482" duration="7846000" />
423 <workItem from="1594914151652" duration="1652000" /> 401 <workItem from="1594914151652" duration="1652000" />
  402 + <workItem from="1594948652577" duration="13932000" />
424 </task> 403 </task>
425 <servers /> 404 <servers />
426 </component> 405 </component>
427 <component name="TimeTrackingManager"> 406 <component name="TimeTrackingManager">
428 - <option name="totallyTimeSpent" value="100046000" /> 407 + <option name="totallyTimeSpent" value="113978000" />
429 </component> 408 </component>
430 <component name="ToolWindowManager"> 409 <component name="ToolWindowManager">
431 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 410 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
  411 + <editor active="true" />
432 <layout> 412 <layout>
433 <window_info id="Favorites" order="0" side_tool="true" /> 413 <window_info id="Favorites" order="0" side_tool="true" />
434 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.31164902" /> 414 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.3161876" />
435 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 415 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
436 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 416 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
437 - <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" /> 417 + <window_info anchor="bottom" id="Terminal" order="1" weight="0.44974446" />
438 <window_info anchor="bottom" id="Message" order="2" /> 418 <window_info anchor="bottom" id="Message" order="2" />
439 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> 419 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
440 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" /> 420 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
@@ -457,20 +437,6 @@ @@ -457,20 +437,6 @@
457 <option name="version" value="1" /> 437 <option name="version" value="1" />
458 </component> 438 </component>
459 <component name="editorHistoryManager"> 439 <component name="editorHistoryManager">
460 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml">  
461 - <provider selected="true" editor-type-id="text-editor">  
462 - <state relative-caret-position="88">  
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/partners/PARTNERS001_add_partner_testcases.yml">  
468 - <provider selected="true" editor-type-id="text-editor">  
469 - <state relative-caret-position="88">  
470 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
471 - </state>  
472 - </provider>  
473 - </entry>  
474 <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml"> 440 <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
475 <provider selected="true" editor-type-id="text-editor"> 441 <provider selected="true" editor-type-id="text-editor">
476 <state relative-caret-position="88"> 442 <state relative-caret-position="88">
@@ -681,13 +647,6 @@ @@ -681,13 +647,6 @@
681 </state> 647 </state>
682 </provider> 648 </provider>
683 </entry> 649 </entry>
684 - <entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">  
685 - <provider selected="true" editor-type-id="text-editor">  
686 - <state relative-caret-position="528">  
687 - <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />  
688 - </state>  
689 - </provider>  
690 - </entry>  
691 <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 650 <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
692 <provider selected="true" editor-type-id="text-editor"> 651 <provider selected="true" editor-type-id="text-editor">
693 <state relative-caret-position="-462"> 652 <state relative-caret-position="-462">
@@ -737,86 +696,107 @@ @@ -737,86 +696,107 @@
737 </state> 696 </state>
738 </provider> 697 </provider>
739 </entry> 698 </entry>
740 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml"> 699 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml">
741 <provider selected="true" editor-type-id="text-editor"> 700 <provider selected="true" editor-type-id="text-editor">
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" /> 701 + <state relative-caret-position="198">
  702 + <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
744 </state> 703 </state>
745 </provider> 704 </provider>
746 </entry> 705 </entry>
747 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml"> 706 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
748 <provider selected="true" editor-type-id="text-editor"> 707 <provider selected="true" editor-type-id="text-editor">
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" /> 708 + <state relative-caret-position="506">
  709 + <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
751 </state> 710 </state>
752 </provider> 711 </provider>
753 </entry> 712 </entry>
754 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml"> 713 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">
755 <provider selected="true" editor-type-id="text-editor"> 714 <provider selected="true" editor-type-id="text-editor">
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" /> 715 + <state relative-caret-position="66">
  716 + <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
758 </state> 717 </state>
759 </provider> 718 </provider>
760 </entry> 719 </entry>
761 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml"> 720 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">
762 <provider selected="true" editor-type-id="text-editor"> 721 <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" /> 722 + <state relative-caret-position="44">
  723 + <caret line="2" selection-start-line="2" selection-end-line="3" selection-end-column="18" />
765 </state> 724 </state>
766 </provider> 725 </provider>
767 </entry> 726 </entry>
768 <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml"> 727 <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml">
769 <provider selected="true" editor-type-id="text-editor"> 728 <provider selected="true" editor-type-id="text-editor">
  729 + <state relative-caret-position="176">
  730 + <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
  731 + </state>
  732 + </provider>
  733 + </entry>
  734 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
  735 + <provider selected="true" editor-type-id="text-editor">
770 <state relative-caret-position="110"> 736 <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" /> 737 + <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="22" />
772 </state> 738 </state>
773 </provider> 739 </provider>
774 </entry> 740 </entry>
775 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 741 + <entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">
776 <provider selected="true" editor-type-id="text-editor"> 742 <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> 743 + <state relative-caret-position="594">
  744 + <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
782 </state> 745 </state>
783 </provider> 746 </provider>
784 </entry> 747 </entry>
785 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml"> 748 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
786 <provider selected="true" editor-type-id="text-editor"> 749 <provider selected="true" editor-type-id="text-editor">
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" /> 750 + <state relative-caret-position="66">
  751 + <caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
789 </state> 752 </state>
790 </provider> 753 </provider>
791 </entry> 754 </entry>
792 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 755 + <entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml">
793 <provider selected="true" editor-type-id="text-editor"> 756 <provider selected="true" editor-type-id="text-editor">
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>  
797 - <element signature="e#108#123#0" expanded="true" />  
798 - </folding> 757 + <state relative-caret-position="176">
  758 + <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
799 </state> 759 </state>
800 </provider> 760 </provider>
801 </entry> 761 </entry>
802 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 762 + <entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.yml">
803 <provider selected="true" editor-type-id="text-editor"> 763 <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" /> 764 + <state relative-caret-position="154">
  765 + <caret line="31" column="49" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="49" />
  766 + </state>
  767 + </provider>
  768 + </entry>
  769 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
  770 + <provider selected="true" editor-type-id="text-editor">
  771 + <state relative-caret-position="26">
  772 + <caret line="47" selection-start-line="47" selection-end-line="47" />
806 </state> 773 </state>
807 </provider> 774 </provider>
808 </entry> 775 </entry>
809 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 776 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
810 <provider selected="true" editor-type-id="text-editor"> 777 <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" /> 778 + <state relative-caret-position="213">
  779 + <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
813 </state> 780 </state>
814 </provider> 781 </provider>
815 </entry> 782 </entry>
816 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 783 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
817 <provider selected="true" editor-type-id="text-editor"> 784 <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" /> 785 + <state relative-caret-position="199">
  786 + <caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
  787 + <folding>
  788 + <element signature="e#0#13#0" expanded="true" />
  789 + </folding>
  790 + </state>
  791 + </provider>
  792 + </entry>
  793 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
  794 + <provider selected="true" editor-type-id="text-editor">
  795 + <state relative-caret-position="358">
  796 + <caret line="326" lean-forward="true" selection-start-line="326" selection-end-line="326" />
  797 + <folding>
  798 + <element signature="e#108#123#0" expanded="true" />
  799 + </folding>
820 </state> 800 </state>
821 </provider> 801 </provider>
822 </entry> 802 </entry>
  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 + intentionQuantity: ${get_intentionQuantity_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 + pageIndex: 0
  24 + pageSize: 20
  25 + method: POST
  26 + url: v1/order/intentions
  27 +validate:
  28 + - eq:
  29 + - content.msg
  30 + - $msg
  31 + - eq:
  32 + - content.data.statistics.intentionQuantity
  33 + - $intentionQuantity
1 name: 全部订单-实发订单列表 1 name: 全部订单-实发订单列表
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
  3 +teardown_hooks:
  4 + - ${sleep(10)}
3 variables: 5 variables:
4 currtime: ${make_time()} 6 currtime: ${make_time()}
5 uuid: ${make_uuid()} 7 uuid: ${make_uuid()}
1 name: 部分发货-实发订单列表 1 name: 部分发货-实发订单列表
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
  3 +teardown_hooks:
  4 + - ${sleep(10)}
3 variables: 5 variables:
4 currtime: ${make_time()} 6 currtime: ${make_time()}
5 uuid: ${make_uuid()} 7 uuid: ${make_uuid()}
1 name: 全部发货-实发订单列表 1 name: 全部发货-实发订单列表
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
  3 +teardown_hooks:
  4 + - ${sleep(10)}
3 variables: 5 variables:
4 currtime: ${make_time()} 6 currtime: ${make_time()}
5 uuid: ${make_uuid()} 7 uuid: ${make_uuid()}
1 name: 实际订单新增 1 name: 实际订单新增
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
  3 +teardown_hooks:
  4 + - ${sleep(5)}
3 request: 5 request:
4 headers: 6 headers:
5 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
@@ -14,8 +16,8 @@ request: @@ -14,8 +16,8 @@ request:
14 salesmanRatio: 20.2 16 salesmanRatio: 20.2
15 orderId: ${get_nowtime()} 17 orderId: ${get_nowtime()}
16 orderName: ${get_nowtime()} 18 orderName: ${get_nowtime()}
17 - orderNum: 50  
18 - orderPrice: 100 19 + orderNum: 500
  20 + orderPrice: 1000000
19 orderDist: '福建一区' 21 orderDist: '福建一区'
20 orderStatue: 3 22 orderStatue: 3
21 method: POST 23 method: POST
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MjI4NTcsImlzcyI6Imp3dCJ9.6hBdA8s3julIsmqU93C_dTd43bXWl54bDIwrNjERuvs  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5NjM4NDAsImlzcyI6Imp3dCJ9.0vRdFJBZ-KAl4i6VfyveyWfSD77efIuNAeiQWp1rmTU
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5MTY1NTcsImlzcyI6Imp3dCJ9.4USIvY0TA3FIVBHKTIu9wT-ywMzoIj5adZYc4T3h1-Y  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTQ5NTc1NDAsImlzcyI6Imp3dCJ9.vviFgl2MmnN9J8q1swQcsMoe84XMLe4f0X5BfSTc_Oc
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ5NTg3NjgsImlhdCI6MTU5NDkxNTU2OCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDkxNTU2OCwidWlkIjoxOH0.Qy8wCF0KL4Z_5a_Hp6lrw2F_QIb98rsxqBCuqsPZRPg  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTUwNDAzOTQsImlhdCI6MTU5NDk5NzE5NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDk5NzE5NCwidWlkIjoxOH0.ytZZMcD5YPV2NwP51D1UpfbdWeGqETJ1BQ5Ii-hbV0Y
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc1MDc2NTcsImlzcyI6Imp3dCJ9.hxXuUiXJIMtPB1Ppfoy8u8Cw_8dJKqoKOzsl522WrXc  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTc1NDg2NDAsImlzcyI6Imp3dCJ9.DvDeRgMC2P6LDoCwBOXY6b5UvHy87dThhokOhK_rdrE
@@ -8,6 +8,7 @@ from helpfunc.header_func import * @@ -8,6 +8,7 @@ from helpfunc.header_func import *
8 from random import randint 8 from random import randint
9 from helpfunc.pg_app_db_func import * 9 from helpfunc.pg_app_db_func import *
10 from datetime import date, timedelta 10 from datetime import date, timedelta
  11 +import datetime
11 12
12 def sleep(n_secs): 13 def sleep(n_secs):
13 time.sleep(n_secs) 14 time.sleep(n_secs)
@@ -78,4 +79,17 @@ def get_starTimestamp(): @@ -78,4 +79,17 @@ def get_starTimestamp():
78 def get_endTimestamp(): 79 def get_endTimestamp():
79 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)
80 81
  82 +# def get_date_timestamp(date):
  83 +# return int(time.mktime(time.strptime(date, '%Y-%m-%d %H:%M:%S'))*1000)
81 84
  85 +import time
  86 +import datetime
  87 +
  88 +
  89 +def get_date_timestamp():
  90 + begin = int(time.mktime(time.strptime(f'{datetime.datetime.now().year}-01-01 0:0:0', '%Y-%m-%d %H:%M:%S'))*1000)
  91 + end = int(time.mktime(time.strptime(f'{datetime.datetime.now().year}-12-31 23:59:59', '%Y-%m-%d %H:%M:%S')))
  92 + return begin, end
  93 +
  94 +
  95 +print("{:.2f}".format(1/6))
@@ -273,7 +273,7 @@ def get_allShipmentQuantity_from_database(tbl): @@ -273,7 +273,7 @@ def get_allShipmentQuantity_from_database(tbl):
273 print(err) 273 print(err)
274 db.rollback() 274 db.rollback()
275 db.close() 275 db.close()
276 -print(get_allShipmentQuantity_from_database('order')) 276 +# print(get_allShipmentQuantity_from_database('order'))
277 #累计意向订单 277 #累计意向订单
278 def get_intentionQuantity_from_database(tbl): 278 def get_intentionQuantity_from_database(tbl):
279 db = GetConnect() 279 db = GetConnect()
@@ -290,6 +290,37 @@ def get_intentionQuantity_from_database(tbl): @@ -290,6 +290,37 @@ def get_intentionQuantity_from_database(tbl):
290 print(err) 290 print(err)
291 db.rollback() 291 db.rollback()
292 db.close() 292 db.close()
293 -  
294 -# print(get_intentionQuantity_from_database('order')) 293 +#累计所有年份未收分红
  294 +def get_outstanding_from_database(tbl):
  295 + db = GetConnect()
  296 + cursor = db.cursor()
  297 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  298 + sql = '''select COALESCE(sum(((order_actual_amount - order_payment_amount ) * partner_bonus_percent)/100),0) as outstanding from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
  299 + # print(sql)
  300 + try:
  301 + cursor.execute(sql)
  302 + result = cursor.fetchone()
  303 + return round(result[0],2)
  304 + except Exception as err:
  305 + # 发生错误时回滚
  306 + print(err)
  307 + db.rollback()
  308 + db.close()
  309 +#累计所有年份已收分红
  310 +def get_received_from_database(tbl):
  311 + db = GetConnect()
  312 + cursor = db.cursor()
  313 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  314 + sql = '''select COALESCE(sum((order_payment_amount * partner_bonus_percent)/100),0) as received from \"{}\" where partner_id = {} and create_at between \'{}\' and \'{}\' '''.format(tbl,get_partner_id_from_database('partner_info'),get_starTimestamp(),get_endTimestamp())
  315 + # print(sql)
  316 + try:
  317 + cursor.execute(sql)
  318 + result = cursor.fetchone()
  319 + return round(result[0],2)
  320 + except Exception as err:
  321 + # 发生错误时回滚
  322 + print(err)
  323 + db.rollback()
  324 + db.close()
  325 +print(get_received_from_database('order'))
295 326
@@ -4,7 +4,7 @@ config: @@ -4,7 +4,7 @@ config:
4 variables: 4 variables:
5 phone: ${get_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 teardown_hooks: 6 teardown_hooks:
7 - - ${sleep(2)} 7 + - ${sleep(10)}
8 8
9 teststeps: 9 teststeps:
10 - name: $phone 登录系统 10 - name: $phone 登录系统
  1 +config:
  2 + name: 意向订单列表
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_partner_account_from_database(partner_info)}
  6 + intentionQuantity: ${get_intentionQuantity_from_database(order)}
  7 + msg: 成功
  8 + teardown_hooks:
  9 + - ${sleep(10)}
  10 +
  11 +teststeps:
  12 +- name: $phone 登录系统
  13 + testcase: testcases/login_testcases.yml
  14 +
  15 +- name: $phone 订单统计
  16 + api: api/app_api/order/intentions_api.yml
  17 + validate:
  18 + - eq:
  19 + - content.msg
  20 + - $msg
  21 + - eq:
  22 + - content.data.statistics.intentionQuantity
  23 + - $intentionQuantity
@@ -6,7 +6,7 @@ config: @@ -6,7 +6,7 @@ config:
6 allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)} 6 allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}
7 msg: 成功 7 msg: 成功
8 teardown_hooks: 8 teardown_hooks:
9 - - ${sleep(2)} 9 + - ${sleep(10)}
10 10
11 teststeps: 11 teststeps:
12 - name: $phone 登录系统 12 - name: $phone 登录系统
@@ -46,10 +46,10 @@ testcases: @@ -46,10 +46,10 @@ testcases:
46 #- name: PARTNERS006：启用合伙人 46 #- name: PARTNERS006：启用合伙人
47 # testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml 47 # testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
48 # 48 #
49 -#- name: ACTUAL001：新增实际订单  
50 -# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml  
51 -# parameters:  
52 -# account: ${create_phone_number(1)} 49 +- name: ACTUAL001：新增实际订单
  50 + testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
  51 + parameters:
  52 + account: ${create_phone_number(1)}
53 # 53 #
54 #- name: ACTUAL002：编辑实际订单 54 #- name: ACTUAL002：编辑实际订单
55 # testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml 55 # testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
@@ -92,5 +92,8 @@ testcases: @@ -92,5 +92,8 @@ testcases:
92 #- name: list_1：部分发货-实发订单列表 92 #- name: list_1：部分发货-实发订单列表
93 # testcase: testcases/order/order_list_1_testcases.yml 93 # testcase: testcases/order/order_list_1_testcases.yml
94 94
95 -- name: list_2：全部发货-实发订单列表  
96 - testcase: testcases/order/order_list_2_testcases.yml  
  95 +#- name: list_2：全部发货-实发订单列表
  96 +# testcase: testcases/order/order_list_2_testcases.yml
  97 +
  98 +#- name: intentions：意向订单列表
  99 +# testcase: testcases/order/order_intentions_testcases.yml