bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 f23ccc4c1b8e5117f99151bde70a39b9386bb456 1 个父辈 76918f01

add README

内嵌 并排对比
正在显示 26 个修改的文件 包含 348 行增加 和 317 行删除
@@ -2,9 +2,28 @@ @@ -2,9 +2,28 @@
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$/testcases/m_pwd_updat_testcases.yml" afterDir="false" />  
6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/api/app_api/login/login_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/login/login_api.yml" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/api/app_api/order/details_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/details_api.yml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_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/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/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$/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$/logs/testsuites/partner_testsuite.parse_failed.json" beforeDir="false" afterPath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" afterDir="false" />
  19 + <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" />
  20 + <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" afterDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" afterDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" 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_details_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" afterDir="false" />
  25 + <change beforePath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" afterDir="false" />
  26 + <change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 27 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
9 </list> 28 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 29 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,45 +33,30 @@ @@ -14,45 +33,30 @@
14 <option name="LAST_RESOLUTION" value="IGNORE" /> 33 <option name="LAST_RESOLUTION" value="IGNORE" />
15 </component> 34 </component>
16 <component name="CoverageDataManager"> 35 <component name="CoverageDataManager">
17 - <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$" />  
18 - <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597387621720" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 36 + <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1598518478676" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  37 + <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1598517630919" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
19 <SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 38 <SUITE FILE_PATH="coverage/partner_api$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" />
20 <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597394689697" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 39 <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597394689697" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
21 </component> 40 </component>
22 <component name="FileEditorManager"> 41 <component name="FileEditorManager">
23 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 42 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
24 - <file pinned="false" current-in-tab="true">  
25 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">  
26 - <provider selected="true" editor-type-id="text-editor">  
27 - <state relative-caret-position="-1092">  
28 - <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />  
29 - </state>  
30 - </provider>  
31 - </entry>  
32 - </file>  
33 - <file pinned="false" current-in-tab="false">  
34 - <entry file="file://$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml">  
35 - <provider selected="true" editor-type-id="text-editor">  
36 - <state>  
37 - <caret column="10" selection-start-column="10" selection-end-column="10" />  
38 - </state>  
39 - </provider>  
40 - </entry>  
41 - </file>  
42 <file pinned="false" current-in-tab="false"> 43 <file pinned="false" current-in-tab="false">
43 - <entry file="file://$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml"> 44 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
44 <provider selected="true" editor-type-id="text-editor"> 45 <provider selected="true" editor-type-id="text-editor">
45 - <state relative-caret-position="317">  
46 - <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" /> 46 + <state relative-caret-position="135">
  47 + <caret line="6" column="38" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="38" />
47 </state> 48 </state>
48 </provider> 49 </provider>
49 </entry> 50 </entry>
50 </file> 51 </file>
51 - <file pinned="false" current-in-tab="false">  
52 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 52 + <file pinned="false" current-in-tab="true">
  53 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
53 <provider selected="true" editor-type-id="text-editor"> 54 <provider selected="true" editor-type-id="text-editor">
54 - <state relative-caret-position="3302">  
55 - <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" /> 55 + <state relative-caret-position="463">
  56 + <caret line="55" column="49" selection-start-line="55" selection-start-column="49" selection-end-line="55" selection-end-column="49" />
  57 + <folding>
  58 + <element signature="e#0#13#0" expanded="true" />
  59 + </folding>
56 </state> 60 </state>
57 </provider> 61 </provider>
58 </entry> 62 </entry>
@@ -68,17 +72,6 @@ @@ -68,17 +72,6 @@
68 </component> 72 </component>
69 <component name="FindInProjectRecents"> 73 <component name="FindInProjectRecents">
70 <findStrings> 74 <findStrings>
71 - <find>todayRealQuantity</find>  
72 - <find>rou</find>  
73 - <find>get_partner_id_from_database</find>  
74 - <find>cumulativeMoney</find>  
75 - <find>tbl</find>  
76 - <find>cumulativeQuantity</find>  
77 - <find>receivable</find>  
78 - <find>get_partner_account_from_database()</find>  
79 - <find>partner_account</find>  
80 - <find>get_partner_account</find>  
81 - <find>received</find>  
82 <find>outstanding</find> 75 <find>outstanding</find>
83 <find>address</find> 76 <find>address</find>
84 <find>buyerPhone</find> 77 <find>buyerPhone</find>
@@ -96,8 +89,19 @@ @@ -96,8 +89,19 @@
96 <find>get_salesman_from_database</find> 89 <find>get_salesman_from_database</find>
97 <find>get_status_from_database</find> 90 <find>get_status_from_database</find>
98 <find>get_phone_from_database</find> 91 <find>get_phone_from_database</find>
99 - <find>get_purpose_id_from_database</find>  
100 <find>get_ID_from_database</find> 92 <find>get_ID_from_database</find>
  93 + <find>get_purpose_order_status_from_database</find>
  94 + <find>get_purpose_id_from_database</find>
  95 + <find>get_todayRealQuantity_from_database</find>
  96 + <find>get_cumulativeMoney_from_database</find>
  97 + <find>get_accesstoken</find>
  98 + <find>get_partner_password_from_database</find>
  99 + <find>get_detailAction_0_use_partner_bonus_amount_from_database</find>
  100 + <find>get_detailAction_0_order_code_from_database</find>
  101 + <find>get_detailAction_1_order_code_from_database</find>
  102 + <find>get_partner_account_from_database</find>
  103 + <find>print</find>
  104 + <find>create_phone_number</find>
101 </findStrings> 105 </findStrings>
102 </component> 106 </component>
103 <component name="Git.Settings"> 107 <component name="Git.Settings">
@@ -106,21 +110,6 @@ @@ -106,21 +110,6 @@
106 <component name="IdeDocumentHistory"> 110 <component name="IdeDocumentHistory">
107 <option name="CHANGED_PATHS"> 111 <option name="CHANGED_PATHS">
108 <list> 112 <list>
109 - <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />  
110 - <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />  
111 - <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" />  
112 - <option value="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" />  
113 - <option value="$PROJECT_DIR$/api/app_api/order/list_api.yml" />  
114 - <option value="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" />  
115 - <option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" />  
116 - <option value="$PROJECT_DIR$/debugtalk.py" />  
117 - <option value="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" />  
118 - <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />  
119 - <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" />  
120 - <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" />  
121 - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />  
122 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />  
123 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />  
124 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" /> 113 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" />
125 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" /> 114 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
126 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" /> 115 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
@@ -145,18 +134,33 @@ @@ -145,18 +134,33 @@
145 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml" /> 134 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml" />
146 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" /> 135 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
147 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" /> 136 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
148 - <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />  
149 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" /> 137 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" />
150 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" /> 138 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" />
151 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml" /> 139 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml" />
152 <option value="$PROJECT_DIR$/testcases/purpose/ACTUAL007_purpose_del_testcases.yml" /> 140 <option value="$PROJECT_DIR$/testcases/purpose/ACTUAL007_purpose_del_testcases.yml" />
153 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" /> 141 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" />
154 - <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />  
155 <option value="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" /> 142 <option value="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" />
156 <option value="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" /> 143 <option value="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" />
157 <option value="$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml" /> 144 <option value="$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml" />
158 <option value="$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml" /> 145 <option value="$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml" />
  146 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" />
  147 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
  148 + <option value="$PROJECT_DIR$/api/app_api/login/login_api.yml" />
  149 + <option value="$PROJECT_DIR$/testcases/login_testcases.yml" />
  150 + <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
  151 + <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
  152 + <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" />
  153 + <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" />
  154 + <option value="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" />
  155 + <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
  156 + <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
  157 + <option value="$PROJECT_DIR$/api/app_api/order/details_api.yml" />
  158 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
159 <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" /> 159 <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
  160 + <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
  161 + <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />
  162 + <option value="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" />
  163 + <option value="$PROJECT_DIR$/debugtalk.py" />
160 </list> 164 </list>
161 </option> 165 </option>
162 </component> 166 </component>
@@ -187,7 +191,34 @@ @@ -187,7 +191,34 @@
187 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 191 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
188 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 192 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
189 <item name="api" type="462c0819:PsiDirectoryNode" /> 193 <item name="api" type="462c0819:PsiDirectoryNode" />
  194 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  195 + </path>
  196 + <path>
  197 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  198 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  199 + <item name="api" type="462c0819:PsiDirectoryNode" />
  200 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  201 + <item name="login" type="462c0819:PsiDirectoryNode" />
  202 + </path>
  203 + <path>
  204 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  205 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  206 + <item name="api" type="462c0819:PsiDirectoryNode" />
  207 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  208 + <item name="order" type="462c0819:PsiDirectoryNode" />
  209 + </path>
  210 + <path>
  211 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  212 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  213 + <item name="api" type="462c0819:PsiDirectoryNode" />
  214 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  215 + </path>
  216 + <path>
  217 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  218 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  219 + <item name="api" type="462c0819:PsiDirectoryNode" />
190 <item name="m_api" type="462c0819:PsiDirectoryNode" /> 220 <item name="m_api" type="462c0819:PsiDirectoryNode" />
  221 + <item name="admin" type="462c0819:PsiDirectoryNode" />
191 </path> 222 </path>
192 <path> 223 <path>
193 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 224 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -203,11 +234,47 @@ @@ -203,11 +234,47 @@
203 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 234 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
204 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 235 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
205 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 236 <item name="testcases" type="462c0819:PsiDirectoryNode" />
  237 + <item name="actual" type="462c0819:PsiDirectoryNode" />
  238 + </path>
  239 + <path>
  240 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  241 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  242 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  243 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  244 + </path>
  245 + <path>
  246 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  247 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  248 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  249 + <item name="dividend" type="462c0819:PsiDirectoryNode" />
  250 + </path>
  251 + <path>
  252 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  253 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  254 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
206 <item name="dividends" type="462c0819:PsiDirectoryNode" /> 255 <item name="dividends" type="462c0819:PsiDirectoryNode" />
207 </path> 256 </path>
208 <path> 257 <path>
209 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 258 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
210 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 259 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  260 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  261 + <item name="order" type="462c0819:PsiDirectoryNode" />
  262 + </path>
  263 + <path>
  264 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  265 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  266 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  267 + <item name="partners" type="462c0819:PsiDirectoryNode" />
  268 + </path>
  269 + <path>
  270 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  271 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  272 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  273 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
  274 + </path>
  275 + <path>
  276 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  277 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
211 <item name="testsuites" type="462c0819:PsiDirectoryNode" /> 278 <item name="testsuites" type="462c0819:PsiDirectoryNode" />
212 </path> 279 </path>
213 <path> 280 <path>
@@ -228,7 +295,7 @@ @@ -228,7 +295,7 @@
228 </component> 295 </component>
229 <component name="PropertiesComponent"> 296 <component name="PropertiesComponent">
230 <property name="WebServerToolWindowFactoryState" value="false" /> 297 <property name="WebServerToolWindowFactoryState" value="false" />
231 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../task_api" /> 298 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
232 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 299 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
233 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 300 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
234 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 301 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
@@ -258,7 +325,7 @@ @@ -258,7 +325,7 @@
258 </list> 325 </list>
259 </option> 326 </option>
260 </component> 327 </component>
261 - <component name="RunManager" selected="Python.pg_db_func"> 328 + <component name="RunManager" selected="Python.debugtalk">
262 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 329 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
263 <module name="partner_api" /> 330 <module name="partner_api" />
264 <option name="INTERPRETER_OPTIONS" value="" /> 331 <option name="INTERPRETER_OPTIONS" value="" />
@@ -349,9 +416,9 @@ @@ -349,9 +416,9 @@
349 </configuration> 416 </configuration>
350 <recent_temporary> 417 <recent_temporary>
351 <list> 418 <list>
352 - <item itemvalue="Python.pg_db_func" />  
353 - <item itemvalue="Python.pg_app_db_func" />  
354 <item itemvalue="Python.debugtalk" /> 419 <item itemvalue="Python.debugtalk" />
  420 + <item itemvalue="Python.pg_app_db_func" />
  421 + <item itemvalue="Python.pg_db_func" />
355 <item itemvalue="Python.db_pg_func" /> 422 <item itemvalue="Python.db_pg_func" />
356 </list> 423 </list>
357 </recent_temporary> 424 </recent_temporary>
@@ -404,26 +471,28 @@ @@ -404,26 +471,28 @@
404 <workItem from="1597281783377" duration="7250000" /> 471 <workItem from="1597281783377" duration="7250000" />
405 <workItem from="1597383690773" duration="12705000" /> 472 <workItem from="1597383690773" duration="12705000" />
406 <workItem from="1597627721793" duration="3189000" /> 473 <workItem from="1597627721793" duration="3189000" />
  474 + <workItem from="1598498839511" duration="11432000" />
407 </task> 475 </task>
408 <servers /> 476 <servers />
409 </component> 477 </component>
410 <component name="TimeTrackingManager"> 478 <component name="TimeTrackingManager">
411 - <option name="totallyTimeSpent" value="218351000" /> 479 + <option name="totallyTimeSpent" value="229783000" />
412 </component> 480 </component>
413 <component name="ToolWindowManager"> 481 <component name="ToolWindowManager">
414 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 482 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  483 + <editor active="true" />
415 <layout> 484 <layout>
416 <window_info id="Favorites" order="0" side_tool="true" /> 485 <window_info id="Favorites" order="0" side_tool="true" />
417 - <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.31813306" /> 486 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.277897" />
418 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 487 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
419 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 488 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
420 - <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" /> 489 + <window_info anchor="bottom" id="Terminal" order="1" weight="0.2857143" />
421 <window_info anchor="bottom" id="Message" order="2" /> 490 <window_info anchor="bottom" id="Message" order="2" />
422 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" /> 491 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" />
423 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" /> 492 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" />
424 <window_info anchor="bottom" id="Python Console" order="5" weight="0.328125" /> 493 <window_info anchor="bottom" id="Python Console" order="5" weight="0.328125" />
425 <window_info anchor="bottom" id="Database Changes" order="6" /> 494 <window_info anchor="bottom" id="Database Changes" order="6" />
426 - <window_info anchor="bottom" id="Run" order="7" sideWeight="0.49946353" weight="0.32700893" /> 495 + <window_info active="true" anchor="bottom" id="Run" order="7" sideWeight="0.49946353" visible="true" weight="0.32700893" />
427 <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" /> 496 <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" />
428 <window_info anchor="bottom" id="Debug" order="9" weight="0.4" /> 497 <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
429 <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" /> 498 <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
@@ -440,208 +509,133 @@ @@ -440,208 +509,133 @@
440 <option name="version" value="1" /> 509 <option name="version" value="1" />
441 </component> 510 </component>
442 <component name="editorHistoryManager"> 511 <component name="editorHistoryManager">
443 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">  
444 - <provider selected="true" editor-type-id="text-editor">  
445 - <state relative-caret-position="20">  
446 - <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />  
447 - </state>  
448 - </provider>  
449 - </entry>  
450 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">  
451 - <provider selected="true" editor-type-id="text-editor">  
452 - <state relative-caret-position="5">  
453 - <caret line="3" column="46" lean-forward="true" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="46" />  
454 - </state>  
455 - </provider>  
456 - </entry>  
457 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">  
458 - <provider selected="true" editor-type-id="text-editor">  
459 - <state relative-caret-position="52">  
460 - <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />  
461 - </state>  
462 - </provider>  
463 - </entry>  
464 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml"> 512 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
465 <provider selected="true" editor-type-id="text-editor"> 513 <provider selected="true" editor-type-id="text-editor">
466 - <state relative-caret-position="421">  
467 - <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" /> 514 + <state relative-caret-position="494">
  515 + <caret line="19" column="42" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="42" />
468 </state> 516 </state>
469 </provider> 517 </provider>
470 </entry> 518 </entry>
471 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml"> 519 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml">
472 <provider selected="true" editor-type-id="text-editor"> 520 <provider selected="true" editor-type-id="text-editor">
473 - <state relative-caret-position="52">  
474 - <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" /> 521 + <state relative-caret-position="78">
  522 + <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
475 </state> 523 </state>
476 </provider> 524 </provider>
477 </entry> 525 </entry>
478 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml"> 526 + <entry file="file://$PROJECT_DIR$/helpfunc/header_func.py">
479 <provider selected="true" editor-type-id="text-editor" /> 527 <provider selected="true" editor-type-id="text-editor" />
480 </entry> 528 </entry>
481 - <entry file="file://$PROJECT_DIR$/.env">  
482 - <provider selected="true" editor-type-id="text-editor">  
483 - <state relative-caret-position="182">  
484 - <caret line="7" selection-start-line="7" selection-end-line="7" />  
485 - </state>  
486 - </provider>  
487 - </entry>  
488 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">  
489 - <provider selected="true" editor-type-id="text-editor">  
490 - <state relative-caret-position="78">  
491 - <caret line="3" column="40" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="40" />  
492 - </state>  
493 - </provider>  
494 - </entry>  
495 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml"> 529 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
496 <provider selected="true" editor-type-id="text-editor"> 530 <provider selected="true" editor-type-id="text-editor">
497 - <state relative-caret-position="78">  
498 - <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" /> 531 + <state relative-caret-position="177">
  532 + <caret line="77" column="19" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="19" />
499 </state> 533 </state>
500 </provider> 534 </provider>
501 </entry> 535 </entry>
502 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">  
503 - <provider selected="true" editor-type-id="text-editor">  
504 - <state relative-caret-position="-47" />  
505 - </provider>  
506 - </entry>  
507 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml"> 536 + <entry file="file://$PROJECT_DIR$/.env">
508 <provider selected="true" editor-type-id="text-editor"> 537 <provider selected="true" editor-type-id="text-editor">
509 - <state relative-caret-position="104">  
510 - <caret line="4" column="59" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="59" /> 538 + <state relative-caret-position="234">
  539 + <caret line="9" column="8" selection-start-line="9" selection-end-line="9" selection-end-column="8" />
511 </state> 540 </state>
512 </provider> 541 </provider>
513 </entry> 542 </entry>
514 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml"> 543 + <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
515 <provider selected="true" editor-type-id="text-editor"> 544 <provider selected="true" editor-type-id="text-editor">
516 - <state relative-caret-position="104">  
517 - <caret line="4" column="48" lean-forward="true" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="48" /> 545 + <state relative-caret-position="525">
  546 + <caret line="28" lean-forward="true" selection-start-line="17" selection-end-line="28" />
518 </state> 547 </state>
519 </provider> 548 </provider>
520 </entry> 549 </entry>
521 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml"> 550 + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml">
522 <provider selected="true" editor-type-id="text-editor"> 551 <provider selected="true" editor-type-id="text-editor">
523 - <state relative-caret-position="78">  
524 - <caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" /> 552 + <state relative-caret-position="213">
  553 + <caret line="9" column="82" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="82" />
525 </state> 554 </state>
526 </provider> 555 </provider>
527 </entry> 556 </entry>
528 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml"> 557 + <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml">
529 <provider selected="true" editor-type-id="text-editor"> 558 <provider selected="true" editor-type-id="text-editor">
530 - <state relative-caret-position="78">  
531 - <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" /> 559 + <state relative-caret-position="182">
  560 + <caret line="7" column="61" selection-start-line="7" selection-start-column="61" selection-end-line="7" selection-end-column="61" />
532 </state> 561 </state>
533 </provider> 562 </provider>
534 </entry> 563 </entry>
535 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml"> 564 + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml">
536 <provider selected="true" editor-type-id="text-editor"> 565 <provider selected="true" editor-type-id="text-editor">
537 - <state relative-caret-position="78">  
538 - <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" /> 566 + <state relative-caret-position="130">
  567 + <caret line="5" column="65" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="65" />
539 </state> 568 </state>
540 </provider> 569 </provider>
541 </entry> 570 </entry>
542 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml"> 571 + <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
543 <provider selected="true" editor-type-id="text-editor" /> 572 <provider selected="true" editor-type-id="text-editor" />
544 </entry> 573 </entry>
545 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">  
546 - <provider selected="true" editor-type-id="text-editor">  
547 - <state relative-caret-position="130">  
548 - <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />  
549 - </state>  
550 - </provider>  
551 - </entry>  
552 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml"> 574 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
553 <provider selected="true" editor-type-id="text-editor"> 575 <provider selected="true" editor-type-id="text-editor">
554 - <state relative-caret-position="130">  
555 - <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" /> 576 + <state relative-caret-position="279">
  577 + <caret line="362" column="13" selection-start-line="362" selection-start-column="8" selection-end-line="362" selection-end-column="13" />
  578 + <folding>
  579 + <element signature="e#108#123#0" expanded="true" />
  580 + </folding>
556 </state> 581 </state>
557 </provider> 582 </provider>
558 </entry> 583 </entry>
559 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml"> 584 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
560 <provider selected="true" editor-type-id="text-editor"> 585 <provider selected="true" editor-type-id="text-editor">
561 - <state relative-caret-position="130">  
562 - <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" /> 586 + <state relative-caret-position="279">
  587 + <caret line="243" column="13" selection-start-line="243" selection-start-column="8" selection-end-line="243" selection-end-column="13" />
563 </state> 588 </state>
564 </provider> 589 </provider>
565 </entry> 590 </entry>
566 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml"> 591 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">
567 <provider selected="true" editor-type-id="text-editor"> 592 <provider selected="true" editor-type-id="text-editor">
568 - <state relative-caret-position="78">  
569 - <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" /> 593 + <state relative-caret-position="234">
  594 + <caret line="9" column="45" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="45" />
570 </state> 595 </state>
571 </provider> 596 </provider>
572 </entry> 597 </entry>
573 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml"> 598 + <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml">
574 <provider selected="true" editor-type-id="text-editor"> 599 <provider selected="true" editor-type-id="text-editor">
575 - <state relative-caret-position="104">  
576 - <caret line="4" column="57" selection-start-line="4" selection-start-column="47" selection-end-line="4" selection-end-column="57" /> 600 + <state relative-caret-position="234">
  601 + <caret line="9" column="51" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
577 </state> 602 </state>
578 </provider> 603 </provider>
579 </entry> 604 </entry>
580 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml"> 605 + <entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml">
581 <provider selected="true" editor-type-id="text-editor" /> 606 <provider selected="true" editor-type-id="text-editor" />
582 </entry> 607 </entry>
583 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">  
584 - <provider selected="true" editor-type-id="text-editor">  
585 - <state relative-caret-position="78">  
586 - <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />  
587 - </state>  
588 - </provider>  
589 - </entry>  
590 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">  
591 - <provider selected="true" editor-type-id="text-editor">  
592 - <state relative-caret-position="104">  
593 - <caret line="4" column="49" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="49" />  
594 - </state>  
595 - </provider>  
596 - </entry>  
597 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">  
598 - <provider selected="true" editor-type-id="text-editor">  
599 - <state relative-caret-position="104">  
600 - <caret line="4" column="38" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="38" />  
601 - </state>  
602 - </provider>  
603 - </entry>  
604 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml"> 608 + <entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
605 <provider selected="true" editor-type-id="text-editor"> 609 <provider selected="true" editor-type-id="text-editor">
606 - <state relative-caret-position="78">  
607 - <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />  
608 - </state> 610 + <state relative-caret-position="-78" />
609 </provider> 611 </provider>
610 </entry> 612 </entry>
611 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml"> 613 + <entry file="file://$PROJECT_DIR$/api/app_api/order/details_api.yml">
612 <provider selected="true" editor-type-id="text-editor"> 614 <provider selected="true" editor-type-id="text-editor">
613 - <state relative-caret-position="78">  
614 - <caret line="3" column="38" selection-start-line="3" selection-start-column="38" selection-end-line="3" selection-end-column="38" /> 615 + <state relative-caret-position="182">
  616 + <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
615 </state> 617 </state>
616 </provider> 618 </provider>
617 </entry> 619 </entry>
618 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/api.py">  
619 - <provider selected="true" editor-type-id="text-editor">  
620 - <state relative-caret-position="280">  
621 - <caret line="64" selection-start-line="64" selection-end-line="64" />  
622 - </state>  
623 - </provider> 620 + <entry file="file://$PROJECT_DIR$/api/app_api/order/list_api.yml">
  621 + <provider selected="true" editor-type-id="text-editor" />
624 </entry> 622 </entry>
625 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml"> 623 + <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml">
626 <provider selected="true" editor-type-id="text-editor"> 624 <provider selected="true" editor-type-id="text-editor">
627 - <state relative-caret-position="78">  
628 - <caret line="3" column="38" selection-start-line="3" selection-start-column="38" selection-end-line="3" selection-end-column="38" /> 625 + <state relative-caret-position="806">
  626 + <caret line="31" selection-start-line="31" selection-end-line="42" selection-end-column="30" />
629 </state> 627 </state>
630 </provider> 628 </provider>
631 </entry> 629 </entry>
632 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml"> 630 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
633 <provider selected="true" editor-type-id="text-editor"> 631 <provider selected="true" editor-type-id="text-editor">
634 - <state relative-caret-position="416">  
635 - <caret line="16" column="12" lean-forward="true" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" /> 632 + <state relative-caret-position="156">
  633 + <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
636 </state> 634 </state>
637 </provider> 635 </provider>
638 </entry> 636 </entry>
639 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">  
640 - <provider selected="true" editor-type-id="text-editor">  
641 - <state>  
642 - <caret column="11" selection-start-column="11" selection-end-column="11" />  
643 - </state>  
644 - </provider> 637 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
  638 + <provider selected="true" editor-type-id="text-editor" />
645 </entry> 639 </entry>
646 <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml"> 640 <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
647 <provider selected="true" editor-type-id="text-editor"> 641 <provider selected="true" editor-type-id="text-editor">
@@ -657,127 +651,130 @@ @@ -657,127 +651,130 @@
657 </state> 651 </state>
658 </provider> 652 </provider>
659 </entry> 653 </entry>
660 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 654 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml">
661 <provider selected="true" editor-type-id="text-editor"> 655 <provider selected="true" editor-type-id="text-editor">
662 - <state relative-caret-position="-3712">  
663 - <caret line="77" column="34" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="34" />  
664 - <folding>  
665 - <element signature="e#108#123#0" expanded="true" />  
666 - </folding> 656 + <state relative-caret-position="338">
  657 + <caret line="13" column="53" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />
667 </state> 658 </state>
668 </provider> 659 </provider>
669 </entry> 660 </entry>
670 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">  
671 - <provider selected="true" editor-type-id="text-editor">  
672 - <state relative-caret-position="494">  
673 - <caret line="19" column="42" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="42" />  
674 - </state>  
675 - </provider> 661 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
  662 + <provider selected="true" editor-type-id="text-editor" />
676 </entry> 663 </entry>
677 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml"> 664 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
678 <provider selected="true" editor-type-id="text-editor"> 665 <provider selected="true" editor-type-id="text-editor">
679 - <state relative-caret-position="312">  
680 - <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" /> 666 + <state relative-caret-position="468">
  667 + <caret line="18" selection-start-line="18" selection-end-line="18" />
681 </state> 668 </state>
682 </provider> 669 </provider>
683 </entry> 670 </entry>
684 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">  
685 - <provider selected="true" editor-type-id="text-editor">  
686 - <state relative-caret-position="312">  
687 - <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />  
688 - </state>  
689 - </provider> 671 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
  672 + <provider selected="true" editor-type-id="text-editor" />
690 </entry> 673 </entry>
691 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml">  
692 - <provider selected="true" editor-type-id="text-editor">  
693 - <state relative-caret-position="338">  
694 - <caret line="13" column="53" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />  
695 - </state>  
696 - </provider> 674 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
  675 + <provider selected="true" editor-type-id="text-editor" />
697 </entry> 676 </entry>
698 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml">  
699 - <provider selected="true" editor-type-id="text-editor">  
700 - <state relative-caret-position="442">  
701 - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />  
702 - </state>  
703 - </provider> 677 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">
  678 + <provider selected="true" editor-type-id="text-editor" />
704 </entry> 679 </entry>
705 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml"> 680 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml">
706 <provider selected="true" editor-type-id="text-editor"> 681 <provider selected="true" editor-type-id="text-editor">
707 - <state relative-caret-position="312">  
708 - <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" /> 682 + <state relative-caret-position="156">
  683 + <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
709 </state> 684 </state>
710 </provider> 685 </provider>
711 </entry> 686 </entry>
712 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 687 + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml">
713 <provider selected="true" editor-type-id="text-editor"> 688 <provider selected="true" editor-type-id="text-editor">
714 - <state relative-caret-position="364">  
715 - <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> 689 + <state relative-caret-position="260">
  690 + <caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
716 </state> 691 </state>
717 </provider> 692 </provider>
718 </entry> 693 </entry>
719 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 694 + <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml">
720 <provider selected="true" editor-type-id="text-editor"> 695 <provider selected="true" editor-type-id="text-editor">
721 - <state relative-caret-position="338">  
722 - <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="53" /> 696 + <state relative-caret-position="260">
  697 + <caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
723 </state> 698 </state>
724 </provider> 699 </provider>
725 </entry> 700 </entry>
726 <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml"> 701 <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml">
727 <provider selected="true" editor-type-id="text-editor"> 702 <provider selected="true" editor-type-id="text-editor">
728 - <state relative-caret-position="468"> 703 + <state relative-caret-position="450">
729 <caret line="18" column="12" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" /> 704 <caret line="18" column="12" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" />
730 </state> 705 </state>
731 </provider> 706 </provider>
732 </entry> 707 </entry>
733 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 708 + <entry file="file://$PROJECT_DIR$/testcases/order/order_details_testcases.yml">
734 <provider selected="true" editor-type-id="text-editor"> 709 <provider selected="true" editor-type-id="text-editor">
735 - <state relative-caret-position="3302">  
736 - <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" /> 710 + <state relative-caret-position="78">
  711 + <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
737 </state> 712 </state>
738 </provider> 713 </provider>
739 </entry> 714 </entry>
740 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 715 + <entry file="file://$PROJECT_DIR$/testcases/order/order_list_testcases.yml">
  716 + <provider selected="true" editor-type-id="text-editor" />
  717 + </entry>
  718 + <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml">
741 <provider selected="true" editor-type-id="text-editor"> 719 <provider selected="true" editor-type-id="text-editor">
742 - <state relative-caret-position="130">  
743 - <caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />  
744 - <folding>  
745 - <element signature="e#0#13#0" expanded="true" />  
746 - </folding> 720 + <state relative-caret-position="442">
  721 + <caret line="17" selection-start-line="17" selection-end-line="34" selection-end-column="30" />
747 </state> 722 </state>
748 </provider> 723 </provider>
749 </entry> 724 </entry>
750 - <entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml"> 725 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
751 <provider selected="true" editor-type-id="text-editor" /> 726 <provider selected="true" editor-type-id="text-editor" />
752 </entry> 727 </entry>
753 - <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml"> 728 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
754 <provider selected="true" editor-type-id="text-editor" /> 729 <provider selected="true" editor-type-id="text-editor" />
755 </entry> 730 </entry>
756 - <entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml">  
757 - <provider selected="true" editor-type-id="text-editor">  
758 - <state relative-caret-position="104">  
759 - <caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="52" />  
760 - </state>  
761 - </provider> 731 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
  732 + <provider selected="true" editor-type-id="text-editor" />
762 </entry> 733 </entry>
763 - <entry file="file://$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml">  
764 - <provider selected="true" editor-type-id="text-editor">  
765 - <state relative-caret-position="317">  
766 - <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />  
767 - </state>  
768 - </provider> 734 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
  735 + <provider selected="true" editor-type-id="text-editor" />
  736 + </entry>
  737 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
  738 + <provider selected="true" editor-type-id="text-editor" />
  739 + </entry>
  740 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
  741 + <provider selected="true" editor-type-id="text-editor" />
  742 + </entry>
  743 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
  744 + <provider selected="true" editor-type-id="text-editor" />
  745 + </entry>
  746 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
  747 + <provider selected="true" editor-type-id="text-editor" />
  748 + </entry>
  749 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
  750 + <provider selected="true" editor-type-id="text-editor" />
769 </entry> 751 </entry>
770 - <entry file="file://$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml"> 752 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
  753 + <provider selected="true" editor-type-id="text-editor" />
  754 + </entry>
  755 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml">
  756 + <provider selected="true" editor-type-id="text-editor" />
  757 + </entry>
  758 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml">
  759 + <provider selected="true" editor-type-id="text-editor" />
  760 + </entry>
  761 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml">
  762 + <provider selected="true" editor-type-id="text-editor" />
  763 + </entry>
  764 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
771 <provider selected="true" editor-type-id="text-editor"> 765 <provider selected="true" editor-type-id="text-editor">
772 - <state>  
773 - <caret column="10" selection-start-column="10" selection-end-column="10" /> 766 + <state relative-caret-position="135">
  767 + <caret line="6" column="38" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="38" />
774 </state> 768 </state>
775 </provider> 769 </provider>
776 </entry> 770 </entry>
777 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 771 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
778 <provider selected="true" editor-type-id="text-editor"> 772 <provider selected="true" editor-type-id="text-editor">
779 - <state relative-caret-position="-1092">  
780 - <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" /> 773 + <state relative-caret-position="463">
  774 + <caret line="55" column="49" selection-start-line="55" selection-start-column="49" selection-end-line="55" selection-end-column="49" />
  775 + <folding>
  776 + <element signature="e#0#13#0" expanded="true" />
  777 + </folding>
781 </state> 778 </state>
782 </provider> 779 </provider>
783 </entry> 780 </entry>
@@ -5,7 +5,7 @@ variables: @@ -5,7 +5,7 @@ variables:
5 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
6 var_access_token: ${get_accesstoken()} 6 var_access_token: ${get_accesstoken()}
7 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
8 - order_code: ${get_detailAction_0_order_code_from_database()} 8 + order_code: ${get_detailAction_1_order_code_from_database()}
9 plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()} 9 plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()}
10 use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} 10 use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()}
11 endTime: ${get_Decembe_timestamp()} 11 endTime: ${get_Decembe_timestamp()}
@@ -6,8 +6,8 @@ variables: @@ -6,8 +6,8 @@ variables:
6 access_token: '' 6 access_token: ''
7 sign: ${make_sign($currtime, $uuid,$access_token)} 7 sign: ${make_sign($currtime, $uuid,$access_token)}
8 grantType: signInPassword 8 grantType: signInPassword
9 - phone: ${get_partner_account_from_database(partner_info)}  
10 - password: ${get_partner_password_from_database(partner_info)} 9 + phone: ${get_partner_account_from_database()}
  10 + password: ${get_partner_password_from_database()}
11 teardown_hooks: 11 teardown_hooks:
12 - ${teardown_hook_get_authcode($response)} 12 - ${teardown_hook_get_authcode($response)}
13 request: 13 request:
@@ -5,6 +5,7 @@ variables: @@ -5,6 +5,7 @@ variables:
5 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
6 var_access_token: ${get_accesstoken()} 6 var_access_token: ${get_accesstoken()}
7 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
  8 + id: ${get_order_id_from_database()}
8 msg: 成功 9 msg: 成功
9 request: 10 request:
10 headers: 11 headers:
@@ -29,19 +29,15 @@ validate: @@ -29,19 +29,15 @@ validate:
29 - eq: 29 - eq:
30 - content.msg 30 - content.msg
31 - $msg 31 - $msg
32 -  
33 - eq: 32 - eq:
34 - content.data.statistics.cumulativeMoney 33 - content.data.statistics.cumulativeMoney
35 - $cumulativeMoney 34 - $cumulativeMoney
36 -  
37 - eq: 35 - eq:
38 - content.data.statistics.cumulativeQuantity 36 - content.data.statistics.cumulativeQuantity
39 - $cumulativeQuantity 37 - $cumulativeQuantity
40 -  
41 - eq: 38 - eq:
42 - content.data.statistics.todayRealMoney 39 - content.data.statistics.todayRealMoney
43 - $todayRealMoney 40 - $todayRealMoney
44 -  
45 - eq: 41 - eq:
46 - content.data.statistics.todayRealQuantity 42 - content.data.statistics.todayRealQuantity
47 - $todayRealQuantity 43 - $todayRealQuantity
1 name: 查看意向订单详情 1 name: 查看意向订单详情
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderStatue: ${get_purpose_order_status_from_database(order)}  
5 - id: ${get_purpose_id_from_database(order)} 4 + id: ${get_purpose_id_from_database()}
6 request: 5 request:
7 headers: 6 headers:
8 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
@@ -15,7 +14,4 @@ request: @@ -15,7 +14,4 @@ request:
15 validate: 14 validate:
16 - eq: 15 - eq:
17 - content.msg 16 - content.msg
18 - - ok  
19 - - eq:  
20 - - content.data.orderStatue  
21 - - $orderStatue  
  17 + - ok
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMzE1NjEsImlzcyI6Imp3dCJ9.SCmOoYbOdyBU5r1TFKqMBc2mE1Bl5DKczz0qwPYGCDQ  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTg1MjU3NDgsImlzcyI6Imp3dCJ9.iotyp9M5L_NkNwjAN1pmgyzdC3P0uz2HqaoA41_tofk
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTcyMjUyNjEsImlzcyI6Imp3dCJ9.Uf0zt3mGOTazmo7kUSPFfKrziMtPQNPFpR23WYwgzQs  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTg1MTk0NDgsImlzcyI6Imp3dCJ9.PzdQ2IZB9FBsOIWQ2bUfcNfCWgsN8TBZlEzCRmy1a5M
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTc0MzkwMTAsImlhdCI6MTU5NzM5NTgxMCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzM5NTgxMCwidWlkIjoxOH0.8DkBF75udtyGNq4xH4LNnXtYXZH3SeAPpeP944JFka0  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg1NjE3NDIsImlhdCI6MTU5ODUxODU0MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5ODUxODU0MiwidWlkIjoxOH0.yM7bvqkMJNW9-cNrQt4f5VEV6bcNV0syOC7sAwWQPGA
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE1OTk4MTYzNjEsImlzcyI6Imp3dCJ9.zr9lz7ptdaJxXew2QElTBhyJ-39zJxjP6jNxjMK0zyo  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI5LCJleHAiOjE2MDExMTA1NDgsImlzcyI6Imp3dCJ9.qNFWG4joHY93kPIJvvnwxL3hpS9K8h8Wr_wBr7JSA4Q
@@ -46,7 +46,7 @@ def create_phone_number(num): @@ -46,7 +46,7 @@ def create_phone_number(num):
46 phone_number = [] 46 phone_number = []
47 for i in range(num): 47 for i in range(num):
48 number = random.randint(0,9) 48 number = random.randint(0,9)
49 - phone_number.append('1%d%d%08d'%(get_minute(),number+1,number+2)) 49 + phone_number.append('1%d%d%07d'%(get_minute(),number+1,number))
50 return phone_number 50 return phone_number
51 def getMonth(): 51 def getMonth():
52 year = str(datetime.date.today().year) 52 year = str(datetime.date.today().year)
@@ -106,7 +106,22 @@ def get_partner_account_from_database(): @@ -106,7 +106,22 @@ def get_partner_account_from_database():
106 print(err) 106 print(err)
107 db.rollback() 107 db.rollback()
108 db.close() 108 db.close()
109 - 109 +#获取合伙人密码
  110 +def get_partner_password_from_database():
  111 + db = GetConnect()
  112 + cursor = db.cursor()
  113 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  114 + sql = '''select "password" from partner_info where account = \'{}\''''.format(get_partner_account_from_database())
  115 + # print(sql)
  116 + try:
  117 + cursor.execute(sql)
  118 + result = cursor.fetchone()
  119 + return result[0]
  120 + except Exception as err:
  121 + # 发生错误时回滚
  122 + print(err)
  123 + db.rollback()
  124 + db.close()
110 #累计实发订单 125 #累计实发订单
111 def get_cumulativeQuantity_from_database(): 126 def get_cumulativeQuantity_from_database():
112 db = GetConnect() 127 db = GetConnect()
@@ -130,7 +145,7 @@ def get_cumulativeMoney_from_database(): @@ -130,7 +145,7 @@ def get_cumulativeMoney_from_database():
130 cursor = db.cursor() 145 cursor = db.cursor()
131 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 146 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
132 sql = '''select sum(plan_order_amount) from order_base where partner_id = {} and order_type in (1) '''.format(get_partner_id_from_database()) 147 sql = '''select sum(plan_order_amount) from order_base where partner_id = {} and order_type in (1) '''.format(get_partner_id_from_database())
133 - # print(sql) 148 + print(sql)
134 try: 149 try:
135 cursor.execute(sql) 150 cursor.execute(sql)
136 result = cursor.fetchone() 151 result = cursor.fetchone()
@@ -143,7 +158,6 @@ def get_cumulativeMoney_from_database(): @@ -143,7 +158,6 @@ def get_cumulativeMoney_from_database():
143 print(err) 158 print(err)
144 db.rollback() 159 db.rollback()
145 db.close() 160 db.close()
146 -# print(get_cumulativeMoney_from_database())  
147 #今日新增实发订单金额 161 #今日新增实发订单金额
148 def get_todayRealMoney_from_database(): 162 def get_todayRealMoney_from_database():
149 db = GetConnect() 163 db = GetConnect()
@@ -258,12 +272,12 @@ def get_received_from_database(): @@ -258,12 +272,12 @@ def get_received_from_database():
258 db.rollback() 272 db.rollback()
259 db.close() 273 db.close()
260 274
261 -#已收/未收明细列表--发货单号 275 +#已收明细列表--发货单号
262 def get_detailAction_0_order_code_from_database(): 276 def get_detailAction_0_order_code_from_database():
263 db = GetConnect() 277 db = GetConnect()
264 cursor = db.cursor() 278 cursor = db.cursor()
265 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 279 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
266 - sql = '''select order_code from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database()) 280 + sql = '''select delivery_code from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(get_partner_id_from_database())
267 # print(sql) 281 # print(sql)
268 try: 282 try:
269 cursor.execute(sql) 283 cursor.execute(sql)
@@ -275,6 +289,22 @@ def get_detailAction_0_order_code_from_database(): @@ -275,6 +289,22 @@ def get_detailAction_0_order_code_from_database():
275 db.rollback() 289 db.rollback()
276 db.close() 290 db.close()
277 291
  292 +#未收明细列表--发货单号
  293 +def get_detailAction_1_order_code_from_database():
  294 + db = GetConnect()
  295 + cursor = db.cursor()
  296 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  297 + sql = '''select delivery_code from order_base where partner_id = {} and order_type=1 and partner_bonus_not > 0 order by id desc '''.format(get_partner_id_from_database())
  298 + # print(sql)
  299 + try:
  300 + cursor.execute(sql)
  301 + result = cursor.fetchone()
  302 + return result[0]
  303 + except Exception as err:
  304 + # 发生错误时回滚
  305 + print(err)
  306 + db.rollback()
  307 + db.close()
278 308
279 #已收/未收明细列表--订单金额 309 #已收/未收明细列表--订单金额
280 def get_detailAction_0_plan_order_amount_from_database(): 310 def get_detailAction_0_plan_order_amount_from_database():
@@ -303,10 +333,33 @@ def get_detailAction_0_use_partner_bonus_amount_from_database(): @@ -303,10 +333,33 @@ def get_detailAction_0_use_partner_bonus_amount_from_database():
303 try: 333 try:
304 cursor.execute(sql) 334 cursor.execute(sql)
305 result = cursor.fetchone() 335 result = cursor.fetchone()
  336 + if result[0] == -1.0:
  337 + sql = '''select partner_bonus_has from order_base where partner_id = {} and order_type=1 and partner_bonus_has > 0 order by id desc '''.format(
  338 + get_partner_id_from_database())
  339 + cursor.execute(sql)
  340 + result = cursor.fetchone()
  341 + return result[0]
  342 + else:
  343 + return result[0]
  344 + except Exception as err:
  345 + # 发生错误时回滚
  346 + print(err)
  347 + db.rollback()
  348 + db.close()
  349 +
  350 +#获取订单id
  351 +def get_order_id_from_database():
  352 + db = GetConnect()
  353 + cursor = db.cursor()
  354 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  355 + sql = '''select id from order_base where partner_id = {} and order_type=1 order by id desc '''.format(get_partner_id_from_database())
  356 + # print(sql)
  357 + try:
  358 + cursor.execute(sql)
  359 + result = cursor.fetchone()
306 return result[0] 360 return result[0]
307 except Exception as err: 361 except Exception as err:
308 # 发生错误时回滚 362 # 发生错误时回滚
309 print(err) 363 print(err)
310 db.rollback() 364 db.rollback()
311 db.close() 365 db.close()
312 -# print(get_detailAction_0_use_partner_bonus_amount_from_database())  
@@ -139,7 +139,6 @@ def get_dividends_ID_from_database(id): @@ -139,7 +139,6 @@ def get_dividends_ID_from_database(id):
139 print(err) 139 print(err)
140 db.rollback() 140 db.rollback()
141 db.close() 141 db.close()
142 -print(get_dividends_ID_from_database(0))  
143 #意向订单的产品名称 142 #意向订单的产品名称
144 def get_productName_from_database(id): 143 def get_productName_from_database(id):
145 db = GetConnect() 144 db = GetConnect()
@@ -245,4 +244,3 @@ def get_status_from_database(): @@ -245,4 +244,3 @@ def get_status_from_database():
245 print(err) 244 print(err)
246 db.rollback() 245 db.rollback()
247 db.close() 246 db.close()
248 -# print(get_status_from_database())  
1 { 1 {
2 "testcase":[ 2 "testcase":[
3 - "testcases/partners/PARTNERS004_list_partner_testcases.yml" 3 + "testcases/admin/ADMIN001_add_admin_testcases.yml"
4 ] 4 ]
5 } 5 }
@@ -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(10)} 7 + - ${sleep(2)}
8 8
9 teststeps: 9 teststeps:
10 - name: $phone 登录系统 10 - name: $phone 登录系统
@@ -8,7 +8,7 @@ config: @@ -8,7 +8,7 @@ config:
8 use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} 8 use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()}
9 msg: 成功 9 msg: 成功
10 teardown_hooks: 10 teardown_hooks:
11 - - ${sleep(3)} 11 + - ${sleep(2)}
12 12
13 teststeps: 13 teststeps:
14 - name: $phone 登录系统 14 - name: $phone 登录系统
@@ -3,7 +3,7 @@ config: @@ -3,7 +3,7 @@ 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()} 5 phone: ${get_partner_account_from_database()}
6 - order_code: ${get_detailAction_0_order_code_from_database()} 6 + order_code: ${get_detailAction_1_order_code_from_database()}
7 plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()} 7 plan_order_amount: ${get_detailAction_0_plan_order_amount_from_database()}
8 use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()} 8 use_partner_bonus: ${get_detailAction_0_use_partner_bonus_amount_from_database()}
9 msg: 成功 9 msg: 成功
@@ -8,7 +8,7 @@ config: @@ -8,7 +8,7 @@ config:
8 outstanding: ${get_outstanding_from_database()} 8 outstanding: ${get_outstanding_from_database()}
9 msg: 成功 9 msg: 成功
10 teardown_hooks: 10 teardown_hooks:
11 - - ${sleep(3)} 11 + - ${sleep(2)}
12 12
13 teststeps: 13 teststeps:
14 - name: $phone 登录系统 14 - name: $phone 登录系统
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: APP登录用例 2 name: APP登录用例
3 base_url: ${ENV(base_url)} 3 base_url: ${ENV(base_url)}
4 variables: 4 variables:
5 - phone: ${get_partner_account_from_database(partner_info)} 5 + phone: ${get_partner_account_from_database()}
6 6
7 teststeps: 7 teststeps:
8 8
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: 订单详情 2 name: 订单详情
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - phone: ${get_partner_account_from_database(partner_info)} 5 + phone: ${get_partner_account_from_database()}
6 msg: 成功 6 msg: 成功
7 teardown_hooks: 7 teardown_hooks:
8 - ${sleep(2)} 8 - ${sleep(2)}
1 config: 1 config:
2 name: 订单统计 2 name: 订单统计
3 - base_url: ${ENV(base_manager_url)} 3 + base_url: ${ENV(base_url)}
4 variables: 4 variables:
5 phone: ${get_partner_account_from_database()} 5 phone: ${get_partner_account_from_database()}
6 todayRealQuantity: ${get_todayRealQuantity_from_database()} 6 todayRealQuantity: ${get_todayRealQuantity_from_database()}
@@ -12,7 +12,7 @@ config: @@ -12,7 +12,7 @@ config:
12 - ${sleep(2)} 12 - ${sleep(2)}
13 13
14 teststeps: 14 teststeps:
15 -- name: $phone 登录系统 15 +- name: 登录系统
16 testcase: testcases/login_testcases.yml 16 testcase: testcases/login_testcases.yml
17 17
18 - name: $phone 订单统计 18 - name: $phone 订单统计
@@ -21,19 +21,15 @@ teststeps: @@ -21,19 +21,15 @@ teststeps:
21 - eq: 21 - eq:
22 - content.msg 22 - content.msg
23 - $msg 23 - $msg
24 -  
25 - eq: 24 - eq:
26 - content.data.statistics.cumulativeMoney 25 - content.data.statistics.cumulativeMoney
27 - $cumulativeMoney 26 - $cumulativeMoney
28 -  
29 - eq: 27 - eq:
30 - content.data.statistics.cumulativeQuantity 28 - content.data.statistics.cumulativeQuantity
31 - $cumulativeQuantity 29 - $cumulativeQuantity
32 -  
33 - eq: 30 - eq:
34 - content.data.statistics.todayRealMoney 31 - content.data.statistics.todayRealMoney
35 - $todayRealMoney 32 - $todayRealMoney
36 -  
37 - eq: 33 - eq:
38 - content.data.statistics.todayRealQuantity 34 - content.data.statistics.todayRealQuantity
39 - $todayRealQuantity 35 - $todayRealQuantity
@@ -3,7 +3,6 @@ config: @@ -3,7 +3,6 @@ config:
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - orderStatue: ${get_purpose_order_status_from_database(order)}  
7 teardown_hooks: 6 teardown_hooks:
8 - ${sleep(2)} 7 - ${sleep(2)}
9 8
@@ -17,6 +16,3 @@ teststeps: @@ -17,6 +16,3 @@ teststeps:
17 - eq: 16 - eq:
18 - content.msg 17 - content.msg
19 - ok 18 - ok
20 - - eq:  
21 - - content.data.orderStatue  
22 - - $orderStatue  
1 -  
2 config: 1 config:
3 name: 合伙人测试集 2 name: 合伙人测试集
4 testcases: 3 testcases:
5 -  
6 - name: ADMIN001：新增管理员 4 - name: ADMIN001：新增管理员
7 testcase: testcases/admin/ADMIN001_add_admin_testcases.yml 5 testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
8 parameters: 6 parameters:
@@ -16,7 +14,7 @@ testcases: @@ -16,7 +14,7 @@ testcases:
16 14
17 - name: ADMIN004：查看管理员 15 - name: ADMIN004：查看管理员
18 testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml 16 testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml
19 -# 17 +
20 - name: ADMIN005：禁用管理员 18 - name: ADMIN005：禁用管理员
21 testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml 19 testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml
22 20
@@ -45,7 +43,7 @@ testcases: @@ -45,7 +43,7 @@ testcases:
45 43
46 - name: PARTNERS006：启用合伙人 44 - name: PARTNERS006：启用合伙人
47 testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml 45 testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
48 -# 46 +
49 - name: ACTUAL001：新增实际订单 47 - name: ACTUAL001：新增实际订单
50 testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml 48 testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
51 parameters: 49 parameters: