bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 6660495dcc11e74ddb2fccaab4bfaa98b58ace1d 1 个父辈 f2d9a188

add README

内嵌 并排对比
正在显示 33 个修改的文件 包含 582 行增加 和 306 行删除
@@ -2,21 +2,35 @@ @@ -2,21 +2,35 @@
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/m_api/actual/m_order_actual_del_api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml" afterDir="false" />
  8 + <change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml" afterDir="false" />
  9 + <change afterPath="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" afterDir="false" />
  10 + <change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" afterDir="false" />  
8 <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" /> 12 <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" afterDir="false" /> 13 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" afterDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" afterDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" afterDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" afterDir="false" />
12 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> 25 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" /> 26 <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" />
14 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" /> 27 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
15 <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" /> 28 <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" />
16 - <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" afterDir="false" />  
17 <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" /> 29 <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" />
18 - <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" afterDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" afterDir="false" /> 30 + <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" afterDir="false" />
  31 + <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" afterDir="false" />
  32 + <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" afterDir="false" />
  33 + <change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" afterDir="false" />
20 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 34 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
21 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 35 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
22 </list> 36 </list>
@@ -28,35 +42,56 @@ @@ -28,35 +42,56 @@
28 </component> 42 </component>
29 <component name="CoverageDataManager"> 43 <component name="CoverageDataManager">
30 <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$" /> 44 <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$" />
31 - <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597287878682" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 45 + <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" />
32 <SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 46 <SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
33 - <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597287208188" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 47 + <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" />
34 </component> 48 </component>
35 <component name="FileEditorManager"> 49 <component name="FileEditorManager">
36 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 50 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
37 <file pinned="false" current-in-tab="false"> 51 <file pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 52 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
39 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
40 - <state relative-caret-position="410">  
41 - <caret line="73" selection-start-line="73" selection-end-line="74" selection-end-column="69" /> 54 + <state relative-caret-position="722">
  55 + <caret line="89" column="61" selection-start-line="89" selection-start-column="61" selection-end-line="89" selection-end-column="61" />
  56 + </state>
  57 + </provider>
  58 + </entry>
  59 + </file>
  60 + <file pinned="false" current-in-tab="true">
  61 + <entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml">
  62 + <provider selected="true" editor-type-id="text-editor">
  63 + <state relative-caret-position="676">
  64 + <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
42 </state> 65 </state>
43 </provider> 66 </provider>
44 </entry> 67 </entry>
45 </file> 68 </file>
46 <file pinned="false" current-in-tab="false"> 69 <file pinned="false" current-in-tab="false">
47 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml"> 70 + <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml">
48 <provider selected="true" editor-type-id="text-editor"> 71 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="52">  
50 - <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" /> 72 + <state relative-caret-position="468">
  73 + <caret line="18" column="12" lean-forward="true" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" />
51 </state> 74 </state>
52 </provider> 75 </provider>
53 </entry> 76 </entry>
54 </file> 77 </file>
55 - <file pinned="false" current-in-tab="true"> 78 + <file pinned="false" current-in-tab="false">
56 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 79 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
57 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
58 - <state relative-caret-position="877">  
59 - <caret line="113" selection-start-line="113" selection-end-line="140" selection-end-column="14" /> 81 + <state relative-caret-position="156">
  82 + <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" />
  83 + </state>
  84 + </provider>
  85 + </entry>
  86 + </file>
  87 + <file pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
  89 + <provider selected="true" editor-type-id="text-editor">
  90 + <state relative-caret-position="312">
  91 + <caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />
  92 + <folding>
  93 + <element signature="e#0#13#0" expanded="true" />
  94 + </folding>
60 </state> 95 </state>
61 </provider> 96 </provider>
62 </entry> 97 </entry>
@@ -72,15 +107,6 @@ @@ -72,15 +107,6 @@
72 </component> 107 </component>
73 <component name="FindInProjectRecents"> 108 <component name="FindInProjectRecents">
74 <findStrings> 109 <findStrings>
75 - <find>partShipmentQuantity</find>  
76 - <find>allShipmentQuantity</find>  
77 - <find>get_allShipmentQuantity_from_database</find>  
78 - <find>intentionQuantity</find>  
79 - <find>ArgumentParser</find>  
80 - <find>print(get_expend_from_database())</find>  
81 - <find>todayIntentionMoney</find>  
82 - <find>todayIntentionQuantity</find>  
83 - <find>get_purpose_address_from_database</find>  
84 <find>todayRealQuantity</find> 110 <find>todayRealQuantity</find>
85 <find>rou</find> 111 <find>rou</find>
86 <find>get_partner_id_from_database</find> 112 <find>get_partner_id_from_database</find>
@@ -93,7 +119,6 @@ @@ -93,7 +119,6 @@
93 <find>get_partner_account</find> 119 <find>get_partner_account</find>
94 <find>received</find> 120 <find>received</find>
95 <find>outstanding</find> 121 <find>outstanding</find>
96 - <find>get_purpose_id_from_database</find>  
97 <find>address</find> 122 <find>address</find>
98 <find>buyerPhone</find> 123 <find>buyerPhone</find>
99 <find>orderDist</find> 124 <find>orderDist</find>
@@ -102,6 +127,16 @@ @@ -102,6 +127,16 @@
102 <find>get_actual_delivery_code_from_database</find> 127 <find>get_actual_delivery_code_from_database</find>
103 <find>get_order_status_from_database</find> 128 <find>get_order_status_from_database</find>
104 <find>get_actual_id_from_database</find> 129 <find>get_actual_id_from_database</find>
  130 + <find>get_account_from_database</find>
  131 + <find>get_admin_account_from_database</find>
  132 + <find>get_id_from_database</find>
  133 + <find>get_partnername_from_database</find>
  134 + <find>get_area_from_database</find>
  135 + <find>get_salesman_from_database</find>
  136 + <find>get_status_from_database</find>
  137 + <find>get_phone_from_database</find>
  138 + <find>get_purpose_id_from_database</find>
  139 + <find>get_ID_from_database</find>
105 </findStrings> 140 </findStrings>
106 </component> 141 </component>
107 <component name="Git.Settings"> 142 <component name="Git.Settings">
@@ -110,29 +145,6 @@ @@ -110,29 +145,6 @@
110 <component name="IdeDocumentHistory"> 145 <component name="IdeDocumentHistory">
111 <option name="CHANGED_PATHS"> 146 <option name="CHANGED_PATHS">
112 <list> 147 <list>
113 - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" />  
114 - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" />  
115 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />  
116 - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" />  
117 - <option value="$PROJECT_DIR$/api/app_api/login/login_api.yml" />  
118 - <option value="$PROJECT_DIR$/api/app_api/login/accessToken_api.yml" />  
119 - <option value="$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />  
120 - <option value="$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />  
121 - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />  
122 - <option value="$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />  
123 - <option value="$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />  
124 - <option value="$PROJECT_DIR$/api/app_api/order/list_0_api.yml" />  
125 - <option value="$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />  
126 - <option value="$PROJECT_DIR$/api/app_api/order/intentions_api.yml" />  
127 - <option value="$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" />  
128 - <option value="$PROJECT_DIR$/api/app_api/order/details_api.yml" />  
129 - <option value="$PROJECT_DIR$/testcases/order/order_details_testcases.yml" />  
130 - <option value="$PROJECT_DIR$/api/app_api/user/userInfo_api.yml" />  
131 - <option value="$PROJECT_DIR$/testcases/user/user_userInfo_testcases.yml" />  
132 - <option value="$PROJECT_DIR$/testcases/login_testcases.yml" />  
133 - <option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" />  
134 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" />  
135 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" />  
136 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" /> 148 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
137 <option value="$PROJECT_DIR$/.env" /> 149 <option value="$PROJECT_DIR$/.env" />
138 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> 150 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
@@ -147,24 +159,47 @@ @@ -147,24 +159,47 @@
147 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" /> 159 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />
148 <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" /> 160 <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" />
149 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" /> 161 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" />
150 - <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />  
151 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />  
152 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" /> 162 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />
153 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" /> 163 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />
154 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" /> 164 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
155 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" /> 165 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" />
156 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" /> 166 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
157 - <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />  
158 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" /> 167 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
159 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" /> 168 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" />
160 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" /> 169 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />
161 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
162 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" /> 170 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />
  171 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
  172 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
  173 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />
  174 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" />
  175 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />
  176 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" />
  177 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" />
  178 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" />
  179 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" />
  180 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" />
  181 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
  182 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" />
  183 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" />
  184 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" />
  185 + <option value="$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml" />
  186 + <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml" />
  187 + <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
  188 + <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
  189 + <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
  190 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" />
  191 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" />
  192 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml" />
  193 + <option value="$PROJECT_DIR$/testcases/purpose/ACTUAL007_purpose_del_testcases.yml" />
  194 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" />
163 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 195 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
  196 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
  197 + <option value="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" />
  198 + <option value="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" />
164 </list> 199 </list>
165 </option> 200 </option>
166 </component> 201 </component>
167 - <component name="ProjectFrameBounds" extendedState="7"> 202 + <component name="ProjectFrameBounds" extendedState="6">
168 <option name="x" value="-116" /> 203 <option name="x" value="-116" />
169 <option name="y" value="347" /> 204 <option name="y" value="347" />
170 <option name="width" value="1382" /> 205 <option name="width" value="1382" />
@@ -175,7 +210,6 @@ @@ -175,7 +210,6 @@
175 <foldersAlwaysOnTop value="true" /> 210 <foldersAlwaysOnTop value="true" />
176 </navigator> 211 </navigator>
177 <panes> 212 <panes>
178 - <pane id="Scope" />  
179 <pane id="ProjectPane"> 213 <pane id="ProjectPane">
180 <subPane> 214 <subPane>
181 <expand> 215 <expand>
@@ -206,7 +240,7 @@ @@ -206,7 +240,7 @@
206 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 240 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
207 <item name="api" type="462c0819:PsiDirectoryNode" /> 241 <item name="api" type="462c0819:PsiDirectoryNode" />
208 <item name="m_api" type="462c0819:PsiDirectoryNode" /> 242 <item name="m_api" type="462c0819:PsiDirectoryNode" />
209 - <item name="purpose" type="462c0819:PsiDirectoryNode" /> 243 + <item name="dividends" type="462c0819:PsiDirectoryNode" />
210 </path> 244 </path>
211 <path> 245 <path>
212 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 246 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -222,13 +256,13 @@ @@ -222,13 +256,13 @@
222 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 256 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
223 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 257 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
224 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 258 <item name="testcases" type="462c0819:PsiDirectoryNode" />
225 - <item name="order" type="462c0819:PsiDirectoryNode" /> 259 + <item name="actual" type="462c0819:PsiDirectoryNode" />
226 </path> 260 </path>
227 <path> 261 <path>
228 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 262 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
229 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 263 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
230 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 264 <item name="testcases" type="462c0819:PsiDirectoryNode" />
231 - <item name="purpose" type="462c0819:PsiDirectoryNode" /> 265 + <item name="dividends" type="462c0819:PsiDirectoryNode" />
232 </path> 266 </path>
233 <path> 267 <path>
234 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 268 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -248,6 +282,7 @@ @@ -248,6 +282,7 @@
248 <select /> 282 <select />
249 </subPane> 283 </subPane>
250 </pane> 284 </pane>
  285 + <pane id="Scope" />
251 </panes> 286 </panes>
252 </component> 287 </component>
253 <component name="PropertiesComponent"> 288 <component name="PropertiesComponent">
@@ -258,17 +293,17 @@ @@ -258,17 +293,17 @@
258 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 293 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
259 </component> 294 </component>
260 <component name="RecentsManager"> 295 <component name="RecentsManager">
261 - <key name="CopyFile.RECENT_KEYS">  
262 - <recent name="E:\mmm_auto\partner_api\testcases\order" />  
263 - <recent name="E:\mmm_auto\partner_api\api\app_api\order" />  
264 - <recent name="E:\mmm_auto\partner_api\testcases\dividend" />  
265 - <recent name="E:\mmm_auto\partner_api\api\app_api\dividend" />  
266 - <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />  
267 - </key>  
268 <key name="MoveFile.RECENT_KEYS"> 296 <key name="MoveFile.RECENT_KEYS">
269 <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" /> 297 <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
270 <recent name="E:\mmm_auto\partner_api\api\m_api\partners" /> 298 <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
271 </key> 299 </key>
  300 + <key name="CopyFile.RECENT_KEYS">
  301 + <recent name="E:\partner_api\testcases\dividends" />
  302 + <recent name="E:\partner_api\api\m_api\dividends" />
  303 + <recent name="E:\partner_api\testcases\purpose" />
  304 + <recent name="E:\partner_api\api\m_api\purpose" />
  305 + <recent name="E:\partner_api\testcases\actual" />
  306 + </key>
272 </component> 307 </component>
273 <component name="RunDashboard"> 308 <component name="RunDashboard">
274 <option name="ruleStates"> 309 <option name="ruleStates">
@@ -282,7 +317,7 @@ @@ -282,7 +317,7 @@
282 </list> 317 </list>
283 </option> 318 </option>
284 </component> 319 </component>
285 - <component name="RunManager" selected="Python.pg_app_db_func"> 320 + <component name="RunManager" selected="Python.pg_db_func">
286 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 321 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
287 <module name="partner_api" /> 322 <module name="partner_api" />
288 <option name="INTERPRETER_OPTIONS" value="" /> 323 <option name="INTERPRETER_OPTIONS" value="" />
@@ -373,8 +408,8 @@ @@ -373,8 +408,8 @@
373 </configuration> 408 </configuration>
374 <recent_temporary> 409 <recent_temporary>
375 <list> 410 <list>
376 - <item itemvalue="Python.pg_app_db_func" />  
377 <item itemvalue="Python.pg_db_func" /> 411 <item itemvalue="Python.pg_db_func" />
  412 + <item itemvalue="Python.pg_app_db_func" />
378 <item itemvalue="Python.debugtalk" /> 413 <item itemvalue="Python.debugtalk" />
379 <item itemvalue="Python.db_pg_func" /> 414 <item itemvalue="Python.db_pg_func" />
380 </list> 415 </list>
@@ -426,21 +461,21 @@ @@ -426,21 +461,21 @@
426 <workItem from="1597197819907" duration="7375000" /> 461 <workItem from="1597197819907" duration="7375000" />
427 <workItem from="1597211046716" duration="9744000" /> 462 <workItem from="1597211046716" duration="9744000" />
428 <workItem from="1597281783377" duration="7250000" /> 463 <workItem from="1597281783377" duration="7250000" />
  464 + <workItem from="1597383690773" duration="12705000" />
429 </task> 465 </task>
430 <servers /> 466 <servers />
431 </component> 467 </component>
432 <component name="TimeTrackingManager"> 468 <component name="TimeTrackingManager">
433 - <option name="totallyTimeSpent" value="202457000" /> 469 + <option name="totallyTimeSpent" value="215162000" />
434 </component> 470 </component>
435 <component name="ToolWindowManager"> 471 <component name="ToolWindowManager">
436 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 472 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
437 - <editor active="true" />  
438 <layout> 473 <layout>
439 <window_info id="Favorites" order="0" side_tool="true" /> 474 <window_info id="Favorites" order="0" side_tool="true" />
440 - <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.30954936" /> 475 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.3138412" />
441 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 476 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
442 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 477 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
443 - <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" /> 478 + <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" />
444 <window_info anchor="bottom" id="Message" order="2" /> 479 <window_info anchor="bottom" id="Message" order="2" />
445 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" /> 480 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" />
446 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" /> 481 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" />
@@ -463,215 +498,207 @@ @@ -463,215 +498,207 @@
463 <option name="version" value="1" /> 498 <option name="version" value="1" />
464 </component> 499 </component>
465 <component name="editorHistoryManager"> 500 <component name="editorHistoryManager">
466 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />  
467 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />  
468 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 501 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />
  502 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
469 <provider selected="true" editor-type-id="text-editor"> 503 <provider selected="true" editor-type-id="text-editor">
470 - <state relative-caret-position="110">  
471 - <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="22" /> 504 + <state relative-caret-position="421">
  505 + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
472 </state> 506 </state>
473 </provider> 507 </provider>
474 </entry> 508 </entry>
475 - <entry file="file://$PROJECT_DIR$/api/app_api/login/accessToken_api.yml"> 509 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
476 <provider selected="true" editor-type-id="text-editor"> 510 <provider selected="true" editor-type-id="text-editor">
477 - <state relative-caret-position="594">  
478 - <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" /> 511 + <state relative-caret-position="320">
  512 + <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
479 </state> 513 </state>
480 </provider> 514 </provider>
481 </entry> 515 </entry>
482 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_0_api.yml" />  
483 - <entry file="file://$PROJECT_DIR$/testcases/order/order_intentions_testcases.yml" />  
484 - <entry file="file://$PROJECT_DIR$/api/app_api/order/intentions_api.yml" />  
485 - <entry file="file://$PROJECT_DIR$/api/app_api/order/details_api.yml"> 516 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
486 <provider selected="true" editor-type-id="text-editor"> 517 <provider selected="true" editor-type-id="text-editor">
487 - <state>  
488 - <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="10" /> 518 + <state relative-caret-position="338">
  519 + <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
489 </state> 520 </state>
490 </provider> 521 </provider>
491 </entry> 522 </entry>
492 - <entry file="file://$PROJECT_DIR$/testcases/order/order_details_testcases.yml"> 523 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
493 <provider selected="true" editor-type-id="text-editor"> 524 <provider selected="true" editor-type-id="text-editor">
494 - <state relative-caret-position="22">  
495 - <caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="14" /> 525 + <state relative-caret-position="20">
  526 + <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
496 </state> 527 </state>
497 </provider> 528 </provider>
498 </entry> 529 </entry>
499 - <entry file="file://$PROJECT_DIR$/api/app_api/user/userInfo_api.yml"> 530 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
500 <provider selected="true" editor-type-id="text-editor"> 531 <provider selected="true" editor-type-id="text-editor">
501 - <state relative-caret-position="330">  
502 - <caret line="21" column="2" lean-forward="true" selection-start-line="21" selection-start-column="2" selection-end-line="21" selection-end-column="2" /> 532 + <state relative-caret-position="5">
  533 + <caret line="3" column="46" lean-forward="true" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="46" />
503 </state> 534 </state>
504 </provider> 535 </provider>
505 </entry> 536 </entry>
506 - <entry file="file://$PROJECT_DIR$/testcases/user/user_userInfo_testcases.yml" />  
507 - <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml"> 537 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">
508 <provider selected="true" editor-type-id="text-editor"> 538 <provider selected="true" editor-type-id="text-editor">
509 - <state relative-caret-position="493">  
510 - <caret line="27" column="16" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="16" /> 539 + <state relative-caret-position="52">
  540 + <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
511 </state> 541 </state>
512 </provider> 542 </provider>
513 </entry> 543 </entry>
514 - <entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2and3/argparse.pyi"> 544 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
515 <provider selected="true" editor-type-id="text-editor"> 545 <provider selected="true" editor-type-id="text-editor">
516 - <state relative-caret-position="1606">  
517 - <caret line="83" column="27" lean-forward="true" selection-start-line="83" selection-start-column="27" selection-end-line="83" selection-end-column="27" /> 546 + <state relative-caret-position="421">
  547 + <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
518 </state> 548 </state>
519 </provider> 549 </provider>
520 </entry> 550 </entry>
521 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/argparse.py"> 551 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
522 <provider selected="true" editor-type-id="text-editor"> 552 <provider selected="true" editor-type-id="text-editor">
523 - <state relative-caret-position="-1702">  
524 - <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" /> 553 + <state relative-caret-position="52">
  554 + <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
525 </state> 555 </state>
526 </provider> 556 </provider>
527 </entry> 557 </entry>
528 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/cli.py"> 558 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
  559 + <provider selected="true" editor-type-id="text-editor" />
  560 + </entry>
  561 + <entry file="file://$PROJECT_DIR$/.env">
529 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
530 - <state relative-caret-position="496">  
531 - <caret line="24" column="36" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />  
532 - <folding>  
533 - <element signature="e#0#15#0" expanded="true" />  
534 - </folding> 563 + <state relative-caret-position="182">
  564 + <caret line="7" selection-start-line="7" selection-end-line="7" />
535 </state> 565 </state>
536 </provider> 566 </provider>
537 </entry> 567 </entry>
538 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml"> 568 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
539 <provider selected="true" editor-type-id="text-editor"> 569 <provider selected="true" editor-type-id="text-editor">
540 - <state relative-caret-position="154">  
541 - <caret line="7" column="58" selection-start-line="7" selection-start-column="58" selection-end-line="7" selection-end-column="58" /> 570 + <state relative-caret-position="78">
  571 + <caret line="3" column="40" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="40" />
542 </state> 572 </state>
543 </provider> 573 </provider>
544 </entry> 574 </entry>
545 - <entry file="file://$PROJECT_DIR$/.env"> 575 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
546 <provider selected="true" editor-type-id="text-editor"> 576 <provider selected="true" editor-type-id="text-editor">
547 - <state relative-caret-position="182">  
548 - <caret line="7" selection-start-line="7" selection-end-line="7" /> 577 + <state relative-caret-position="78">
  578 + <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
549 </state> 579 </state>
550 </provider> 580 </provider>
551 </entry> 581 </entry>
552 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py"> 582 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
553 <provider selected="true" editor-type-id="text-editor"> 583 <provider selected="true" editor-type-id="text-editor">
554 - <state relative-caret-position="658">  
555 - <caret line="170" selection-start-line="170" selection-end-line="170" />  
556 - </state> 584 + <state relative-caret-position="-47" />
557 </provider> 585 </provider>
558 </entry> 586 </entry>
559 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/report.py"> 587 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
560 <provider selected="true" editor-type-id="text-editor"> 588 <provider selected="true" editor-type-id="text-editor">
561 - <state relative-caret-position="-905">  
562 - <folding>  
563 - <element signature="e#0#11#0" expanded="true" />  
564 - </folding> 589 + <state relative-caret-position="104">
  590 + <caret line="4" column="59" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="59" />
565 </state> 591 </state>
566 </provider> 592 </provider>
567 </entry> 593 </entry>
568 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html"> 594 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">
569 <provider selected="true" editor-type-id="text-editor"> 595 <provider selected="true" editor-type-id="text-editor">
570 - <state relative-caret-position="286">  
571 - <caret line="293" column="50" selection-start-line="293" selection-start-column="50" selection-end-line="293" selection-end-column="50" /> 596 + <state relative-caret-position="104">
  597 + <caret line="4" column="48" lean-forward="true" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="48" />
572 </state> 598 </state>
573 </provider> 599 </provider>
574 </entry> 600 </entry>
575 - <entry file="file://$PROJECT_DIR$/api/app_api/order/statistics_api.yml"> 601 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">
576 <provider selected="true" editor-type-id="text-editor"> 602 <provider selected="true" editor-type-id="text-editor">
577 - <state relative-caret-position="962">  
578 - <caret line="37" column="54" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="54" /> 603 + <state relative-caret-position="78">
  604 + <caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" />
579 </state> 605 </state>
580 </provider> 606 </provider>
581 </entry> 607 </entry>
582 - <entry file="file://$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml"> 608 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
583 <provider selected="true" editor-type-id="text-editor"> 609 <provider selected="true" editor-type-id="text-editor">
584 - <state relative-caret-position="182">  
585 - <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="52" /> 610 + <state relative-caret-position="78">
  611 + <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
586 </state> 612 </state>
587 </provider> 613 </provider>
588 </entry> 614 </entry>
589 - <entry file="file://$PROJECT_DIR$/api/app_api/login/login_api.yml"> 615 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
590 <provider selected="true" editor-type-id="text-editor"> 616 <provider selected="true" editor-type-id="text-editor">
591 - <state relative-caret-position="390">  
592 - <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" /> 617 + <state relative-caret-position="78">
  618 + <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
593 </state> 619 </state>
594 </provider> 620 </provider>
595 </entry> 621 </entry>
596 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_testcases.yml"> 622 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml">
  623 + <provider selected="true" editor-type-id="text-editor" />
  624 + </entry>
  625 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
597 <provider selected="true" editor-type-id="text-editor"> 626 <provider selected="true" editor-type-id="text-editor">
598 - <state relative-caret-position="546">  
599 - <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" /> 627 + <state relative-caret-position="130">
  628 + <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
600 </state> 629 </state>
601 </provider> 630 </provider>
602 </entry> 631 </entry>
603 - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml"> 632 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
604 <provider selected="true" editor-type-id="text-editor"> 633 <provider selected="true" editor-type-id="text-editor">
605 - <state relative-caret-position="306">  
606 - <caret line="38" selection-start-line="38" selection-end-line="44" selection-end-column="22" /> 634 + <state relative-caret-position="130">
  635 + <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
607 </state> 636 </state>
608 </provider> 637 </provider>
609 </entry> 638 </entry>
610 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 639 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
611 <provider selected="true" editor-type-id="text-editor"> 640 <provider selected="true" editor-type-id="text-editor">
612 - <state relative-caret-position="361">  
613 - <caret line="85" column="48" selection-start-line="85" selection-start-column="48" selection-end-line="85" selection-end-column="48" />  
614 - <folding>  
615 - <element signature="e#0#13#0" expanded="true" />  
616 - </folding> 641 + <state relative-caret-position="130">
  642 + <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
617 </state> 643 </state>
618 </provider> 644 </provider>
619 </entry> 645 </entry>
620 - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml"> 646 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
621 <provider selected="true" editor-type-id="text-editor"> 647 <provider selected="true" editor-type-id="text-editor">
622 - <state relative-caret-position="488">  
623 - <caret line="33" column="10" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="10" /> 648 + <state relative-caret-position="78">
  649 + <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
624 </state> 650 </state>
625 </provider> 651 </provider>
626 </entry> 652 </entry>
627 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_api.yml"> 653 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
628 <provider selected="true" editor-type-id="text-editor"> 654 <provider selected="true" editor-type-id="text-editor">
629 - <state relative-caret-position="387">  
630 - <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" /> 655 + <state relative-caret-position="104">
  656 + <caret line="4" column="57" selection-start-line="4" selection-start-column="47" selection-end-line="4" selection-end-column="57" />
631 </state> 657 </state>
632 </provider> 658 </provider>
633 </entry> 659 </entry>
634 - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml"> 660 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
  661 + <provider selected="true" editor-type-id="text-editor" />
  662 + </entry>
  663 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
635 <provider selected="true" editor-type-id="text-editor"> 664 <provider selected="true" editor-type-id="text-editor">
636 - <state relative-caret-position="161">  
637 - <caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="85" /> 665 + <state relative-caret-position="78">
  666 + <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
638 </state> 667 </state>
639 </provider> 668 </provider>
640 </entry> 669 </entry>
641 - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml"> 670 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">
642 <provider selected="true" editor-type-id="text-editor"> 671 <provider selected="true" editor-type-id="text-editor">
643 - <state relative-caret-position="213">  
644 - <caret line="22" selection-start-line="22" selection-end-line="30" selection-end-column="30" /> 672 + <state relative-caret-position="104">
  673 + <caret line="4" column="49" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="49" />
645 </state> 674 </state>
646 </provider> 675 </provider>
647 </entry> 676 </entry>
648 - <entry file="file://$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml"> 677 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
649 <provider selected="true" editor-type-id="text-editor"> 678 <provider selected="true" editor-type-id="text-editor">
650 <state relative-caret-position="104"> 679 <state relative-caret-position="104">
651 - <caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" /> 680 + <caret line="4" column="38" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="38" />
652 </state> 681 </state>
653 </provider> 682 </provider>
654 </entry> 683 </entry>
655 - <entry file="file://$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml"> 684 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
656 <provider selected="true" editor-type-id="text-editor"> 685 <provider selected="true" editor-type-id="text-editor">
657 - <state relative-caret-position="213">  
658 - <caret line="9" column="85" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="85" /> 686 + <state relative-caret-position="78">
  687 + <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
659 </state> 688 </state>
660 </provider> 689 </provider>
661 </entry> 690 </entry>
662 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />  
663 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />  
664 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> 691 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
665 <provider selected="true" editor-type-id="text-editor"> 692 <provider selected="true" editor-type-id="text-editor">
666 - <state relative-caret-position="520">  
667 - <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> 693 + <state relative-caret-position="78">
  694 + <caret line="3" column="38" selection-start-line="3" selection-start-column="38" selection-end-line="3" selection-end-column="38" />
668 </state> 695 </state>
669 </provider> 696 </provider>
670 </entry> 697 </entry>
671 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml"> 698 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/api.py">
672 <provider selected="true" editor-type-id="text-editor"> 699 <provider selected="true" editor-type-id="text-editor">
673 - <state relative-caret-position="395">  
674 - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> 700 + <state relative-caret-position="280">
  701 + <caret line="64" selection-start-line="64" selection-end-line="64" />
675 </state> 702 </state>
676 </provider> 703 </provider>
677 </entry> 704 </entry>
@@ -682,104 +709,135 @@ @@ -682,104 +709,135 @@
682 </state> 709 </state>
683 </provider> 710 </provider>
684 </entry> 711 </entry>
685 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml"> 712 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml">
686 <provider selected="true" editor-type-id="text-editor"> 713 <provider selected="true" editor-type-id="text-editor">
687 - <state relative-caret-position="442">  
688 - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> 714 + <state relative-caret-position="416">
  715 + <caret line="16" column="12" lean-forward="true" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
689 </state> 716 </state>
690 </provider> 717 </provider>
691 </entry> 718 </entry>
692 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml"> 719 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">
693 <provider selected="true" editor-type-id="text-editor"> 720 <provider selected="true" editor-type-id="text-editor">
694 - <state relative-caret-position="421"> 721 + <state>
  722 + <caret column="11" selection-start-column="11" selection-end-column="11" />
  723 + </state>
  724 + </provider>
  725 + </entry>
  726 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
  727 + <provider selected="true" editor-type-id="text-editor">
  728 + <state relative-caret-position="26">
  729 + <caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
  730 + </state>
  731 + </provider>
  732 + </entry>
  733 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
  734 + <provider selected="true" editor-type-id="text-editor">
  735 + <state relative-caret-position="442">
695 <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> 736 <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
696 </state> 737 </state>
697 </provider> 738 </provider>
698 </entry> 739 </entry>
699 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml"> 740 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
700 <provider selected="true" editor-type-id="text-editor"> 741 <provider selected="true" editor-type-id="text-editor">
701 - <state relative-caret-position="320">  
702 - <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" /> 742 + <state relative-caret-position="-3712">
  743 + <caret line="77" column="34" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="34" />
  744 + <folding>
  745 + <element signature="e#108#123#0" expanded="true" />
  746 + </folding>
703 </state> 747 </state>
704 </provider> 748 </provider>
705 </entry> 749 </entry>
706 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml"> 750 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
707 <provider selected="true" editor-type-id="text-editor"> 751 <provider selected="true" editor-type-id="text-editor">
708 - <state relative-caret-position="338">  
709 - <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" /> 752 + <state relative-caret-position="494">
  753 + <caret line="19" column="42" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="42" />
710 </state> 754 </state>
711 </provider> 755 </provider>
712 </entry> 756 </entry>
713 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 757 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml">
714 <provider selected="true" editor-type-id="text-editor"> 758 <provider selected="true" editor-type-id="text-editor">
715 - <state relative-caret-position="182">  
716 - <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> 759 + <state relative-caret-position="312">
  760 + <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
717 </state> 761 </state>
718 </provider> 762 </provider>
719 </entry> 763 </entry>
720 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 764 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
721 <provider selected="true" editor-type-id="text-editor"> 765 <provider selected="true" editor-type-id="text-editor">
722 - <state relative-caret-position="412">  
723 - <caret line="91" column="14" selection-start-line="91" selection-start-column="14" selection-end-line="91" selection-end-column="14" /> 766 + <state relative-caret-position="312">
  767 + <caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />
724 <folding> 768 <folding>
725 - <element signature="e#108#123#0" expanded="true" /> 769 + <element signature="e#0#13#0" expanded="true" />
726 </folding> 770 </folding>
727 </state> 771 </state>
728 </provider> 772 </provider>
729 </entry> 773 </entry>
730 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml"> 774 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">
731 <provider selected="true" editor-type-id="text-editor"> 775 <provider selected="true" editor-type-id="text-editor">
732 - <state relative-caret-position="20">  
733 - <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" /> 776 + <state relative-caret-position="312">
  777 + <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
734 </state> 778 </state>
735 </provider> 779 </provider>
736 </entry> 780 </entry>
737 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml"> 781 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml">
738 <provider selected="true" editor-type-id="text-editor"> 782 <provider selected="true" editor-type-id="text-editor">
739 - <state relative-caret-position="182">  
740 - <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> 783 + <state relative-caret-position="338">
  784 + <caret line="13" column="53" selection-start-line="13" selection-start-column="53" selection-end-line="13" selection-end-column="53" />
741 </state> 785 </state>
742 </provider> 786 </provider>
743 </entry> 787 </entry>
744 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml"> 788 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml">
745 <provider selected="true" editor-type-id="text-editor"> 789 <provider selected="true" editor-type-id="text-editor">
746 - <state relative-caret-position="5">  
747 - <caret line="3" column="46" lean-forward="true" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="46" /> 790 + <state relative-caret-position="442">
  791 + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
748 </state> 792 </state>
749 </provider> 793 </provider>
750 </entry> 794 </entry>
751 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml"> 795 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml">
752 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
753 - <state relative-caret-position="52">  
754 - <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" /> 797 + <state relative-caret-position="312">
  798 + <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
755 </state> 799 </state>
756 </provider> 800 </provider>
757 </entry> 801 </entry>
758 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml"> 802 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
759 <provider selected="true" editor-type-id="text-editor"> 803 <provider selected="true" editor-type-id="text-editor">
760 - <state relative-caret-position="421">  
761 - <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" /> 804 + <state relative-caret-position="156">
  805 + <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" />
762 </state> 806 </state>
763 </provider> 807 </provider>
764 </entry> 808 </entry>
765 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 809 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
766 <provider selected="true" editor-type-id="text-editor"> 810 <provider selected="true" editor-type-id="text-editor">
767 - <state relative-caret-position="410">  
768 - <caret line="73" selection-start-line="73" selection-end-line="74" selection-end-column="69" /> 811 + <state relative-caret-position="722">
  812 + <caret line="89" column="61" selection-start-line="89" selection-start-column="61" selection-end-line="89" selection-end-column="61" />
769 </state> 813 </state>
770 </provider> 814 </provider>
771 </entry> 815 </entry>
772 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml"> 816 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
773 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
774 - <state relative-caret-position="52">  
775 - <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" /> 818 + <state relative-caret-position="364">
  819 + <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
776 </state> 820 </state>
777 </provider> 821 </provider>
778 </entry> 822 </entry>
779 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 823 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
  824 + <provider selected="true" editor-type-id="text-editor">
  825 + <state relative-caret-position="338">
  826 + <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="53" />
  827 + </state>
  828 + </provider>
  829 + </entry>
  830 + <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml">
  831 + <provider selected="true" editor-type-id="text-editor">
  832 + <state relative-caret-position="468">
  833 + <caret line="18" column="12" lean-forward="true" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" />
  834 + </state>
  835 + </provider>
  836 + </entry>
  837 + <entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml">
780 <provider selected="true" editor-type-id="text-editor"> 838 <provider selected="true" editor-type-id="text-editor">
781 - <state relative-caret-position="877">  
782 - <caret line="113" selection-start-line="113" selection-end-line="140" selection-end-column="14" /> 839 + <state relative-caret-position="676">
  840 + <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
783 </state> 841 </state>
784 </provider> 842 </provider>
785 </entry> 843 </entry>
  1 +name: 删除实际订单
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + id: ${get_actual_id_from_database()}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + id: $id
  12 + method: POST
  13 + url: v1/order/actual/del
  14 +validate:
  15 + - eq:
  16 + - content.msg
  17 + - ok
1 -name: 搜索订单号——实际订单列表 1 +name: 搜索发货单号——实际订单列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 searchText: ${get_actual_delivery_code_from_database()} 4 searchText: ${get_actual_delivery_code_from_database()}
1 name: 管理员详情 1 name: 管理员详情
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_id_from_database(admin_user)} 4 + id: ${get_admin_id_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员禁用 1 name: 管理员禁用
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_id_from_database(admin_user)} 4 + id: ${get_admin_id_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员禁启用 1 name: 管理员禁启用
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_id_from_database(admin_user)} 4 + id: ${get_admin_id_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员列表 1 name: 管理员列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - searchText: ${get_account_from_database(admin_user)} 4 + searchText: ${get_account_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员修改 1 name: 管理员修改
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - account: ${get_account_from_database(admin_user)}  
5 - id: ${get_id_from_database(admin_user)} 4 + account: ${get_account_from_database()}
  5 + id: ${get_admin_id_from_database()}
6 request: 6 request:
7 headers: 7 headers:
8 Content-Type: application/json;charset=utf-8 8 Content-Type: application/json;charset=utf-8
  1 +name: 分红管理-编辑
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + orderid: ${get_actual_id_from_database()}
  5 + msg: ok
  6 +request:
  7 + headers:
  8 + Content-Type: application/json;charset=utf-8
  9 + User-Agent: okhttp/3.12.3
  10 + Authorization: Bearer ${get_m_accesstoken()}
  11 + json:
  12 + id: $orderid
  13 + dividendPayment:
  14 + - quantityControl:
  15 + stateOfPayment: 2
  16 + remark:
  17 + productId: ${get_dividends_ID_from_database(0)}
  18 + - quantityControl:
  19 + stateOfPayment: 2
  20 + remark:
  21 + productId: ${get_dividends_ID_from_database(1)}
  22 + method: POST
  23 + url: v1/dividends/edit
  24 +validate:
  25 + - eq:
  26 + - content.msg
  27 + - $msg
1 name: 合伙人查看 1 name: 合伙人查看
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_id_from_database(partner_info)} 4 + id: ${get_admin_id_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 合伙人编辑 1 name: 合伙人编辑
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - account: ${get_account_from_database(partner_info)}  
5 - id: ${get_id_from_database(partner_info)}  
6 - partnerName: ${get_partnername_from_database(partner_info)}  
7 - area: ${get_area_from_database(partner_info)}  
8 - salesmanName: ${get_salesman_from_database(partner_info)}  
9 - phone: ${get_phone_from_database(partner_info)} 4 + account: ${get_partner_account_from_database()}
  5 + id: ${get_partner_id_from_database()}
  6 + partnerName: ${get_partner_name_from_database()}
  7 + area: ${get_area_from_database()}
  8 + salesmanName: ${get_salesman_from_database()}
  9 + phone: ${get_partner_account_from_database()}
10 request: 10 request:
11 headers: 11 headers:
12 Content-Type: application/json;charset=utf-8 12 Content-Type: application/json;charset=utf-8
1 name: /v1/partners/list 1 name: /v1/partners/list
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - status: ${get_status_from_database(partner_info)}  
5 - partnerName: ${get_partnername_from_database(partner_info)} 4 + status: ${get_status_from_database()}
  5 + partnerName: ${get_partner_name_from_database()}
6 request: 6 request:
7 headers: 7 headers:
8 Content-Type: application/json;charset=utf-8 8 Content-Type: application/json;charset=utf-8
1 name: /v1/partners/list 1 name: /v1/partners/list
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - status: ${get_status_from_database(partner_info)} 4 + status: ${get_status_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 禁用合伙人 1 name: 禁用合伙人
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_id_from_database(partner_info)} 4 + id: ${get_partner_id_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 启用合伙人 1 name: 启用合伙人
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_id_from_database(partner_info)} 4 + id: ${get_partner_id_from_database()}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
  1 +name: 删除意向订单
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + id: ${get_actual_id_from_database()}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + id: $id
  12 + method: POST
  13 + url: v1/order/purpose/del
  14 +validate:
  15 + - eq:
  16 + - content.msg
  17 + - ok
1 name: 意向订单发货 1 name: 意向订单发货
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_purpose_id_from_database()}  
5 - buyer: ${get_purpose_buyer_from_database(order)}  
6 - orderDist: ${get_purpose_orderDist_from_database(order)}  
7 - orderId: ${get_purpose_orderId_from_database(order)}  
8 - productid: ${get_purpose_orderId_from_database(order)} 4 + orderid: ${get_purpose_id_from_database()}
  5 +
9 request: 6 request:
10 headers: 7 headers:
11 Content-Type: application/json;charset=utf-8 8 Content-Type: application/json;charset=utf-8
@@ -13,13 +10,18 @@ request: @@ -13,13 +10,18 @@ request:
13 Authorization: Bearer ${get_m_accesstoken()} 10 Authorization: Bearer ${get_m_accesstoken()}
14 json: 11 json:
15 shipmentsId: ${get_nowtime()} 12 shipmentsId: ${get_nowtime()}
16 - id: $id 13 + id: ${convert_to_string($orderid)}
17 productDetail: 14 productDetail:
18 - - id:  
19 - productName:  
20 - orderNum:  
21 - univalence:  
22 - partnerRatio: 15 + - id: ${get_ID_from_database(0)}
  16 + productName: ${get_productName_from_database(0)}
  17 + orderNum: ${get_orderNum_from_database(0)}
  18 + univalence: ${get_univalence_from_database(0)}
  19 + partnerRatio: ${get_partnerRatio_from_database(0)}
  20 + - id: ${get_ID_from_database(1)}
  21 + productName: ${get_productName_from_database(1)}
  22 + orderNum: ${get_orderNum_from_database(1)}
  23 + univalence: ${get_univalence_from_database(1)}
  24 + partnerRatio: ${get_partnerRatio_from_database(1)}
23 method: POST 25 method: POST
24 url: v1/order/purpose/sendout 26 url: v1/order/purpose/sendout
25 validate: 27 validate:
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTczMzIxMjIsImlhdCI6MTU5NzI4ODkyMiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzI4ODkyMiwidWlkIjoxOH0.keiW0ynf6DGb-3vkp0zBZR02ZuR3ujTlEfUAnJZxW6M  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTc0MzkwMTAsImlhdCI6MTU5NzM5NTgxMCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzM5NTgxMCwidWlkIjoxOH0.8DkBF75udtyGNq4xH4LNnXtYXZH3SeAPpeP944JFka0
@@ -50,14 +50,14 @@ def GetConnect(): @@ -50,14 +50,14 @@ def GetConnect():
50 conn = False 50 conn = False
51 try: 51 try:
52 conn = psycopg2.connect(database="partner_test", 52 conn = psycopg2.connect(database="partner_test",
53 - user="bianxinhua_user",  
54 - password="Bianxinhua_user#123",  
55 - host="101.37.68.23",  
56 - port="15432") 53 + user="bianxinhua",
  54 + password="bianxinhua_123",
  55 + host="114.55.200.59",
  56 + port="31543")
57 except Exception as err: 57 except Exception as err:
58 print("连接数据库失败，%s" % err) 58 print("连接数据库失败，%s" % err)
59 return conn 59 return conn
60 -#获取超级管理员id 60 +#获取合伙人id
61 def get_partner_id_from_database(): 61 def get_partner_id_from_database():
62 db = GetConnect() 62 db = GetConnect()
63 cursor = db.cursor() 63 cursor = db.cursor()
@@ -73,8 +73,8 @@ def get_partner_id_from_database(): @@ -73,8 +73,8 @@ def get_partner_id_from_database():
73 print(err) 73 print(err)
74 db.rollback() 74 db.rollback()
75 db.close() 75 db.close()
76 -# print(get_partner_id_from_database())  
77 -#获取超级管理员姓名 76 +
  77 +#获取合伙人姓名
78 def get_partner_name_from_database(): 78 def get_partner_name_from_database():
79 db = GetConnect() 79 db = GetConnect()
80 cursor = db.cursor() 80 cursor = db.cursor()
@@ -90,7 +90,7 @@ def get_partner_name_from_database(): @@ -90,7 +90,7 @@ def get_partner_name_from_database():
90 print(err) 90 print(err)
91 db.rollback() 91 db.rollback()
92 db.close() 92 db.close()
93 -#获取超级管理员账号 93 +#获取合伙人账号
94 def get_partner_account_from_database(): 94 def get_partner_account_from_database():
95 db = GetConnect() 95 db = GetConnect()
96 cursor = db.cursor() 96 cursor = db.cursor()
@@ -106,23 +106,7 @@ def get_partner_account_from_database(): @@ -106,23 +106,7 @@ 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 -# print(get_partner_account_from_database())  
110 -#获取超级管理员密码  
111 -def get_partner_password_from_database(tbl):  
112 - db = GetConnect()  
113 - cursor = db.cursor()  
114 - # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '  
115 - sql = '''select "password" from \"{}\" where account = '13459147023' '''.format(tbl)  
116 - # print(sql)  
117 - try:  
118 - cursor.execute(sql)  
119 - result = cursor.fetchone()  
120 - return result[0]  
121 - except Exception as err:  
122 - # 发生错误时回滚  
123 - print(err)  
124 - db.rollback()  
125 - db.close() 109 +
126 #累计实发订单 110 #累计实发订单
127 def get_cumulativeQuantity_from_database(): 111 def get_cumulativeQuantity_from_database():
128 db = GetConnect() 112 db = GetConnect()
@@ -10,10 +10,10 @@ def GetConnect(): @@ -10,10 +10,10 @@ def GetConnect():
10 conn = False 10 conn = False
11 try: 11 try:
12 conn = psycopg2.connect(database="partner_test", 12 conn = psycopg2.connect(database="partner_test",
13 - user="bianxinhua_user",  
14 - password="Bianxinhua_user#123",  
15 - host="101.37.68.23",  
16 - port="15432") 13 + user="bianxinhua",
  14 + password="bianxinhua_123",
  15 + host="114.55.200.59",
  16 + port="31543")
17 except Exception as err: 17 except Exception as err:
18 print("连接数据库失败，%s" % err) 18 print("连接数据库失败，%s" % err)
19 return conn 19 return conn
@@ -33,6 +33,35 @@ def get_admin_account_from_database(tbl): @@ -33,6 +33,35 @@ def get_admin_account_from_database(tbl):
33 print(err) 33 print(err)
34 db.rollback() 34 db.rollback()
35 db.close() 35 db.close()
  36 +#获取管理员的id
  37 +def get_admin_id_from_database():
  38 + db = GetConnect()
  39 + cursor = db.cursor()
  40 + sql = '''select id from admin_user where is_usable = 't' order by id desc '''
  41 + # print(sql)
  42 + try:
  43 + cursor.execute(sql)
  44 + result = cursor.fetchone()
  45 + return result[0]
  46 + except Exception as err:
  47 + # 发生错误时回滚
  48 + print(err)
  49 + db.rollback()
  50 + db.close()
  51 +#获取管理员的account
  52 +def get_account_from_database():
  53 + db = GetConnect()
  54 + cursor = db.cursor()
  55 + sql= '''select account from admin_user where is_usable = 't' order by id desc '''
  56 + try:
  57 + cursor.execute(sql)
  58 + result = cursor.fetchone()
  59 + return result[0]
  60 + except Exception as err:
  61 + # 发生错误时回滚
  62 + print(err)
  63 + db.rollback()
  64 + db.close()
36 65
37 #实际订单的发货单号 66 #实际订单的发货单号
38 def get_actual_delivery_code_from_database(): 67 def get_actual_delivery_code_from_database():
@@ -65,7 +94,6 @@ def get_actual_id_from_database(): @@ -65,7 +94,6 @@ def get_actual_id_from_database():
65 print(err) 94 print(err)
66 db.rollback() 95 db.rollback()
67 db.close() 96 db.close()
68 -  
69 #意向订单id 97 #意向订单id
70 def get_purpose_id_from_database(): 98 def get_purpose_id_from_database():
71 db = GetConnect() 99 db = GetConnect()
@@ -96,40 +124,118 @@ def get_ID_from_database(id): @@ -96,40 +124,118 @@ def get_ID_from_database(id):
96 print(err) 124 print(err)
97 db.rollback() 125 db.rollback()
98 db.close() 126 db.close()
99 -  
100 -def get_account_from_database(tbl): 127 +#分红管理的产品ID
  128 +def get_dividends_ID_from_database(id):
101 db = GetConnect() 129 db = GetConnect()
102 cursor = db.cursor() 130 cursor = db.cursor()
103 - sql= "select account from " + tbl + ' ' + 'order by id desc ' 131 + sql= '''select id from order_good where order_id = {} order by id ASC '''.format(get_actual_id_from_database())
  132 + # print(sql)
  133 + try:
  134 + cursor.execute(sql)
  135 + result = cursor.fetchall()
  136 + return result[id][0]
  137 + except Exception as err:
  138 + # 发生错误时回滚
  139 + print(err)
  140 + db.rollback()
  141 + db.close()
  142 +print(get_dividends_ID_from_database(0))
  143 +#意向订单的产品名称
  144 +def get_productName_from_database(id):
  145 + db = GetConnect()
  146 + cursor = db.cursor()
  147 + sql= '''select good_name from order_good where order_id = {} order by id ASC '''.format(get_purpose_id_from_database())
  148 + # print(sql)
  149 + try:
  150 + cursor.execute(sql)
  151 + result = cursor.fetchall()
  152 + return result[id][0]
  153 + except Exception as err:
  154 + # 发生错误时回滚
  155 + print(err)
  156 + db.rollback()
  157 + db.close()
  158 +#意向订单的产品数量
  159 +def get_orderNum_from_database(id):
  160 + db = GetConnect()
  161 + cursor = db.cursor()
  162 + sql= '''select plan_good_number from order_good where order_id = {} order by id ASC '''.format(get_purpose_id_from_database())
  163 + # print(sql)
  164 + try:
  165 + cursor.execute(sql)
  166 + result = cursor.fetchall()
  167 + return result[id][0]
  168 + except Exception as err:
  169 + # 发生错误时回滚
  170 + print(err)
  171 + db.rollback()
  172 + db.close()
  173 +#意向订单的产品单价
  174 +def get_univalence_from_database(id):
  175 + db = GetConnect()
  176 + cursor = db.cursor()
  177 + sql= '''select price from order_good where order_id = {} order by id ASC '''.format(get_purpose_id_from_database())
  178 + # print(sql)
  179 + try:
  180 + cursor.execute(sql)
  181 + result = cursor.fetchall()
  182 + return result[id][0]
  183 + except Exception as err:
  184 + # 发生错误时回滚
  185 + print(err)
  186 + db.rollback()
  187 + db.close()
  188 +#意向订单的合伙人分红比例
  189 +def get_partnerRatio_from_database(id):
  190 + db = GetConnect()
  191 + cursor = db.cursor()
  192 + sql= '''select partner_bonus_percent from order_good where order_id = {} order by id ASC '''.format(get_purpose_id_from_database())
  193 + # print(sql)
  194 + try:
  195 + cursor.execute(sql)
  196 + result = cursor.fetchall()
  197 + return result[id][0]
  198 + except Exception as err:
  199 + # 发生错误时回滚
  200 + print(err)
  201 + db.rollback()
  202 + db.close()
  203 +#获取合伙人所属区域
  204 +def get_area_from_database():
  205 + db = GetConnect()
  206 + cursor = db.cursor()
  207 + sql = '''select region_info from partner_info where account = '13459147023' '''
  208 + # print(sql)
104 try: 209 try:
105 cursor.execute(sql) 210 cursor.execute(sql)
106 result = cursor.fetchone() 211 result = cursor.fetchone()
107 - return result[0] 212 + return result[0]['regionName']
108 except Exception as err: 213 except Exception as err:
109 # 发生错误时回滚 214 # 发生错误时回滚
110 print(err) 215 print(err)
111 db.rollback() 216 db.rollback()
112 db.close() 217 db.close()
113 -  
114 -def get_partnername_from_database(tbl): 218 +#获取合伙人的业务员姓名
  219 +def get_salesman_from_database():
115 db = GetConnect() 220 db = GetConnect()
116 cursor = db.cursor() 221 cursor = db.cursor()
117 - sql= "select partner_name from " + tbl + ' ' + 'order by id desc ' 222 + sql = '''select salesman from partner_info where account = '13459147023' '''
  223 + # print(sql)
118 try: 224 try:
119 cursor.execute(sql) 225 cursor.execute(sql)
120 result = cursor.fetchone() 226 result = cursor.fetchone()
121 - return result[0] 227 + return result[0][0]['name']
122 except Exception as err: 228 except Exception as err:
123 # 发生错误时回滚 229 # 发生错误时回滚
124 print(err) 230 print(err)
125 db.rollback() 231 db.rollback()
126 db.close() 232 db.close()
127 -  
128 -  
129 -def get_partnername_from_database(tbl): 233 +#获取合伙人的状态
  234 +def get_status_from_database():
130 db = GetConnect() 235 db = GetConnect()
131 cursor = db.cursor() 236 cursor = db.cursor()
132 - sql= "select partner_name from " + tbl + ' ' + "where partner_category = 1" + ' ' + 'order by id desc ' 237 + sql = '''select status from partner_info where account = '13459147023' '''
  238 + # print(sql)
133 try: 239 try:
134 cursor.execute(sql) 240 cursor.execute(sql)
135 result = cursor.fetchone() 241 result = cursor.fetchone()
@@ -139,3 +245,4 @@ def get_partnername_from_database(tbl): @@ -139,3 +245,4 @@ def get_partnername_from_database(tbl):
139 print(err) 245 print(err)
140 db.rollback() 246 db.rollback()
141 db.close() 247 db.close()
  248 +# print(get_status_from_database())
1 { 1 {
2 "testcase":[ 2 "testcase":[
3 - "testcases/actual/ACTUAL003_actual_list_testcases.yml" 3 + "testcases/partners/PARTNERS004_list_partner_testcases.yml"
4 ] 4 ]
5 } 5 }
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_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
  1 +config:
  2 + name: 删除实际订单
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_admin_account_from_database(admin_user)}
  6 + teardown_hooks:
  7 + - ${sleep(2)}
  8 +
  9 +teststeps:
  10 +- name: $phone 登录系统
  11 + testcase: testcases/m_login_testcases.yml
  12 +
  13 +- name: $phone 删除实际订单
  14 + api: api/m_api/actual/m_order_actual_del_api.yml
  15 + validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
  1 +config:
  2 + name: 分红管理-编辑
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_partner_account_from_database()}
  6 + msg: ok
  7 + teardown_hooks:
  8 + - ${sleep(2)}
  9 +
  10 +teststeps:
  11 +- name: $phone 登录系统
  12 + testcase: testcases/m_login_testcases.yml
  13 +
  14 +- name: $phone 分红管理-编辑
  15 + api: api/m_api/dividends/m_order_dividends_edit_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - $msg
@@ -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_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - status: ${get_status_from_database(partner_info)} 6 + status: ${get_status_from_database()}
7 teardown_hooks: 7 teardown_hooks:
8 - ${sleep(2)} 8 - ${sleep(2)}
9 9
@@ -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_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - status: ${get_status_from_database(partner_info)} 6 + status: ${get_status_from_database()}
7 teardown_hooks: 7 teardown_hooks:
8 - ${sleep(2)} 8 - ${sleep(2)}
9 9
@@ -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_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - status: ${get_status_from_database(partner_info)} 6 + status: ${get_status_from_database()}
7 teardown_hooks: 7 teardown_hooks:
8 - ${sleep(2)} 8 - ${sleep(2)}
9 9
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_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
@@ -10,8 +10,8 @@ teststeps: @@ -10,8 +10,8 @@ teststeps:
10 - name: $phone 登录系统 10 - name: $phone 登录系统
11 testcase: testcases/m_login_testcases.yml 11 testcase: testcases/m_login_testcases.yml
12 12
13 -- name: $phone 意向订单转发实发订单  
14 - api: api/m_api/purpose/m_order_purpose_convert_api.yml 13 +- name: $phone 意向订单发货
  14 + api: api/m_api/purpose/m_order_purpose_sendout_api.yml
15 validate: 15 validate:
16 - eq: 16 - eq:
17 - content.msg 17 - content.msg
  1 +config:
  2 + name: 删除意向订单
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_admin_account_from_database(admin_user)}
  6 + teardown_hooks:
  7 + - ${sleep(2)}
  8 +
  9 +teststeps:
  10 +- name: $phone 登录系统
  11 + testcase: testcases/m_login_testcases.yml
  12 +
  13 +- name: $phone 删除实际订单
  14 + api: api/m_api/purpose/m_order_purpose_del_api.yml
  15 + validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
@@ -16,7 +16,7 @@ testcases: @@ -16,7 +16,7 @@ testcases:
16 # 16 #
17 #- name: ADMIN004：查看管理员 17 #- name: ADMIN004：查看管理员
18 # testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml 18 # testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml
19 -# 19 +##
20 #- name: ADMIN005：禁用管理员 20 #- name: ADMIN005：禁用管理员
21 # testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml 21 # testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml
22 # 22 #
@@ -45,7 +45,7 @@ testcases: @@ -45,7 +45,7 @@ testcases:
45 # 45 #
46 #- name: PARTNERS006：启用合伙人 46 #- name: PARTNERS006：启用合伙人
47 # testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml 47 # testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
48 -# 48 +##
49 #- name: ACTUAL001：新增实际订单 49 #- name: ACTUAL001：新增实际订单
50 # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml 50 # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
51 # parameters: 51 # parameters:
@@ -54,16 +54,19 @@ testcases: @@ -54,16 +54,19 @@ testcases:
54 #- name: ACTUAL003：合伙人搜索——实际订单列表 54 #- name: ACTUAL003：合伙人搜索——实际订单列表
55 # testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml 55 # testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml
56 # 56 #
57 -#- name: ACTUAL004：搜索订单号——实际订单列表 57 +#- name: ACTUAL004：搜索发货单号——实际订单列表
58 # testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml 58 # testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
59 # 59 #
60 #- name: ACTUAL005：查看实际订单详情 60 #- name: ACTUAL005：查看实际订单详情
61 # testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml 61 # testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
62 62
63 -#- name: PURPOSE001：新增意向订单  
64 -# testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml  
65 -# parameters:  
66 -# account: ${create_phone_number(1)} 63 +#- name: ACTUAL006：删除实际订单
  64 +# testcase: testcases/actual/ACTUAL006_actual_del_testcases.yml
  65 +
  66 +- name: PURPOSE001：新增意向订单
  67 + testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml
  68 + parameters:
  69 + account: ${create_phone_number(1)}
67 70
68 #- name: PURPOSE002：编辑意向订单 71 #- name: PURPOSE002：编辑意向订单
69 # testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml 72 # testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml
@@ -71,15 +74,21 @@ testcases: @@ -71,15 +74,21 @@ testcases:
71 #- name: PURPOSE003：合伙人搜索——意向订单列表 74 #- name: PURPOSE003：合伙人搜索——意向订单列表
72 # testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 75 # testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
73 76
74 -- name: PURPOSE004：搜索订单号——意向订单列表  
75 - testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 77 +#- name: PURPOSE004：搜索订单号——意向订单列表
  78 +# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
76 79
77 -#- name: PURPOSE005：意向订单转发实发订单  
78 -# testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml 80 +- name: PURPOSE005：意向订单发货
  81 + testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml
79 82
80 #- name: PURPOSE006：查看意向订单详情 83 #- name: PURPOSE006：查看意向订单详情
81 # testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml 84 # testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml
82 85
  86 +#- name: ACTUAL007：删除意向订单
  87 +# testcase: testcases/purpose/PURPOSE007_purpose_del_testcases.yml
  88 +
  89 +- name: dividends：分红管理-编辑
  90 + testcase: testcases/dividends/dividend_edit_testcases.yml
  91 +
83 #- name: statistics：订单统计 92 #- name: statistics：订单统计
84 # testcase: testcases/order/order_statistics_testcases.yml 93 # testcase: testcases/order/order_statistics_testcases.yml
85 94