bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 a7522acf641a63018df3334e3faa9dbe3343ac21 1 个父辈 48584692

add README

内嵌 并排对比
正在显示 21 个修改的文件 包含 421 行增加 和 465 行删除
@@ -2,14 +2,31 @@ @@ -2,14 +2,31 @@
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/dividend/statistics_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" afterDir="false" /> 5 + <change afterPath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/api/app_api/order/details_api.yml" afterDir="false" />
  8 + <change afterPath="$PROJECT_DIR$/api/app_api/order/list_api.yml" afterDir="false" />
  9 + <change afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" afterDir="false" />
  10 + <change afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" afterDir="false" />
  11 + <change afterPath="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" afterDir="false" />
  12 + <change afterPath="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" afterDir="false" />
7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8 - <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/config/refreshToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/refreshToken.csv" afterDir="false" /> 14 + <change beforePath="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" beforeDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" beforeDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" beforeDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" beforeDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 21 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
12 <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" /> 22 <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/testcases/login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/login_testcases.yml" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" beforeDir="false" />
  25 + <change beforePath="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" beforeDir="false" />
  26 + <change beforePath="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" beforeDir="false" />
  27 + <change beforePath="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" beforeDir="false" />
  28 + <change beforePath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" afterDir="false" />
  29 + <change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 30 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
14 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 31 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
15 </list> 32 </list>
@@ -20,60 +37,36 @@ @@ -20,60 +37,36 @@
20 <option name="LAST_RESOLUTION" value="IGNORE" /> 37 <option name="LAST_RESOLUTION" value="IGNORE" />
21 </component> 38 </component>
22 <component name="CoverageDataManager"> 39 <component name="CoverageDataManager">
23 - <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595174406299" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />  
24 - <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1595128904097" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 40 + <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1595408122991" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  41 + <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1595408745035" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
25 <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" /> 42 <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" />
26 <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" /> 43 <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" />
27 </component> 44 </component>
28 <component name="FileEditorManager"> 45 <component name="FileEditorManager">
29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 46 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30 - <file pinned="false" current-in-tab="false">  
31 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">  
32 - <provider selected="true" editor-type-id="text-editor">  
33 - <state relative-caret-position="127">  
34 - <caret line="101" column="32" selection-start-line="101" selection-start-column="32" selection-end-line="101" selection-end-column="32" />  
35 - </state>  
36 - </provider>  
37 - </entry>  
38 - </file>  
39 - <file pinned="false" current-in-tab="false">  
40 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">  
41 - <provider selected="true" editor-type-id="text-editor">  
42 - <state relative-caret-position="22">  
43 - <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />  
44 - <folding>  
45 - <element signature="e#108#123#0" expanded="true" />  
46 - </folding>  
47 - </state>  
48 - </provider>  
49 - </entry>  
50 - </file>  
51 <file pinned="false" current-in-tab="true"> 47 <file pinned="false" current-in-tab="true">
52 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 48 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
53 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
54 - <state relative-caret-position="155">  
55 - <caret line="86" lean-forward="true" selection-start-line="86" selection-end-line="86" />  
56 - <folding>  
57 - <element signature="e#0#13#0" expanded="true" />  
58 - </folding> 50 + <state relative-caret-position="141">
  51 + <caret line="80" column="73" selection-start-line="80" selection-start-column="73" selection-end-line="80" selection-end-column="73" />
59 </state> 52 </state>
60 </provider> 53 </provider>
61 </entry> 54 </entry>
62 </file> 55 </file>
63 <file pinned="false" current-in-tab="false"> 56 <file pinned="false" current-in-tab="false">
64 - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml"> 57 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
65 <provider selected="true" editor-type-id="text-editor"> 58 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="220">  
67 - <caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" /> 59 + <state relative-caret-position="374">
  60 + <caret line="17" column="29" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
68 </state> 61 </state>
69 </provider> 62 </provider>
70 </entry> 63 </entry>
71 </file> 64 </file>
72 <file pinned="false" current-in-tab="false"> 65 <file pinned="false" current-in-tab="false">
73 - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml"> 66 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">
74 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
75 - <state relative-caret-position="176">  
76 - <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> 68 + <state relative-caret-position="550">
  69 + <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="33" />
77 </state> 70 </state>
78 </provider> 71 </provider>
79 </entry> 72 </entry>
@@ -90,11 +83,7 @@ @@ -90,11 +83,7 @@
90 <component name="FindInProjectRecents"> 83 <component name="FindInProjectRecents">
91 <findStrings> 84 <findStrings>
92 <find>今日新增意向订单</find> 85 <find>今日新增意向订单</find>
93 - <find>todayRealQuantity</find>  
94 <find>todayRealMoney</find> 86 <find>todayRealMoney</find>
95 - <find>todayIntentionQuantity</find>  
96 - <find>cumulativeMoney</find>  
97 - <find>todayIntentionMoney</find>  
98 <find>orderQuantity</find> 87 <find>orderQuantity</find>
99 <find>partShipmentQuantity</find> 88 <find>partShipmentQuantity</find>
100 <find>cumulativeQuantity</find> 89 <find>cumulativeQuantity</find>
@@ -103,6 +92,12 @@ @@ -103,6 +92,12 @@
103 <find>intentionQuantity</find> 92 <find>intentionQuantity</find>
104 <find>received</find> 93 <find>received</find>
105 <find>outstanding</find> 94 <find>outstanding</find>
  95 + <find>ArgumentParser</find>
  96 + <find>todayRealQuantity</find>
  97 + <find>print(get_expend_from_database())</find>
  98 + <find>cumulativeMoney</find>
  99 + <find>todayIntentionMoney</find>
  100 + <find>todayIntentionQuantity</find>
106 </findStrings> 101 </findStrings>
107 </component> 102 </component>
108 <component name="Git.Settings"> 103 <component name="Git.Settings">
@@ -111,20 +106,8 @@ @@ -111,20 +106,8 @@
111 <component name="IdeDocumentHistory"> 106 <component name="IdeDocumentHistory">
112 <option name="CHANGED_PATHS"> 107 <option name="CHANGED_PATHS">
113 <list> 108 <list>
114 - <option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" />  
115 - <option value="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" />  
116 - <option value="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" />  
117 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" />  
118 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" />  
119 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" />  
120 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" />  
121 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" />  
122 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" />  
123 - <option value="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" />  
124 - <option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />  
125 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" /> 109 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
126 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" /> 110 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />
127 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />  
128 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml" /> 111 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml" />
129 <option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" /> 112 <option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />
130 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" /> 113 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
@@ -135,7 +118,6 @@ @@ -135,7 +118,6 @@
135 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" /> 118 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />
136 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" /> 119 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />
137 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" /> 120 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" />
138 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" />  
139 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" /> 121 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" />
140 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" /> 122 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" />
141 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" /> 123 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
@@ -143,9 +125,6 @@ @@ -143,9 +125,6 @@
143 <option value="$PROJECT_DIR$/.env" /> 125 <option value="$PROJECT_DIR$/.env" />
144 <option value="$PROJECT_DIR$/api/app_api/login/login_api.yml" /> 126 <option value="$PROJECT_DIR$/api/app_api/login/login_api.yml" />
145 <option value="$PROJECT_DIR$/api/app_api/login/accessToken_api.yml" /> 127 <option value="$PROJECT_DIR$/api/app_api/login/accessToken_api.yml" />
146 - <option value="$PROJECT_DIR$/testcases/login_testcases.yml" />  
147 - <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />  
148 - <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />  
149 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 128 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
150 <option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" /> 129 <option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />
151 <option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" /> 130 <option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />
@@ -158,10 +137,26 @@ @@ -158,10 +137,26 @@
158 <option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" /> 137 <option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" />
159 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" /> 138 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
160 <option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" /> 139 <option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" />
161 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
162 - <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />  
163 <option value="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" /> 140 <option value="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" />
164 <option value="$PROJECT_DIR$/debugtalk.py" /> 141 <option value="$PROJECT_DIR$/debugtalk.py" />
  142 + <option value="$PROJECT_DIR$/api/app_api/order/details_api.yml" />
  143 + <option value="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" />
  144 + <option value="$PROJECT_DIR$/api/app_api/user/userInfo_api.yml" />
  145 + <option value="$PROJECT_DIR$/testcases/user/user_userInfo_testcases.yml" />
  146 + <option value="$PROJECT_DIR$/testcases/login_testcases.yml" />
  147 + <option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" />
  148 + <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" />
  149 + <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />
  150 + <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" />
  151 + <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
  152 + <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
  153 + <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
  154 + <option value="$PROJECT_DIR$/api/app_api/order/list_api.yml" />
  155 + <option value="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" />
  156 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
  157 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" />
  158 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" />
  159 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
165 </list> 160 </list>
166 </option> 161 </option>
167 </component> 162 </component>
@@ -193,21 +188,14 @@ @@ -193,21 +188,14 @@
193 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 188 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
194 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 189 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
195 <item name="api" type="462c0819:PsiDirectoryNode" /> 190 <item name="api" type="462c0819:PsiDirectoryNode" />
196 - <item name="app_api" type="462c0819:PsiDirectoryNode" /> 191 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
197 </path> 192 </path>
198 <path> 193 <path>
199 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 194 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
200 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 195 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
201 <item name="api" type="462c0819:PsiDirectoryNode" /> 196 <item name="api" type="462c0819:PsiDirectoryNode" />
202 - <item name="app_api" type="462c0819:PsiDirectoryNode" />  
203 - <item name="login" type="462c0819:PsiDirectoryNode" />  
204 - </path>  
205 - <path>  
206 - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />  
207 - <item name="partner_api" type="462c0819:PsiDirectoryNode" />  
208 - <item name="api" type="462c0819:PsiDirectoryNode" />  
209 - <item name="app_api" type="462c0819:PsiDirectoryNode" />  
210 - <item name="order" type="462c0819:PsiDirectoryNode" /> 197 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  198 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
211 </path> 199 </path>
212 <path> 200 <path>
213 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 201 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -223,7 +211,7 @@ @@ -223,7 +211,7 @@
223 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 211 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
224 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 212 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
225 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 213 <item name="testcases" type="462c0819:PsiDirectoryNode" />
226 - <item name="order" type="462c0819:PsiDirectoryNode" /> 214 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
227 </path> 215 </path>
228 <path> 216 <path>
229 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 217 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -238,17 +226,17 @@ @@ -238,17 +226,17 @@
238 </component> 226 </component>
239 <component name="PropertiesComponent"> 227 <component name="PropertiesComponent">
240 <property name="WebServerToolWindowFactoryState" value="false" /> 228 <property name="WebServerToolWindowFactoryState" value="false" />
241 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 229 + <property name="last_opened_file_path" value="F:/myhrun" />
242 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 230 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
243 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 231 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
244 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 232 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
245 </component> 233 </component>
246 <component name="RecentsManager"> 234 <component name="RecentsManager">
247 <key name="CopyFile.RECENT_KEYS"> 235 <key name="CopyFile.RECENT_KEYS">
248 - <recent name="E:\mmm_auto\partner_api\testcases\dividend" />  
249 - <recent name="E:\mmm_auto\partner_api\api\app_api\dividend" />  
250 <recent name="E:\mmm_auto\partner_api\testcases\order" /> 236 <recent name="E:\mmm_auto\partner_api\testcases\order" />
251 <recent name="E:\mmm_auto\partner_api\api\app_api\order" /> 237 <recent name="E:\mmm_auto\partner_api\api\app_api\order" />
  238 + <recent name="E:\mmm_auto\partner_api\testcases\dividend" />
  239 + <recent name="E:\mmm_auto\partner_api\api\app_api\dividend" />
252 <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" /> 240 <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
253 </key> 241 </key>
254 <key name="MoveFile.RECENT_KEYS"> 242 <key name="MoveFile.RECENT_KEYS">
@@ -268,7 +256,7 @@ @@ -268,7 +256,7 @@
268 </list> 256 </list>
269 </option> 257 </option>
270 </component> 258 </component>
271 - <component name="RunManager" selected="Python.debugtalk"> 259 + <component name="RunManager" selected="Python.pg_app_db_func">
272 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 260 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
273 <module name="partner_api" /> 261 <module name="partner_api" />
274 <option name="INTERPRETER_OPTIONS" value="" /> 262 <option name="INTERPRETER_OPTIONS" value="" />
@@ -359,8 +347,8 @@ @@ -359,8 +347,8 @@
359 </configuration> 347 </configuration>
360 <recent_temporary> 348 <recent_temporary>
361 <list> 349 <list>
362 - <item itemvalue="Python.debugtalk" />  
363 <item itemvalue="Python.pg_app_db_func" /> 350 <item itemvalue="Python.pg_app_db_func" />
  351 + <item itemvalue="Python.debugtalk" />
364 <item itemvalue="Python.pg_db_func" /> 352 <item itemvalue="Python.pg_db_func" />
365 <item itemvalue="Python.db_pg_func" /> 353 <item itemvalue="Python.db_pg_func" />
366 </list> 354 </list>
@@ -394,28 +382,33 @@ @@ -394,28 +382,33 @@
394 <workItem from="1595040709032" duration="2762000" /> 382 <workItem from="1595040709032" duration="2762000" />
395 <workItem from="1595086198970" duration="85000" /> 383 <workItem from="1595086198970" duration="85000" />
396 <workItem from="1595128430644" duration="1114000" /> 384 <workItem from="1595128430644" duration="1114000" />
397 - <workItem from="1595171971122" duration="2398000" /> 385 + <workItem from="1595171971122" duration="3063000" />
  386 + <workItem from="1595213200195" duration="3779000" />
  387 + <workItem from="1595300184610" duration="597000" />
  388 + <workItem from="1595401180117" duration="2161000" />
  389 + <workItem from="1595917894201" duration="630000" />
  390 + <workItem from="1596008414671" duration="1359000" />
  391 + <workItem from="1596076314159" duration="9748000" />
398 </task> 392 </task>
399 <servers /> 393 <servers />
400 </component> 394 </component>
401 <component name="TimeTrackingManager"> 395 <component name="TimeTrackingManager">
402 - <option name="totallyTimeSpent" value="120337000" /> 396 + <option name="totallyTimeSpent" value="139276000" />
403 </component> 397 </component>
404 <component name="ToolWindowManager"> 398 <component name="ToolWindowManager">
405 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 399 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
406 - <editor active="true" />  
407 <layout> 400 <layout>
408 <window_info id="Favorites" order="0" side_tool="true" /> 401 <window_info id="Favorites" order="0" side_tool="true" />
409 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.33661118" /> 402 + <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.2624811" />
410 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 403 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
411 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 404 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
412 - <window_info anchor="bottom" id="Terminal" order="1" weight="0.44974446" /> 405 + <window_info anchor="bottom" id="Terminal" order="1" weight="0.28960818" />
413 <window_info anchor="bottom" id="Message" order="2" /> 406 <window_info anchor="bottom" id="Message" order="2" />
414 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> 407 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
415 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" /> 408 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
416 <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" /> 409 <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" />
417 <window_info anchor="bottom" id="Database Changes" order="6" /> 410 <window_info anchor="bottom" id="Database Changes" order="6" />
418 - <window_info active="true" anchor="bottom" id="Run" order="7" visible="true" weight="0.3270869" /> 411 + <window_info anchor="bottom" id="Run" order="7" weight="0.3270869" />
419 <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" /> 412 <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" />
420 <window_info anchor="bottom" id="Debug" order="9" weight="0.4" /> 413 <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
421 <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" /> 414 <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
@@ -432,366 +425,369 @@ @@ -432,366 +425,369 @@
432 <option name="version" value="1" /> 425 <option name="version" value="1" />
433 </component> 426 </component>
434 <component name="editorHistoryManager"> 427 <component name="editorHistoryManager">
435 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml"> 428 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
436 <provider selected="true" editor-type-id="text-editor"> 429 <provider selected="true" editor-type-id="text-editor">
437 <state relative-caret-position="88"> 430 <state relative-caret-position="88">
438 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" /> 431 + <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
439 </state> 432 </state>
440 </provider> 433 </provider>
441 </entry> 434 </entry>
442 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml"> 435 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
443 <provider selected="true" editor-type-id="text-editor"> 436 <provider selected="true" editor-type-id="text-editor">
444 - <state relative-caret-position="88">  
445 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" /> 437 + <state relative-caret-position="154">
  438 + <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
446 </state> 439 </state>
447 </provider> 440 </provider>
448 </entry> 441 </entry>
449 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml"> 442 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">
450 <provider selected="true" editor-type-id="text-editor"> 443 <provider selected="true" editor-type-id="text-editor">
451 - <state relative-caret-position="88">  
452 - <caret line="4" column="59" selection-start-line="4" selection-start-column="59" selection-end-line="4" selection-end-column="59" /> 444 + <state>
  445 + <caret line="3" column="57" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="57" />
453 </state> 446 </state>
454 </provider> 447 </provider>
455 </entry> 448 </entry>
456 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml"> 449 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
457 <provider selected="true" editor-type-id="text-editor"> 450 <provider selected="true" editor-type-id="text-editor">
458 - <state relative-caret-position="88">  
459 - <caret line="4" column="59" selection-start-line="4" selection-start-column="59" selection-end-line="4" selection-end-column="59" /> 451 + <state relative-caret-position="110">
  452 + <caret line="5" column="61" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="61" />
460 </state> 453 </state>
461 </provider> 454 </provider>
462 </entry> 455 </entry>
463 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml"> 456 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml">
464 <provider selected="true" editor-type-id="text-editor"> 457 <provider selected="true" editor-type-id="text-editor">
465 - <state relative-caret-position="66">  
466 - <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" /> 458 + <state relative-caret-position="110">
  459 + <caret line="14" column="67" selection-start-line="14" selection-start-column="67" selection-end-line="14" selection-end-column="67" />
467 </state> 460 </state>
468 </provider> 461 </provider>
469 </entry> 462 </entry>
470 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml"> 463 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
471 <provider selected="true" editor-type-id="text-editor"> 464 <provider selected="true" editor-type-id="text-editor">
472 - <state relative-caret-position="66">  
473 - <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" /> 465 + <state>
  466 + <caret column="6" selection-start-column="6" selection-end-column="19" />
474 </state> 467 </state>
475 </provider> 468 </provider>
476 </entry> 469 </entry>
477 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml"> 470 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
  471 + <provider selected="true" editor-type-id="text-editor">
  472 + <state relative-caret-position="246">
  473 + <caret line="34" lean-forward="true" selection-start-line="2" selection-end-line="34" />
  474 + </state>
  475 + </provider>
  476 + </entry>
  477 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml">
478 <provider selected="true" editor-type-id="text-editor"> 478 <provider selected="true" editor-type-id="text-editor">
479 <state relative-caret-position="66"> 479 <state relative-caret-position="66">
480 - <caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" /> 480 + <caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="27" />
481 </state> 481 </state>
482 </provider> 482 </provider>
483 </entry> 483 </entry>
484 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml"> 484 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml">
485 <provider selected="true" editor-type-id="text-editor"> 485 <provider selected="true" editor-type-id="text-editor">
486 <state> 486 <state>
487 - <caret column="6" selection-start-column="6" selection-end-column="19" /> 487 + <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="14" />
488 </state> 488 </state>
489 </provider> 489 </provider>
490 </entry> 490 </entry>
491 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> 491 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml">
492 <provider selected="true" editor-type-id="text-editor"> 492 <provider selected="true" editor-type-id="text-editor">
493 - <state relative-caret-position="88">  
494 - <caret line="4" column="50" selection-start-line="4" selection-start-column="50" selection-end-line="4" selection-end-column="50" /> 493 + <state relative-caret-position="176">
  494 + <caret line="14" column="58" selection-start-line="14" selection-start-column="58" selection-end-line="14" selection-end-column="58" />
495 </state> 495 </state>
496 </provider> 496 </provider>
497 </entry> 497 </entry>
498 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml"> 498 + <entry file="file://$PROJECT_DIR$/.env">
499 <provider selected="true" editor-type-id="text-editor"> 499 <provider selected="true" editor-type-id="text-editor">
500 - <state relative-caret-position="88">  
501 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" /> 500 + <state relative-caret-position="176">
  501 + <caret line="8" column="51" selection-start-line="8" selection-start-column="51" selection-end-line="8" selection-end-column="51" />
502 </state> 502 </state>
503 </provider> 503 </provider>
504 </entry> 504 </entry>
505 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml"> 505 + <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
506 <provider selected="true" editor-type-id="text-editor"> 506 <provider selected="true" editor-type-id="text-editor">
507 <state relative-caret-position="88"> 507 <state relative-caret-position="88">
508 <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" /> 508 <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
509 </state> 509 </state>
510 </provider> 510 </provider>
511 </entry> 511 </entry>
512 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml"> 512 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
513 <provider selected="true" editor-type-id="text-editor"> 513 <provider selected="true" editor-type-id="text-editor">
514 - <state relative-caret-position="242">  
515 - <caret line="14" column="65" selection-start-line="14" selection-start-column="65" selection-end-line="14" selection-end-column="65" /> 514 + <state relative-caret-position="-462">
  515 + <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
516 </state> 516 </state>
517 </provider> 517 </provider>
518 </entry> 518 </entry>
519 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml"> 519 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml">
520 <provider selected="true" editor-type-id="text-editor"> 520 <provider selected="true" editor-type-id="text-editor">
521 - <state relative-caret-position="374">  
522 - <caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" /> 521 + <state relative-caret-position="-110">
  522 + <caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" />
523 </state> 523 </state>
524 </provider> 524 </provider>
525 </entry> 525 </entry>
526 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml"> 526 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
527 <provider selected="true" editor-type-id="text-editor"> 527 <provider selected="true" editor-type-id="text-editor">
528 - <state relative-caret-position="88">  
529 - <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" /> 528 + <state relative-caret-position="3427">
  529 + <caret line="390" lean-forward="true" selection-start-line="390" selection-end-line="390" />
530 </state> 530 </state>
531 </provider> 531 </provider>
532 </entry> 532 </entry>
533 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml"> 533 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml">
534 <provider selected="true" editor-type-id="text-editor"> 534 <provider selected="true" editor-type-id="text-editor">
535 - <state relative-caret-position="550">  
536 - <caret line="25" selection-start-line="25" selection-end-line="25" /> 535 + <state relative-caret-position="198">
  536 + <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
537 </state> 537 </state>
538 </provider> 538 </provider>
539 </entry> 539 </entry>
540 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml"> 540 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml">
541 <provider selected="true" editor-type-id="text-editor"> 541 <provider selected="true" editor-type-id="text-editor">
542 - <state relative-caret-position="286">  
543 - <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" /> 542 + <state relative-caret-position="506">
  543 + <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
544 </state> 544 </state>
545 </provider> 545 </provider>
546 </entry> 546 </entry>
547 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml"> 547 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml">
548 <provider selected="true" editor-type-id="text-editor"> 548 <provider selected="true" editor-type-id="text-editor">
549 - <state relative-caret-position="154">  
550 - <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" /> 549 + <state relative-caret-position="66">
  550 + <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
551 </state> 551 </state>
552 </provider> 552 </provider>
553 </entry> 553 </entry>
554 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml"> 554 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml">
555 <provider selected="true" editor-type-id="text-editor"> 555 <provider selected="true" editor-type-id="text-editor">
556 - <state>  
557 - <caret line="3" column="57" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="57" /> 556 + <state relative-caret-position="44">
  557 + <caret line="2" selection-start-line="2" selection-end-line="3" selection-end-column="18" />
558 </state> 558 </state>
559 </provider> 559 </provider>
560 </entry> 560 </entry>
561 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml"> 561 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml">
562 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
563 - <state relative-caret-position="110">  
564 - <caret line="5" column="61" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="61" /> 563 + <state relative-caret-position="176">
  564 + <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
565 </state> 565 </state>
566 </provider> 566 </provider>
567 </entry> 567 </entry>
568 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml"> 568 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
569 <provider selected="true" editor-type-id="text-editor"> 569 <provider selected="true" editor-type-id="text-editor">
570 <state relative-caret-position="110"> 570 <state relative-caret-position="110">
571 - <caret line="14" column="67" selection-start-line="14" selection-start-column="67" selection-end-line="14" selection-end-column="67" /> 571 + <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="22" />
572 </state> 572 </state>
573 </provider> 573 </provider>
574 </entry> 574 </entry>
575 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml"> 575 + <entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">
576 <provider selected="true" editor-type-id="text-editor"> 576 <provider selected="true" editor-type-id="text-editor">
577 - <state>  
578 - <caret column="6" selection-start-column="6" selection-end-column="19" /> 577 + <state relative-caret-position="594">
  578 + <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
579 </state> 579 </state>
580 </provider> 580 </provider>
581 </entry> 581 </entry>
582 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml"> 582 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml">
583 <provider selected="true" editor-type-id="text-editor"> 583 <provider selected="true" editor-type-id="text-editor">
584 - <state relative-caret-position="246">  
585 - <caret line="34" lean-forward="true" selection-start-line="2" selection-end-line="34" /> 584 + <state relative-caret-position="66">
  585 + <caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
586 </state> 586 </state>
587 </provider> 587 </provider>
588 </entry> 588 </entry>
589 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml"> 589 + <entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml">
590 <provider selected="true" editor-type-id="text-editor"> 590 <provider selected="true" editor-type-id="text-editor">
591 - <state>  
592 - <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="16" /> 591 + <state relative-caret-position="176">
  592 + <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
593 </state> 593 </state>
594 </provider> 594 </provider>
595 </entry> 595 </entry>
596 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml"> 596 + <entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.yml">
597 <provider selected="true" editor-type-id="text-editor"> 597 <provider selected="true" editor-type-id="text-editor">
598 - <state relative-caret-position="66">  
599 - <caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="27" /> 598 + <state relative-caret-position="154">
  599 + <caret line="31" column="49" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="49" />
600 </state> 600 </state>
601 </provider> 601 </provider>
602 </entry> 602 </entry>
603 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml"> 603 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
604 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
605 - <state>  
606 - <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="14" /> 605 + <state relative-caret-position="81">
  606 + <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
607 </state> 607 </state>
608 </provider> 608 </provider>
609 </entry> 609 </entry>
610 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml"> 610 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
611 <provider selected="true" editor-type-id="text-editor"> 611 <provider selected="true" editor-type-id="text-editor">
612 - <state relative-caret-position="176">  
613 - <caret line="14" column="58" selection-start-line="14" selection-start-column="58" selection-end-line="14" selection-end-column="58" /> 612 + <state relative-caret-position="1782">
  613 + <caret line="91" selection-start-line="91" selection-end-line="91" />
  614 + <folding>
  615 + <element signature="e#0#13#0" expanded="true" />
  616 + </folding>
614 </state> 617 </state>
615 </provider> 618 </provider>
616 </entry> 619 </entry>
617 - <entry file="file://$PROJECT_DIR$/.env"> 620 + <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml">
618 <provider selected="true" editor-type-id="text-editor"> 621 <provider selected="true" editor-type-id="text-editor">
619 - <state relative-caret-position="176">  
620 - <caret line="8" column="51" selection-start-line="8" selection-start-column="51" selection-end-line="8" selection-end-column="51" /> 622 + <state relative-caret-position="330">
  623 + <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
621 </state> 624 </state>
622 </provider> 625 </provider>
623 </entry> 626 </entry>
624 - <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml"> 627 + <entry file="file://$PROJECT_DIR$/api/app_api/order/details_api.yml">
625 <provider selected="true" editor-type-id="text-editor"> 628 <provider selected="true" editor-type-id="text-editor">
626 - <state relative-caret-position="88">  
627 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" /> 629 + <state>
  630 + <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="10" />
628 </state> 631 </state>
629 </provider> 632 </provider>
630 </entry> 633 </entry>
631 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 634 + <entry file="file://$PROJECT_DIR$/testcases/order/order_details_testcases.yml">
632 <provider selected="true" editor-type-id="text-editor"> 635 <provider selected="true" editor-type-id="text-editor">
633 - <state relative-caret-position="-462">  
634 - <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" /> 636 + <state relative-caret-position="22">
  637 + <caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="14" />
635 </state> 638 </state>
636 </provider> 639 </provider>
637 </entry> 640 </entry>
638 - <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml"> 641 + <entry file="file://$PROJECT_DIR$/api/app_api/user/userInfo_api.yml">
639 <provider selected="true" editor-type-id="text-editor"> 642 <provider selected="true" editor-type-id="text-editor">
640 - <state relative-caret-position="44">  
641 - <caret line="8" column="46" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" /> 643 + <state relative-caret-position="330">
  644 + <caret line="21" column="2" lean-forward="true" selection-start-line="21" selection-start-column="2" selection-end-line="21" selection-end-column="2" />
642 </state> 645 </state>
643 </provider> 646 </provider>
644 </entry> 647 </entry>
645 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml"> 648 + <entry file="file://$PROJECT_DIR$/testcases/user/user_userInfo_testcases.yml">
646 <provider selected="true" editor-type-id="text-editor"> 649 <provider selected="true" editor-type-id="text-editor">
647 - <state relative-caret-position="-110">  
648 - <caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" /> 650 + <state relative-caret-position="286">
  651 + <caret line="13" selection-start-line="13" selection-end-line="18" selection-end-column="16" />
649 </state> 652 </state>
650 </provider> 653 </provider>
651 </entry> 654 </entry>
652 <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml"> 655 <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
653 <provider selected="true" editor-type-id="text-editor"> 656 <provider selected="true" editor-type-id="text-editor">
654 - <state relative-caret-position="-88">  
655 - <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />  
656 - </state>  
657 - </provider>  
658 - </entry>  
659 - <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml">  
660 - <provider selected="true" editor-type-id="text-editor">  
661 - <state relative-caret-position="110">  
662 - <caret line="5" column="5" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="42" /> 657 + <state relative-caret-position="493">
  658 + <caret line="27" column="16" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="16" />
663 </state> 659 </state>
664 </provider> 660 </provider>
665 </entry> 661 </entry>
666 - <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> 662 + <entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2and3/argparse.pyi">
667 <provider selected="true" editor-type-id="text-editor"> 663 <provider selected="true" editor-type-id="text-editor">
668 - <state relative-caret-position="301">  
669 - <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" /> 664 + <state relative-caret-position="1606">
  665 + <caret line="83" column="27" lean-forward="true" selection-start-line="83" selection-start-column="27" selection-end-line="83" selection-end-column="27" />
670 </state> 666 </state>
671 </provider> 667 </provider>
672 </entry> 668 </entry>
673 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 669 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/argparse.py">
674 <provider selected="true" editor-type-id="text-editor"> 670 <provider selected="true" editor-type-id="text-editor">
675 - <state relative-caret-position="3427">  
676 - <caret line="390" lean-forward="true" selection-start-line="390" selection-end-line="390" /> 671 + <state relative-caret-position="-1702">
  672 + <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
677 </state> 673 </state>
678 </provider> 674 </provider>
679 </entry> 675 </entry>
680 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml"> 676 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/cli.py">
681 <provider selected="true" editor-type-id="text-editor"> 677 <provider selected="true" editor-type-id="text-editor">
682 - <state relative-caret-position="198">  
683 - <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" /> 678 + <state relative-caret-position="496">
  679 + <caret line="24" column="36" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
  680 + <folding>
  681 + <element signature="e#0#15#0" expanded="true" />
  682 + </folding>
684 </state> 683 </state>
685 </provider> 684 </provider>
686 </entry> 685 </entry>
687 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml"> 686 + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml">
688 <provider selected="true" editor-type-id="text-editor"> 687 <provider selected="true" editor-type-id="text-editor">
689 - <state relative-caret-position="506">  
690 - <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" /> 688 + <state>
  689 + <caret column="6" selection-start-column="6" selection-end-column="16" />
691 </state> 690 </state>
692 </provider> 691 </provider>
693 </entry> 692 </entry>
694 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml"> 693 + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml">
695 <provider selected="true" editor-type-id="text-editor"> 694 <provider selected="true" editor-type-id="text-editor">
696 - <state relative-caret-position="66">  
697 - <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" /> 695 + <state>
  696 + <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="16" />
698 </state> 697 </state>
699 </provider> 698 </provider>
700 </entry> 699 </entry>
701 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml"> 700 + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml">
702 <provider selected="true" editor-type-id="text-editor"> 701 <provider selected="true" editor-type-id="text-editor">
703 - <state relative-caret-position="44">  
704 - <caret line="2" selection-start-line="2" selection-end-line="3" selection-end-column="18" /> 702 + <state relative-caret-position="22">
  703 + <caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="20" />
705 </state> 704 </state>
706 </provider> 705 </provider>
707 </entry> 706 </entry>
708 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml"> 707 + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml">
709 <provider selected="true" editor-type-id="text-editor"> 708 <provider selected="true" editor-type-id="text-editor">
710 - <state relative-caret-position="176">  
711 - <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" /> 709 + <state relative-caret-position="22">
  710 + <caret line="1" column="10" lean-forward="true" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="20" />
712 </state> 711 </state>
713 </provider> 712 </provider>
714 </entry> 713 </entry>
715 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 714 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
716 <provider selected="true" editor-type-id="text-editor"> 715 <provider selected="true" editor-type-id="text-editor">
717 - <state relative-caret-position="110">  
718 - <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="22" /> 716 + <state relative-caret-position="36">
  717 + <caret line="174" selection-start-line="174" selection-end-line="174" />
  718 + <folding>
  719 + <element signature="e#108#123#0" expanded="true" />
  720 + </folding>
719 </state> 721 </state>
720 </provider> 722 </provider>
721 </entry> 723 </entry>
722 - <entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml"> 724 + <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml">
723 <provider selected="true" editor-type-id="text-editor"> 725 <provider selected="true" editor-type-id="text-editor">
724 - <state relative-caret-position="594">  
725 - <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" /> 726 + <state relative-caret-position="88">
  727 + <caret line="4" column="65" selection-start-line="4" selection-start-column="65" selection-end-line="4" selection-end-column="65" />
726 </state> 728 </state>
727 </provider> 729 </provider>
728 </entry> 730 </entry>
729 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml"> 731 + <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml">
730 <provider selected="true" editor-type-id="text-editor"> 732 <provider selected="true" editor-type-id="text-editor">
731 - <state relative-caret-position="66">  
732 - <caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" /> 733 + <state relative-caret-position="405">
  734 + <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
733 </state> 735 </state>
734 </provider> 736 </provider>
735 </entry> 737 </entry>
736 - <entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml"> 738 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_api.yml">
737 <provider selected="true" editor-type-id="text-editor"> 739 <provider selected="true" editor-type-id="text-editor">
738 - <state relative-caret-position="176">  
739 - <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" /> 740 + <state relative-caret-position="317">
  741 + <caret line="26" column="22" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
740 </state> 742 </state>
741 </provider> 743 </provider>
742 </entry> 744 </entry>
743 - <entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.yml"> 745 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_testcases.yml">
744 <provider selected="true" editor-type-id="text-editor"> 746 <provider selected="true" editor-type-id="text-editor">
745 - <state relative-caret-position="154">  
746 - <caret line="31" column="49" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="49" /> 747 + <state relative-caret-position="308">
  748 + <caret line="14" column="40" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
747 </state> 749 </state>
748 </provider> 750 </provider>
749 </entry> 751 </entry>
750 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 752 + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml">
751 <provider selected="true" editor-type-id="text-editor"> 753 <provider selected="true" editor-type-id="text-editor">
752 - <state relative-caret-position="81">  
753 - <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" /> 754 + <state relative-caret-position="471">
  755 + <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
754 </state> 756 </state>
755 </provider> 757 </provider>
756 </entry> 758 </entry>
757 <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml"> 759 <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml">
758 <provider selected="true" editor-type-id="text-editor"> 760 <provider selected="true" editor-type-id="text-editor">
759 - <state relative-caret-position="176"> 761 + <state relative-caret-position="44">
760 <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> 762 <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
761 </state> 763 </state>
762 </provider> 764 </provider>
763 </entry> 765 </entry>
764 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 766 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
765 <provider selected="true" editor-type-id="text-editor"> 767 <provider selected="true" editor-type-id="text-editor">
766 - <state relative-caret-position="127">  
767 - <caret line="101" column="32" selection-start-line="101" selection-start-column="32" selection-end-line="101" selection-end-column="32" /> 768 + <state relative-caret-position="286">
  769 + <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
768 </state> 770 </state>
769 </provider> 771 </provider>
770 </entry> 772 </entry>
771 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 773 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
772 <provider selected="true" editor-type-id="text-editor"> 774 <provider selected="true" editor-type-id="text-editor">
773 - <state relative-caret-position="22">  
774 - <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />  
775 - <folding>  
776 - <element signature="e#108#123#0" expanded="true" />  
777 - </folding> 775 + <state relative-caret-position="374">
  776 + <caret line="17" column="29" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
778 </state> 777 </state>
779 </provider> 778 </provider>
780 </entry> 779 </entry>
781 - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml"> 780 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">
782 <provider selected="true" editor-type-id="text-editor"> 781 <provider selected="true" editor-type-id="text-editor">
783 - <state relative-caret-position="220">  
784 - <caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" /> 782 + <state relative-caret-position="550">
  783 + <caret line="25" column="26" lean-forward="true" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="33" />
785 </state> 784 </state>
786 </provider> 785 </provider>
787 </entry> 786 </entry>
788 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 787 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
789 <provider selected="true" editor-type-id="text-editor"> 788 <provider selected="true" editor-type-id="text-editor">
790 - <state relative-caret-position="155">  
791 - <caret line="86" lean-forward="true" selection-start-line="86" selection-end-line="86" />  
792 - <folding>  
793 - <element signature="e#0#13#0" expanded="true" />  
794 - </folding> 789 + <state relative-caret-position="141">
  790 + <caret line="80" column="73" selection-start-line="80" selection-start-column="73" selection-end-line="80" selection-end-column="73" />
795 </state> 791 </state>
796 </provider> 792 </provider>
797 </entry> 793 </entry>
1 -name: 全部订单-实发订单列表 1 +name: 已收明细——分红订单
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
3 -teardown_hooks:  
4 - - ${sleep(10)}  
5 variables: 3 variables:
6 currtime: ${make_time()} 4 currtime: ${make_time()}
7 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
8 var_access_token: ${get_accesstoken()} 6 var_access_token: ${get_accesstoken()}
9 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
10 - cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}  
11 - orderQuantity: ${get_orderQuantity_from_database(order)} 8 +# received: ${get_received_from_database()}
  9 + total: ${get_detailAction_0_from_database()}
  10 +# startTime: ${get_January_timestamp()}
  11 + endTime: ${get_Decembe_timestamp()}
12 msg: 成功 12 msg: 成功
13 request: 13 request:
14 headers: 14 headers:
@@ -23,20 +23,17 @@ request: @@ -23,20 +23,17 @@ request:
23 X-MMM-Uuid: $uuid 23 X-MMM-Uuid: $uuid
24 X-MMM-Version: 0.4.0 24 X-MMM-Version: 0.4.0
25 json: 25 json:
26 - orderAction: 0  
27 - pageIndex: 0  
28 - startTime: ${get_starTimestamp()}  
29 - pageSize: 20  
30 - endTime: ${get_endTimestamp()} 26 + detailAction: 0
  27 + pageIndex: 0
  28 + pageSize: 20
  29 + startTime: 0
  30 + endTime: $endTime
31 method: POST 31 method: POST
32 - url: v1/order/list 32 + url: v1/dividend/orders
33 validate: 33 validate:
34 - eq: 34 - eq:
35 - content.msg 35 - content.msg
36 - $msg 36 - $msg
37 - - eq:  
38 - - content.data.statistics.cumulativeQuantity  
39 - - $cumulativeQuantity  
40 - - eq:  
41 - - content.data.statistics.orderQuantity  
42 - - $orderQuantity  
  37 + - eq:
  38 + - content.data.total
  39 + - $total
  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 +# received: ${get_received_from_database()}
  9 + total: ${get_detailAction_0_from_database()}
  10 +# startTime: ${get_January_timestamp()}
  11 + endTime: ${get_Decembe_timestamp()}
  12 + msg: 成功
  13 +request:
  14 + headers:
  15 + Content-Type: application/json;charset=utf-8
  16 + User-Agent: okhttp/3.12.3
  17 + X-MMM-AccessToken: $var_access_token
  18 + X-MMM-AppName: com.mmm.ability
  19 + X-MMM-AppProject: ability
  20 + X-MMM-DeviceType: '1'
  21 + X-MMM-Sign: $sign
  22 + X-MMM-Timestamp: $currtime
  23 + X-MMM-Uuid: $uuid
  24 + X-MMM-Version: 0.4.0
  25 + json:
  26 + detailAction: 1
  27 + pageIndex: 0
  28 + pageSize: 20
  29 + startTime: 0
  30 + endTime: $endTime
  31 + method: POST
  32 + url: v1/dividend/orders
  33 +validate:
  34 + - eq:
  35 + - content.msg
  36 + - $msg
  37 + - eq:
  38 + - content.data.total
  39 + - $total
1 -name: 全部发货-实发订单列表 1 +name: 订单详情
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
3 -teardown_hooks:  
4 - - ${sleep(10)}  
5 variables: 3 variables:
6 currtime: ${make_time()} 4 currtime: ${make_time()}
7 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
8 var_access_token: ${get_accesstoken()} 6 var_access_token: ${get_accesstoken()}
9 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
10 - allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}  
11 msg: 成功 8 msg: 成功
12 request: 9 request:
13 headers: 10 headers:
@@ -22,17 +19,10 @@ request: @@ -22,17 +19,10 @@ request:
22 X-MMM-Uuid: $uuid 19 X-MMM-Uuid: $uuid
23 X-MMM-Version: 0.4.0 20 X-MMM-Version: 0.4.0
24 json: 21 json:
25 - orderAction: 2  
26 - pageIndex: 0  
27 - startTime: ${get_starTimestamp()}  
28 - pageSize: 20  
29 - endTime: ${get_endTimestamp()} 22 + id: $id
30 method: POST 23 method: POST
31 - url: v1/order/list 24 + url: v1/order/details
32 validate: 25 validate:
33 - eq: 26 - eq:
34 - content.msg 27 - content.msg
35 - - $msg  
36 - - eq:  
37 - - content.data.statistics.allShipmentQuantity  
38 - - $allShipmentQuantity  
  28 + - $msg
1 -name: 意向订单列表 1 +name: 实发订单列表
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
3 variables: 3 variables:
4 currtime: ${make_time()} 4 currtime: ${make_time()}
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 - intentionQuantity: ${get_intentionQuantity_from_database(order)}  
9 msg: 成功 8 msg: 成功
10 request: 9 request:
11 headers: 10 headers:
@@ -20,14 +19,13 @@ request: @@ -20,14 +19,13 @@ request:
20 X-MMM-Uuid: $uuid 19 X-MMM-Uuid: $uuid
21 X-MMM-Version: 0.4.0 20 X-MMM-Version: 0.4.0
22 json: 21 json:
23 - pageIndex: 0  
24 - pageSize: 20 22 + startTime:
  23 + endTime:
  24 + pageIndex: 0
  25 + pageSize: 20
25 method: POST 26 method: POST
26 - url: v1/order/intentions 27 + url: v1/order/list
27 validate: 28 validate:
28 - eq: 29 - eq:
29 - content.msg 30 - content.msg
30 - - $msg  
31 - - eq:  
32 - - content.data.statistics.intentionQuantity  
33 - - $intentionQuantity 31 + - $msg
@@ -5,12 +5,6 @@ variables: @@ -5,12 +5,6 @@ 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 - todayIntentionQuantity: ${get_todayIntentionQuantity_from_database(order)}  
9 - todayIntentionMoney: ${get_todayIntentionMoney_from_database(order)}  
10 - todayRealQuantity: ${get_todayRealQuantity_from_database(order)}  
11 - todayRealMoney: ${get_todayRealMoney_from_database(order)}  
12 - cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}  
13 - cumulativeMoney: ${get_cumulativeMoney_from_database(order)}  
14 msg: 成功 8 msg: 成功
15 request: 9 request:
16 headers: 10 headers:
@@ -30,22 +24,4 @@ request: @@ -30,22 +24,4 @@ request:
30 validate: 24 validate:
31 - eq: 25 - eq:
32 - content.msg 26 - content.msg
33 - - $msg  
34 - - eq:  
35 - - content.data.statistics.cumulativeMoney  
36 - - $cumulativeMoney  
37 - - eq:  
38 - - content.data.statistics.cumulativeQuantity  
39 - - $cumulativeQuantity  
40 - - eq:  
41 - - content.data.statistics.todayIntentionMoney  
42 - - $todayIntentionMoney  
43 - - eq:  
44 - - content.data.statistics.todayIntentionQuantity  
45 - - $todayIntentionQuantity  
46 - - eq:  
47 - - content.data.statistics.todayRealMoney  
48 - - $todayRealMoney  
49 - - eq:  
50 - - content.data.statistics.todayRealQuantity  
51 - - $todayRealQuantity  
  27 + - $msg
1 -name: 部分发货-实发订单列表 1 +name: 获取用户信息
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
3 -teardown_hooks:  
4 - - ${sleep(10)}  
5 variables: 3 variables:
6 currtime: ${make_time()} 4 currtime: ${make_time()}
7 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
8 var_access_token: ${get_accesstoken()} 6 var_access_token: ${get_accesstoken()}
9 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
10 - partShipmentQuantity: ${get_partShipmentQuantity_from_database(order)}  
11 msg: 成功 8 msg: 成功
12 request: 9 request:
13 headers: 10 headers:
@@ -22,17 +19,9 @@ request: @@ -22,17 +19,9 @@ request:
22 X-MMM-Uuid: $uuid 19 X-MMM-Uuid: $uuid
23 X-MMM-Version: 0.4.0 20 X-MMM-Version: 0.4.0
24 json: 21 json:
25 - orderAction: 1  
26 - pageIndex: 0  
27 - startTime: ${get_starTimestamp()}  
28 - pageSize: 20  
29 - endTime: ${get_endTimestamp()}  
30 method: POST 22 method: POST
31 - url: v1/order/list 23 + url: v1/user/userInfo
32 validate: 24 validate:
33 - eq: 25 - eq:
34 - content.msg 26 - content.msg
35 - - $msg  
36 - - eq:  
37 - - content.data.statistics.partShipmentQuantity  
38 - - $partShipmentQuantity  
  27 + - $msg
@@ -6,17 +6,16 @@ request: @@ -6,17 +6,16 @@ request:
6 User-Agent: okhttp/3.12.3 6 User-Agent: okhttp/3.12.3
7 Authorization: Bearer ${get_m_accesstoken()} 7 Authorization: Bearer ${get_m_accesstoken()}
8 json: 8 json:
9 - buyer: 我是买家${get_second()}  
10 - buyerPhone: ${convert_to_string($account)}  
11 - address: '福建省福州市收获地址2'  
12 - partner: 29  
13 - partnerRatio: 10.2  
14 - salesmanRatio: 0.99  
15 orderId: ${get_nowtime()} 9 orderId: ${get_nowtime()}
16 - orderName: ${get_nowtime()}  
17 - orderNum: 500  
18 - orderPrice: 1000 10 + buyer: 我是买家${get_second()}
19 orderDist: '福建二区' 11 orderDist: '福建二区'
  12 + partner: 29
  13 + commissionProportion: 10.2
  14 + product:
  15 + - productName: 产品名称${get_second()}
  16 + orderNum: 100
  17 + univalence: 2.22
  18 + partnerRatio: 5.2
20 method: POST 19 method: POST
21 url: v1/order/purpose/update 20 url: v1/order/purpose/update
22 validate: 21 validate:
1 -name: 意向订单转发实发订单 1 +name: 意向订单发货
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 address: ${get_purpose_address_from_database(order)} 4 address: ${get_purpose_address_from_database(order)}
@@ -14,21 +14,16 @@ request: @@ -14,21 +14,16 @@ request:
14 User-Agent: okhttp/3.12.3 14 User-Agent: okhttp/3.12.3
15 Authorization: Bearer ${get_m_accesstoken()} 15 Authorization: Bearer ${get_m_accesstoken()}
16 json: 16 json:
17 - buyer: $buyer  
18 - buyerPhone: $buyerPhone  
19 - address: $address  
20 - partner: 29  
21 - partnerRatio: 10.2  
22 - salesmanRatio: 0.99  
23 - orderId: $orderId  
24 - orderName: $orderName  
25 - orderNum: 500  
26 - orderPrice: 1000  
27 - orderDist: $orderDist 17 + shipmentsId:
28 id: $id 18 id: $id
29 - orderStatue: 2 19 + productDetail:
  20 + - id:
  21 + productName:
  22 + orderNum:
  23 + univalence:
  24 + partnerRatio:
30 method: POST 25 method: POST
31 - url: v1/order/purpose/update 26 + url: v1/order/purpose/sendout
32 validate: 27 validate:
33 - eq: 28 - eq:
34 - content.msg 29 - content.msg
@@ -86,12 +86,6 @@ def get_Decembe_timestamp(): @@ -86,12 +86,6 @@ def get_Decembe_timestamp():
86 return int(time.mktime(time.strptime('2020-12-31 23:59:59', '%Y-%m-%d %H:%M:%S'))*1000) 86 return int(time.mktime(time.strptime('2020-12-31 23:59:59', '%Y-%m-%d %H:%M:%S'))*1000)
87 87
88 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'))*1000)  
92 -# print(begin,end)  
93 -# return begin, end  
94 89
95 90
96 # print(get_Decembe_timestamp()) 91 # print(get_Decembe_timestamp())
97 -# # '2020-12-31 23:59:59'  
@@ -173,39 +173,6 @@ def get_todayRealQuantity_from_database(tbl): @@ -173,39 +173,6 @@ def get_todayRealQuantity_from_database(tbl):
173 db.rollback() 173 db.rollback()
174 db.close() 174 db.close()
175 175
176 -#今日新增意向订单  
177 -def get_todayIntentionQuantity_from_database(tbl):  
178 - db = GetConnect()  
179 - cursor = db.cursor()  
180 - # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '  
181 - sql = '''select COUNT(id) from \"{}\" where create_at between \'{}\' and \'{}\' and order_status in (1) '''.format(tbl,get_today(),get_tomorrow())  
182 - # print(sql)  
183 - try:  
184 - cursor.execute(sql)  
185 - result = cursor.fetchone()  
186 - return int(result[0])  
187 - except Exception as err:  
188 - # 发生错误时回滚  
189 - print(err)  
190 - db.rollback()  
191 - db.close()  
192 -  
193 -#今日新增意向订单金额  
194 -def get_todayIntentionMoney_from_database(tbl):  
195 - db = GetConnect()  
196 - cursor = db.cursor()  
197 - # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '  
198 - 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())  
199 - # print(sql)  
200 - try:  
201 - cursor.execute(sql)  
202 - result = cursor.fetchone()  
203 - return int(result[0])  
204 - except Exception as err:  
205 - # 发生错误时回滚  
206 - print(err)  
207 - db.rollback()  
208 - db.close()  
209 #订单数量 176 #订单数量
210 def get_orderQuantity_from_database(tbl): 177 def get_orderQuantity_from_database(tbl):
211 db = GetConnect() 178 db = GetConnect()
@@ -327,4 +294,58 @@ def get_received_from_database(): @@ -327,4 +294,58 @@ def get_received_from_database():
327 print(err) 294 print(err)
328 db.rollback() 295 db.rollback()
329 db.close() 296 db.close()
330 -# print(get_outstanding_from_database()) 297 +
  298 +#已收明细数量
  299 +def get_detailAction_0_from_database():
  300 + db = GetConnect()
  301 + cursor = db.cursor()
  302 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  303 + sql = '''select COUNT(id) from \"{}\" where partner_id = {} and order_payment_amount > 0 '''.format('order',get_partner_id_from_database('partner_info'))
  304 + # print(sql)id
  305 + try:
  306 + cursor.execute(sql)
  307 + result = cursor.fetchone()
  308 + return result[0]
  309 + except Exception as err:
  310 + # 发生错误时回滚
  311 + print(err)
  312 + db.rollback()
  313 + db.close()
  314 +
  315 +#未收明细数量
  316 +def get_detailAction_1_from_database():
  317 + db = GetConnect()
  318 + cursor = db.cursor()
  319 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  320 + sql = '''select COUNT(id) from \"{}\" where partner_id = {} and order_actual_amount > order_payment_amount '''.format('order',get_partner_id_from_database('partner_info'))
  321 + # print(sql)id
  322 + try:
  323 + cursor.execute(sql)
  324 + result = cursor.fetchone()
  325 + return result[0]
  326 + except Exception as err:
  327 + # 发生错误时回滚
  328 + print(err)
  329 + db.rollback()
  330 + db.close()
  331 +
  332 +#季度分红支出
  333 +def get_expend_from_database():
  334 + db = GetConnect()
  335 + cursor = db.cursor()
  336 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  337 + sql = '''select sum(((order_amount- order_actual_amount)* partner_bonus_percent)/100) from \"{}\" where partner_id = {} '''.format('order',get_partner_id_from_database('partner_info'))
  338 + # print(sql)id
  339 + try:
  340 + cursor.execute(sql)
  341 + result = cursor.fetchone()
  342 + if result[0] == 0:
  343 + return 0
  344 + else:
  345 + return round(result[0],2)
  346 + except Exception as err:
  347 + # 发生错误时回滚
  348 + print(err)
  349 + db.rollback()
  350 + db.close()
  351 +print(get_expend_from_database())
1 config: 1 config:
2 - name: 全部发货-实发订单列表 2 + name: 已收明细——分红订单
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_partner_account_from_database(partner_info)} 5 phone: ${get_partner_account_from_database(partner_info)}
6 - allShipmentQuantity: ${get_allShipmentQuantity_from_database(order)}  
7 - msg: 成功 6 + received: ${get_received_from_database()}
  7 + outstanding: ${get_outstanding_from_database()}
8 teardown_hooks: 8 teardown_hooks:
9 - - ${sleep(10)} 9 + - ${sleep(3)}
10 10
11 teststeps: 11 teststeps:
12 - name: $phone 登录系统 12 - name: $phone 登录系统
13 testcase: testcases/login_testcases.yml 13 testcase: testcases/login_testcases.yml
14 14
15 -- name: $phone 全部发货-实发订单列表  
16 - api: api/app_api/order/list_2_api.yml 15 +- name: $phone 已收明细——分红订单
  16 + api: api/app_api/dividend/orders001.api.yml
17 validate: 17 validate:
18 - - eq:  
19 - - content.msg  
20 - - $msg  
21 - - eq:  
22 - - content.data.statistics.allShipmentQuantity  
23 - - $allShipmentQuantity  
  18 + - eq:
  19 + - content.msg
  20 + - $msg
1 config: 1 config:
2 - name: 全部订单-实发订单列表 2 + name: 未收明细——分红订单
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_partner_account_from_database(partner_info)} 5 phone: ${get_partner_account_from_database(partner_info)}
6 - cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}  
7 - orderQuantity: ${get_orderQuantity_from_database(order)}  
8 - msg: 成功 6 + received: ${get_received_from_database()}
  7 + outstanding: ${get_outstanding_from_database()}
9 teardown_hooks: 8 teardown_hooks:
10 - - ${sleep(2)} 9 + - ${sleep(3)}
11 10
12 teststeps: 11 teststeps:
13 - name: $phone 登录系统 12 - name: $phone 登录系统
14 testcase: testcases/login_testcases.yml 13 testcase: testcases/login_testcases.yml
15 14
16 -- name: $phone 全部订单-实发订单列表  
17 - api: api/app_api/order/list_0_api.yml 15 +- name: $phone 未收明细——分红订单
  16 + api: api/app_api/dividend/orders002.api.yml
18 validate: 17 validate:
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  
  18 + - eq:
  19 + - content.msg
  20 + - $msg
@@ -20,5 +20,9 @@ teststeps: @@ -20,5 +20,9 @@ teststeps:
20 teardown_hooks: 20 teardown_hooks:
21 - ${teardown_hook_get_accesstoken($response)} 21 - ${teardown_hook_get_accesstoken($response)}
22 22
23 -#- name: $phone 获取userinfo  
24 -# api: api/app_api/userInfo_api.yml 23 +- name: $phone 获取用户信息
  24 + api: api/app_api/user/userInfo_api.yml
  25 + validate:
  26 + - eq:
  27 + - content.msg
  28 + - $msg
1 config: 1 config:
2 - name: 意向订单列表 2 + name: 订单详情
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_partner_account_from_database(partner_info)} 5 phone: ${get_partner_account_from_database(partner_info)}
6 - intentionQuantity: ${get_intentionQuantity_from_database(order)}  
7 msg: 成功 6 msg: 成功
8 teardown_hooks: 7 teardown_hooks:
9 - - ${sleep(10)} 8 + - ${sleep(2)}
10 9
11 teststeps: 10 teststeps:
12 - name: $phone 登录系统 11 - name: $phone 登录系统
13 testcase: testcases/login_testcases.yml 12 testcase: testcases/login_testcases.yml
14 13
15 -- name: $phone 订单统计  
16 - api: api/app_api/order/intentions_api.yml 14 +- name: $phone 订单详情
  15 + api: api/app_api/order/details_api.yml
17 validate: 16 validate:
18 - eq: 17 - eq:
19 - content.msg 18 - content.msg
20 - - $msg  
21 - - eq:  
22 - - content.data.statistics.intentionQuantity  
23 - - $intentionQuantity  
  19 + - $msg
1 config: 1 config:
2 - name: 部分发货-实发订单列表 2 + name: 实发订单列表
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_partner_account_from_database(partner_info)} 5 phone: ${get_partner_account_from_database(partner_info)}
6 - partShipmentQuantity: ${get_partShipmentQuantity_from_database(order)}  
7 msg: 成功 6 msg: 成功
8 teardown_hooks: 7 teardown_hooks:
9 - ${sleep(2)} 8 - ${sleep(2)}
@@ -12,12 +11,9 @@ teststeps: @@ -12,12 +11,9 @@ teststeps:
12 - name: $phone 登录系统 11 - name: $phone 登录系统
13 testcase: testcases/login_testcases.yml 12 testcase: testcases/login_testcases.yml
14 13
15 -- name: $phone 部分发货-实发订单列表  
16 - api: api/app_api/order/list_1_api.yml 14 +- name: $phone 实发订单列表
  15 + api: api/app_api/order/list_api.yml
17 validate: 16 validate:
18 - - eq:  
19 - - content.msg  
20 - - $msg  
21 - - eq:  
22 - - content.data.statistics.partShipmentQuantity  
23 - - $partShipmentQuantity  
  17 + - eq:
  18 + - content.msg
  19 + - $msg
@@ -3,12 +3,6 @@ config: @@ -3,12 +3,6 @@ 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 - todayIntentionQuantity: ${get_todayIntentionQuantity_from_database(order)}  
7 - todayIntentionMoney: ${get_todayIntentionMoney_from_database(order)}  
8 - todayRealQuantity: ${get_todayRealQuantity_from_database(order)}  
9 - todayRealMoney: ${get_todayRealMoney_from_database(order)}  
10 - cumulativeQuantity: ${get_cumulativeQuantity_from_database(order)}  
11 - cumulativeMoney: ${get_cumulativeMoney_from_database(order)}  
12 msg: 成功 6 msg: 成功
13 teardown_hooks: 7 teardown_hooks:
14 - ${sleep(2)} 8 - ${sleep(2)}
@@ -22,22 +16,4 @@ teststeps: @@ -22,22 +16,4 @@ teststeps:
22 validate: 16 validate:
23 - eq: 17 - eq:
24 - content.msg 18 - content.msg
25 - - $msg  
26 - - eq:  
27 - - content.data.statistics.cumulativeMoney  
28 - - $cumulativeMoney  
29 - - eq:  
30 - - content.data.statistics.cumulativeQuantity  
31 - - $cumulativeQuantity  
32 - - eq:  
33 - - content.data.statistics.todayIntentionMoney  
34 - - $todayIntentionMoney  
35 - - eq:  
36 - - content.data.statistics.todayIntentionQuantity  
37 - - $todayIntentionQuantity  
38 - - eq:  
39 - - content.data.statistics.todayRealMoney  
40 - - $todayRealMoney  
41 - - eq:  
42 - - content.data.statistics.todayRealQuantity  
43 - - $todayRealQuantity  
  19 + - $msg
@@ -78,7 +78,7 @@ testcases: @@ -78,7 +78,7 @@ testcases:
78 # testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 78 # testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
79 79
80 #- name: PURPOSE005：意向订单转发实发订单 80 #- name: PURPOSE005：意向订单转发实发订单
81 -# testcase: testcases/purpose/PURPOSE005_purpose_convert_testcases.yml 81 +# testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml
82 82
83 #- name: PURPOSE006：查看意向订单详情 83 #- name: PURPOSE006：查看意向订单详情
84 # testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml 84 # testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml
@@ -86,17 +86,17 @@ testcases: @@ -86,17 +86,17 @@ testcases:
86 #- name: statistics：订单统计 86 #- name: statistics：订单统计
87 # testcase: testcases/order/order_statistics_testcases.yml 87 # testcase: testcases/order/order_statistics_testcases.yml
88 88
89 -#- name: list_0：全部订单-实发订单列表  
90 -# testcase: testcases/order/order_list_0_testcases.yml 89 +#- name: statistics：订单详情
  90 +# testcase: testcases/order/order_details_testcases.yml
91 91
92 -#- name: list_1：部分发货-实发订单列表  
93 -# testcase: testcases/order/order_list_1_testcases.yml 92 +#- name: statistics：分红统计
  93 +# testcase: testcases/dividend/dividend_statistics_testcases.yml
94 94
95 -#- name: list_2：全部发货-实发订单列表  
96 -# testcase: testcases/order/order_list_2_testcases.yml 95 +#- name: orders001：已收明细——分红订单
  96 +# testcase: testcases/dividend/dividend_orders001_testcases.yml
97 97
98 -#- name: intentions：意向订单列表  
99 -# testcase: testcases/order/order_intentions_testcases.yml 98 +#- name: orders002：未收明细——分红订单
  99 +# testcase: testcases/dividend/dividend_orders002_testcases.yml
100 100
101 -- name: statistics：分红统计  
102 - testcase: testcases/dividend/dividend_statistics_testcases.yml  
  101 +#- name: list：实发订单列表
  102 +# testcase: testcases/order/order_list_testcases.yml