bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 f2d9a18889b787ce8a7c961376ec9940e99ada26 1 个父辈 d4d6d26c

add README

内嵌 并排对比
正在显示 19 个修改的文件 包含 182 行增加 和 416 行删除
@@ -2,29 +2,21 @@ @@ -2,29 +2,21 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment=""> 4 <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
5 - <change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders001.api.yml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/dividend/statistics_api.yml" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/api/app_api/order/list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/app_api/order/list_api.yml" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" beforeDir="false" /> 5 + <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" />
10 <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" /> 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" />
11 <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" /> 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$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" /> 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" />
14 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> 12 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
15 - <change beforePath="$PROJECT_DIR$/config/refreshToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/refreshToken.csv" afterDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />  
17 <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" />
18 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" /> 14 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
19 <change beforePath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" beforeDir="false" afterPath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" 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" />
20 - <change beforePath="$PROJECT_DIR$/reports/20200812T033205.613604.html" beforeDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/reports/20200812T033521.571604.html" beforeDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" beforeDir="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" />
23 <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" /> 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" />
24 - <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" afterDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/dividend/dividend_statistics_testcases.yml" afterDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/testcases/order/order_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/order/order_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" />
28 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 20 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
29 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 21 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
30 </list> 22 </list>
@@ -36,35 +28,26 @@ @@ -36,35 +28,26 @@
36 </component> 28 </component>
37 <component name="CoverageDataManager"> 29 <component name="CoverageDataManager">
38 <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$" /> 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$" />
39 - <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1597223804431" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 31 + <SUITE FILE_PATH="coverage/partner_api$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" />
40 <SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 32 <SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
41 - <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597224770757" 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" />
42 </component> 34 </component>
43 <component name="FileEditorManager"> 35 <component name="FileEditorManager">
44 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 36 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
45 <file pinned="false" current-in-tab="false"> 37 <file pinned="false" current-in-tab="false">
46 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 38 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
47 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
48 - <state relative-caret-position="1041">  
49 - <caret line="94" selection-start-line="94" selection-start-column="1" selection-end-line="95" selection-end-column="66" /> 40 + <state relative-caret-position="410">
  41 + <caret line="73" selection-start-line="73" selection-end-line="74" selection-end-column="69" />
50 </state> 42 </state>
51 </provider> 43 </provider>
52 </entry> 44 </entry>
53 </file> 45 </file>
54 <file pinned="false" current-in-tab="false"> 46 <file pinned="false" current-in-tab="false">
55 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">  
56 - <provider selected="true" editor-type-id="text-editor">  
57 - <state relative-caret-position="520">  
58 - <caret line="20" column="52" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" />  
59 - </state>  
60 - </provider>  
61 - </entry>  
62 - </file>  
63 - <file pinned="false" current-in-tab="false">  
64 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> 47 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
65 <provider selected="true" editor-type-id="text-editor"> 48 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="78">  
67 - <caret line="3" column="49" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="49" /> 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" />
68 </state> 51 </state>
69 </provider> 52 </provider>
70 </entry> 53 </entry>
@@ -72,29 +55,8 @@ @@ -72,29 +55,8 @@
72 <file pinned="false" current-in-tab="true"> 55 <file pinned="false" current-in-tab="true">
73 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 56 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
74 <provider selected="true" editor-type-id="text-editor"> 57 <provider selected="true" editor-type-id="text-editor">
75 - <state relative-caret-position="996">  
76 - <caret line="189" column="24" lean-forward="true" selection-start-line="189" selection-start-column="24" selection-end-line="189" selection-end-column="24" />  
77 - </state>  
78 - </provider>  
79 - </entry>  
80 - </file>  
81 - <file pinned="false" current-in-tab="false">  
82 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">  
83 - <provider selected="true" editor-type-id="text-editor">  
84 - <state relative-caret-position="104">  
85 - <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="46" />  
86 - </state>  
87 - </provider>  
88 - </entry>  
89 - </file>  
90 - <file pinned="false" current-in-tab="false">  
91 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">  
92 - <provider selected="true" editor-type-id="text-editor">  
93 - <state relative-caret-position="74">  
94 - <caret line="60" column="32" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="32" />  
95 - <folding>  
96 - <element signature="e#108#123#0" expanded="true" />  
97 - </folding> 58 + <state relative-caret-position="877">
  59 + <caret line="113" selection-start-line="113" selection-end-line="140" selection-end-column="14" />
98 </state> 60 </state>
99 </provider> 61 </provider>
100 </entry> 62 </entry>
@@ -110,9 +72,6 @@ @@ -110,9 +72,6 @@
110 </component> 72 </component>
111 <component name="FindInProjectRecents"> 73 <component name="FindInProjectRecents">
112 <findStrings> 74 <findStrings>
113 - <find>今日新增意向订单</find>  
114 - <find>todayRealMoney</find>  
115 - <find>orderQuantity</find>  
116 <find>partShipmentQuantity</find> 75 <find>partShipmentQuantity</find>
117 <find>allShipmentQuantity</find> 76 <find>allShipmentQuantity</find>
118 <find>get_allShipmentQuantity_from_database</find> 77 <find>get_allShipmentQuantity_from_database</find>
@@ -122,8 +81,6 @@ @@ -122,8 +81,6 @@
122 <find>todayIntentionMoney</find> 81 <find>todayIntentionMoney</find>
123 <find>todayIntentionQuantity</find> 82 <find>todayIntentionQuantity</find>
124 <find>get_purpose_address_from_database</find> 83 <find>get_purpose_address_from_database</find>
125 - <find>get_purpose_id_from_database</find>  
126 - <find>buyerPhone</find>  
127 <find>todayRealQuantity</find> 84 <find>todayRealQuantity</find>
128 <find>rou</find> 85 <find>rou</find>
129 <find>get_partner_id_from_database</find> 86 <find>get_partner_id_from_database</find>
@@ -136,7 +93,15 @@ @@ -136,7 +93,15 @@
136 <find>get_partner_account</find> 93 <find>get_partner_account</find>
137 <find>received</find> 94 <find>received</find>
138 <find>outstanding</find> 95 <find>outstanding</find>
  96 + <find>get_purpose_id_from_database</find>
  97 + <find>address</find>
  98 + <find>buyerPhone</find>
  99 + <find>orderDist</find>
  100 + <find>admin_account</find>
  101 + <find>actual_address</find>
  102 + <find>get_actual_delivery_code_from_database</find>
139 <find>get_order_status_from_database</find> 103 <find>get_order_status_from_database</find>
  104 + <find>get_actual_id_from_database</find>
140 </findStrings> 105 </findStrings>
141 </component> 106 </component>
142 <component name="Git.Settings"> 107 <component name="Git.Settings">
@@ -145,12 +110,6 @@ @@ -145,12 +110,6 @@
145 <component name="IdeDocumentHistory"> 110 <component name="IdeDocumentHistory">
146 <option name="CHANGED_PATHS"> 111 <option name="CHANGED_PATHS">
147 <list> 112 <list>
148 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />  
149 - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml" />  
150 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" />  
151 - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />  
152 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />  
153 - <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" />  
154 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" /> 113 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" />
155 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" /> 114 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" />
156 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" /> 115 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
@@ -174,10 +133,8 @@ @@ -174,10 +133,8 @@
174 <option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" /> 133 <option value="$PROJECT_DIR$/api/app_api/dividend/orders001api.yml" />
175 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" /> 134 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" />
176 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" /> 135 <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" />
177 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />  
178 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" /> 136 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
179 <option value="$PROJECT_DIR$/.env" /> 137 <option value="$PROJECT_DIR$/.env" />
180 - <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />  
181 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> 138 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
182 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" /> 139 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
183 <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" /> 140 <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" />
@@ -190,16 +147,24 @@ @@ -190,16 +147,24 @@
190 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" /> 147 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders001_testcases.yml" />
191 <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" /> 148 <option value="$PROJECT_DIR$/api/app_api/dividend/orders002.api.yml" />
192 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" /> 149 <option value="$PROJECT_DIR$/testcases/dividend/dividend_orders002_testcases.yml" />
193 - <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />  
194 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />  
195 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
196 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" /> 150 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
197 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.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" />
  153 + <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" />
  155 + <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" />
  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" />
  159 + <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" />
  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" />
198 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 163 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
199 </list> 164 </list>
200 </option> 165 </option>
201 </component> 166 </component>
202 - <component name="ProjectFrameBounds" extendedState="6"> 167 + <component name="ProjectFrameBounds" extendedState="7">
203 <option name="x" value="-116" /> 168 <option name="x" value="-116" />
204 <option name="y" value="347" /> 169 <option name="y" value="347" />
205 <option name="width" value="1382" /> 170 <option name="width" value="1382" />
@@ -239,30 +204,31 @@ @@ -239,30 +204,31 @@
239 <path> 204 <path>
240 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 205 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
241 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 206 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
242 - <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> 207 + <item name="api" type="462c0819:PsiDirectoryNode" />
  208 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  209 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
243 </path> 210 </path>
244 <path> 211 <path>
245 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 212 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
246 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 213 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
247 - <item name="testcases" type="462c0819:PsiDirectoryNode" /> 214 + <item name="helpfunc" type="462c0819:PsiDirectoryNode" />
248 </path> 215 </path>
249 <path> 216 <path>
250 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 217 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
251 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 218 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
252 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 219 <item name="testcases" type="462c0819:PsiDirectoryNode" />
253 - <item name="actual" type="462c0819:PsiDirectoryNode" />  
254 </path> 220 </path>
255 <path> 221 <path>
256 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 222 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
257 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 223 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
258 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 224 <item name="testcases" type="462c0819:PsiDirectoryNode" />
259 - <item name="dividend" type="462c0819:PsiDirectoryNode" /> 225 + <item name="order" type="462c0819:PsiDirectoryNode" />
260 </path> 226 </path>
261 <path> 227 <path>
262 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 228 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
263 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 229 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
264 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 230 <item name="testcases" type="462c0819:PsiDirectoryNode" />
265 - <item name="order" type="462c0819:PsiDirectoryNode" /> 231 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
266 </path> 232 </path>
267 <path> 233 <path>
268 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 234 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -316,7 +282,7 @@ @@ -316,7 +282,7 @@
316 </list> 282 </list>
317 </option> 283 </option>
318 </component> 284 </component>
319 - <component name="RunManager" selected="Python.pg_db_func"> 285 + <component name="RunManager" selected="Python.pg_app_db_func">
320 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 286 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
321 <module name="partner_api" /> 287 <module name="partner_api" />
322 <option name="INTERPRETER_OPTIONS" value="" /> 288 <option name="INTERPRETER_OPTIONS" value="" />
@@ -407,8 +373,8 @@ @@ -407,8 +373,8 @@
407 </configuration> 373 </configuration>
408 <recent_temporary> 374 <recent_temporary>
409 <list> 375 <list>
410 - <item itemvalue="Python.pg_db_func" />  
411 <item itemvalue="Python.pg_app_db_func" /> 376 <item itemvalue="Python.pg_app_db_func" />
  377 + <item itemvalue="Python.pg_db_func" />
412 <item itemvalue="Python.debugtalk" /> 378 <item itemvalue="Python.debugtalk" />
413 <item itemvalue="Python.db_pg_func" /> 379 <item itemvalue="Python.db_pg_func" />
414 </list> 380 </list>
@@ -459,21 +425,22 @@ @@ -459,21 +425,22 @@
459 <workItem from="1596899522553" duration="58000" /> 425 <workItem from="1596899522553" duration="58000" />
460 <workItem from="1597197819907" duration="7375000" /> 426 <workItem from="1597197819907" duration="7375000" />
461 <workItem from="1597211046716" duration="9744000" /> 427 <workItem from="1597211046716" duration="9744000" />
  428 + <workItem from="1597281783377" duration="7250000" />
462 </task> 429 </task>
463 <servers /> 430 <servers />
464 </component> 431 </component>
465 <component name="TimeTrackingManager"> 432 <component name="TimeTrackingManager">
466 - <option name="totallyTimeSpent" value="195207000" /> 433 + <option name="totallyTimeSpent" value="202457000" />
467 </component> 434 </component>
468 <component name="ToolWindowManager"> 435 <component name="ToolWindowManager">
469 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 436 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
470 <editor active="true" /> 437 <editor active="true" />
471 <layout> 438 <layout>
472 <window_info id="Favorites" order="0" side_tool="true" /> 439 <window_info id="Favorites" order="0" side_tool="true" />
473 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.3052575" /> 440 + <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.30954936" />
474 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 441 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
475 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 442 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
476 - <window_info anchor="bottom" id="Terminal" order="1" weight="0.2857143" /> 443 + <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" />
477 <window_info anchor="bottom" id="Message" order="2" /> 444 <window_info anchor="bottom" id="Message" order="2" />
478 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" /> 445 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" />
479 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" /> 446 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" />
@@ -496,23 +463,6 @@ @@ -496,23 +463,6 @@
496 <option name="version" value="1" /> 463 <option name="version" value="1" />
497 </component> 464 </component>
498 <component name="editorHistoryManager"> 465 <component name="editorHistoryManager">
499 - <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">  
500 - <provider selected="true" editor-type-id="text-editor">  
501 - <state relative-caret-position="88">  
502 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
503 - </state>  
504 - </provider>  
505 - </entry>  
506 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">  
507 - <provider selected="true" editor-type-id="text-editor">  
508 - <state relative-caret-position="-462">  
509 - <caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />  
510 - </state>  
511 - </provider>  
512 - </entry>  
513 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_1_testcases.yml" />  
514 - <entry file="file://$PROJECT_DIR$/testcases/order/order_list_0_testcases.yml" />  
515 - <entry file="file://$PROJECT_DIR$/api/app_api/order/list_2_api.yml" />  
516 <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml" /> 466 <entry file="file://$PROJECT_DIR$/api/app_api/order/list_1_api.yml" />
517 <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" /> 467 <entry file="file://$PROJECT_DIR$/testcases/order/order_list_2_testcases.yml" />
518 <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 468 <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
@@ -585,20 +535,6 @@ @@ -585,20 +535,6 @@
585 </state> 535 </state>
586 </provider> 536 </provider>
587 </entry> 537 </entry>
588 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">  
589 - <provider selected="true" editor-type-id="text-editor">  
590 - <state relative-caret-position="286">  
591 - <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />  
592 - </state>  
593 - </provider>  
594 - </entry>  
595 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">  
596 - <provider selected="true" editor-type-id="text-editor">  
597 - <state relative-caret-position="154">  
598 - <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />  
599 - </state>  
600 - </provider>  
601 - </entry>  
602 <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml"> 538 <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">
603 <provider selected="true" editor-type-id="text-editor"> 539 <provider selected="true" editor-type-id="text-editor">
604 <state relative-caret-position="154"> 540 <state relative-caret-position="154">
@@ -606,13 +542,6 @@ @@ -606,13 +542,6 @@
606 </state> 542 </state>
607 </provider> 543 </provider>
608 </entry> 544 </entry>
609 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">  
610 - <provider selected="true" editor-type-id="text-editor">  
611 - <state relative-caret-position="832">  
612 - <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />  
613 - </state>  
614 - </provider>  
615 - </entry>  
616 <entry file="file://$PROJECT_DIR$/.env"> 545 <entry file="file://$PROJECT_DIR$/.env">
617 <provider selected="true" editor-type-id="text-editor"> 546 <provider selected="true" editor-type-id="text-editor">
618 <state relative-caret-position="182"> 547 <state relative-caret-position="182">
@@ -620,13 +549,6 @@ @@ -620,13 +549,6 @@
620 </state> 549 </state>
621 </provider> 550 </provider>
622 </entry> 551 </entry>
623 - <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">  
624 - <provider selected="true" editor-type-id="text-editor">  
625 - <state relative-caret-position="286">  
626 - <caret line="11" column="52" lean-forward="true" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="52" />  
627 - </state>  
628 - </provider>  
629 - </entry>  
630 <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py"> 552 <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">
631 <provider selected="true" editor-type-id="text-editor"> 553 <provider selected="true" editor-type-id="text-editor">
632 <state relative-caret-position="658"> 554 <state relative-caret-position="658">
@@ -737,72 +659,127 @@ @@ -737,72 +659,127 @@
737 </state> 659 </state>
738 </provider> 660 </provider>
739 </entry> 661 </entry>
740 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml"> 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">
  665 + <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" />
  668 + </state>
  669 + </provider>
  670 + </entry>
  671 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
741 <provider selected="true" editor-type-id="text-editor"> 672 <provider selected="true" editor-type-id="text-editor">
742 - <state relative-caret-position="364">  
743 - <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" /> 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" />
744 </state> 675 </state>
745 </provider> 676 </provider>
746 </entry> 677 </entry>
747 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 678 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
748 <provider selected="true" editor-type-id="text-editor"> 679 <provider selected="true" editor-type-id="text-editor">
749 - <state relative-caret-position="182">  
750 - <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> 680 + <state relative-caret-position="78">
  681 + <caret line="3" column="38" selection-start-line="3" selection-start-column="38" selection-end-line="3" selection-end-column="38" />
751 </state> 682 </state>
752 </provider> 683 </provider>
753 </entry> 684 </entry>
754 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml"> 685 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
755 <provider selected="true" editor-type-id="text-editor"> 686 <provider selected="true" editor-type-id="text-editor">
756 - <state relative-caret-position="383">  
757 - <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" /> 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" />
  689 + </state>
  690 + </provider>
  691 + </entry>
  692 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
  693 + <provider selected="true" editor-type-id="text-editor">
  694 + <state relative-caret-position="421">
  695 + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
  696 + </state>
  697 + </provider>
  698 + </entry>
  699 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
  700 + <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" />
  703 + </state>
  704 + </provider>
  705 + </entry>
  706 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
  707 + <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" />
  710 + </state>
  711 + </provider>
  712 + </entry>
  713 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
  714 + <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" />
758 </state> 717 </state>
759 </provider> 718 </provider>
760 </entry> 719 </entry>
761 <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py"> 720 <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
762 <provider selected="true" editor-type-id="text-editor"> 721 <provider selected="true" editor-type-id="text-editor">
763 - <state relative-caret-position="74">  
764 - <caret line="60" column="32" selection-start-line="60" selection-start-column="4" selection-end-line="60" selection-end-column="32" /> 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" />
765 <folding> 724 <folding>
766 <element signature="e#108#123#0" expanded="true" /> 725 <element signature="e#108#123#0" expanded="true" />
767 </folding> 726 </folding>
768 </state> 727 </state>
769 </provider> 728 </provider>
770 </entry> 729 </entry>
771 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">  
772 - <provider selected="true" editor-type-id="text-editor" /> 730 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
  731 + <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" />
  734 + </state>
  735 + </provider>
  736 + </entry>
  737 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
  738 + <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" />
  741 + </state>
  742 + </provider>
773 </entry> 743 </entry>
774 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml"> 744 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
775 <provider selected="true" editor-type-id="text-editor"> 745 <provider selected="true" editor-type-id="text-editor">
776 - <state relative-caret-position="104">  
777 - <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="46" /> 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" />
778 </state> 748 </state>
779 </provider> 749 </provider>
780 </entry> 750 </entry>
781 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 751 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">
782 <provider selected="true" editor-type-id="text-editor"> 752 <provider selected="true" editor-type-id="text-editor">
783 - <state relative-caret-position="1041">  
784 - <caret line="94" selection-start-line="94" selection-start-column="1" selection-end-line="95" selection-end-column="66" /> 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" />
785 </state> 755 </state>
786 </provider> 756 </provider>
787 </entry> 757 </entry>
788 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml"> 758 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
789 <provider selected="true" editor-type-id="text-editor"> 759 <provider selected="true" editor-type-id="text-editor">
790 - <state relative-caret-position="520">  
791 - <caret line="20" column="52" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" /> 760 + <state relative-caret-position="421">
  761 + <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
792 </state> 762 </state>
793 </provider> 763 </provider>
794 </entry> 764 </entry>
795 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> 765 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
796 <provider selected="true" editor-type-id="text-editor"> 766 <provider selected="true" editor-type-id="text-editor">
797 - <state relative-caret-position="78">  
798 - <caret line="3" column="49" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="49" /> 767 + <state relative-caret-position="410">
  768 + <caret line="73" selection-start-line="73" selection-end-line="74" selection-end-column="69" />
  769 + </state>
  770 + </provider>
  771 + </entry>
  772 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
  773 + <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" />
799 </state> 776 </state>
800 </provider> 777 </provider>
801 </entry> 778 </entry>
802 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 779 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
803 <provider selected="true" editor-type-id="text-editor"> 780 <provider selected="true" editor-type-id="text-editor">
804 - <state relative-caret-position="996">  
805 - <caret line="189" column="24" lean-forward="true" selection-start-line="189" selection-start-column="24" selection-end-line="189" selection-end-column="24" /> 781 + <state relative-caret-position="877">
  782 + <caret line="113" selection-start-line="113" selection-end-line="140" selection-end-column="14" />
806 </state> 783 </state>
807 </provider> 784 </provider>
808 </entry> 785 </entry>
1 name: 查看实际订单详情 1 name: 查看实际订单详情
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderStatue: ${get_order_status_from_database(order)}  
5 - id: ${get_actual_id_from_database(order)} 4 + id: ${get_actual_id_from_database()}
6 request: 5 request:
7 headers: 6 headers:
8 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
@@ -16,6 +15,3 @@ validate: @@ -16,6 +15,3 @@ validate:
16 - eq: 15 - eq:
17 - content.msg 16 - content.msg
18 - ok 17 - ok
19 - - eq:  
20 - - content.data.orderStatue  
21 - - $orderStatue  
1 name: 合伙人搜索——实际订单列表 1 name: 合伙人搜索——实际订单列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderStatue: ${get_order_status_from_database(order)}  
5 partner: ${get_partner_id_from_database()} 4 partner: ${get_partner_id_from_database()}
6 request: 5 request:
7 headers: 6 headers:
@@ -19,6 +18,3 @@ validate: @@ -19,6 +18,3 @@ validate:
19 - eq: 18 - eq:
20 - content.msg 19 - content.msg
21 - ok 20 - ok
22 - - eq:  
23 - - content.data.gridResult.lists.0.orderStatue  
24 - - $orderStatue  
1 name: 搜索订单号——实际订单列表 1 name: 搜索订单号——实际订单列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderStatue: ${get_order_status_from_database(order)}  
5 searchText: ${get_actual_delivery_code_from_database()} 4 searchText: ${get_actual_delivery_code_from_database()}
6 partner: ${get_partner_id_from_database()} 5 partner: ${get_partner_id_from_database()}
7 request: 6 request:
@@ -20,6 +19,3 @@ validate: @@ -20,6 +19,3 @@ validate:
20 - eq: 19 - eq:
21 - content.msg 20 - content.msg
22 - ok 21 - ok
23 - - eq:  
24 - - content.data.gridResult.lists.0.status  
25 - - $orderStatue  
1 name: 意向订单编辑 1 name: 意向订单编辑
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - address: ${get_purpose_address_from_database(order)}  
5 - id: ${get_purpose_id_from_database(order)}  
6 - buyer: ${get_purpose_buyer_from_database(order)}  
7 - buyerPhone: ${get_purpose_buyerPhone_from_database(order)}  
8 - orderDist: ${get_purpose_orderDist_from_database(order)}  
9 - orderId: ${get_purpose_orderId_from_database(order)}  
10 - orderName: ${get_purpose_orderName_from_database(order)} 4 + orderid: ${get_purpose_id_from_database()}
  5 + partner: ${get_partner_name_from_database()}
11 request: 6 request:
12 headers: 7 headers:
13 Content-Type: application/json;charset=utf-8 8 Content-Type: application/json;charset=utf-8
14 User-Agent: okhttp/3.12.3 9 User-Agent: okhttp/3.12.3
15 Authorization: Bearer ${get_m_accesstoken()} 10 Authorization: Bearer ${get_m_accesstoken()}
16 json: 11 json:
17 - buyer: $buyer  
18 - buyerPhone: $buyerPhone  
19 - address: $address  
20 - partner: 29  
21 - partnerRatio: 10.2  
22 - salesmanRatio: 0.99  
23 - orderId: $orderId  
24 - orderName: $orderName  
25 - orderNum: 500  
26 - orderPrice: 1000  
27 - orderDist: $orderDist  
28 - id: $id 12 + orderId: ${get_nowtime()}
  13 + buyer: 我是客户${get_second()}
  14 + orderDist: '福建二区'
  15 + partnerID: ${get_partner_id_from_database()}
  16 + partner: $partner
  17 + id: $orderid
  18 + commissionProportion: 10.2
  19 + product:
  20 + - id: ${get_ID_from_database(0)}
  21 + productName: 产品名称${get_second()}
  22 + orderNum: 33
  23 + univalence: 1.12
  24 + partnerRatio: 1.27
  25 + - id: ${get_ID_from_database(1)}
  26 + productName: 产品名称${get_second()}
  27 + orderNum: 45
  28 + univalence: 2.22
  29 + partnerRatio: 5.7
29 method: POST 30 method: POST
30 url: v1/order/purpose/update 31 url: v1/order/purpose/update
31 validate: 32 validate:
1 name: 合伙人搜索——意向订单列表 1 name: 合伙人搜索——意向订单列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderStatue: ${get_purpose_order_status_from_database(order)} 4 + partner: ${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
@@ -10,7 +10,7 @@ request: @@ -10,7 +10,7 @@ request:
10 json: 10 json:
11 pageNumber: 1 11 pageNumber: 1
12 pageSize: 10 12 pageSize: 10
13 - partner: 29 13 + partner: $partner
14 searchText: '' 14 searchText: ''
15 method: POST 15 method: POST
16 url: v1/order/purpose/list 16 url: v1/order/purpose/list
@@ -18,6 +18,3 @@ validate: @@ -18,6 +18,3 @@ validate:
18 - eq: 18 - eq:
19 - content.msg 19 - content.msg
20 - ok 20 - ok
21 - - eq:  
22 - - content.data.gridResult.lists.0.orderStatue  
23 - - $orderStatue  
1 name: 搜索订单号——意向订单列表 1 name: 搜索订单号——意向订单列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderStatue: ${get_purpose_order_status_from_database(order)}  
5 searchText: ${get_purpose_orderId_from_database(order)} 4 searchText: ${get_purpose_orderId_from_database(order)}
6 request: 5 request:
7 headers: 6 headers:
@@ -19,6 +18,3 @@ validate: @@ -19,6 +18,3 @@ validate:
19 - eq: 18 - eq:
20 - content.msg 19 - content.msg
21 - ok 20 - ok
22 - - eq:  
23 - - content.data.gridResult.lists.0.orderStatue  
24 - - $orderStatue  
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTcyNjc3NjQsImlhdCI6MTU5NzIyNDU2NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzIyNDU2NCwidWlkIjoxOH0.3LItQh9bAjVXu-77Rl_EbejijxOfA1-CjcpNqWRsXnc  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTczMzIxMjIsImlhdCI6MTU5NzI4ODkyMiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NzI4ODkyMiwidWlkIjoxOH0.keiW0ynf6DGb-3vkp0zBZR02ZuR3ujTlEfUAnJZxW6M
@@ -74,13 +74,13 @@ def get_partner_id_from_database(): @@ -74,13 +74,13 @@ def get_partner_id_from_database():
74 db.rollback() 74 db.rollback()
75 db.close() 75 db.close()
76 # print(get_partner_id_from_database()) 76 # print(get_partner_id_from_database())
77 - 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()
81 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 81 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
82 sql = '''select partner_name from partner_info where account = '13459147023' ''' 82 sql = '''select partner_name from partner_info where account = '13459147023' '''
83 - print(sql) 83 + # print(sql)
84 try: 84 try:
85 cursor.execute(sql) 85 cursor.execute(sql)
86 result = cursor.fetchone() 86 result = cursor.fetchone()
@@ -90,7 +90,6 @@ def get_partner_name_from_database(): @@ -90,7 +90,6 @@ 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 -# print(get_partner_name_from_database())  
94 #获取超级管理员账号 93 #获取超级管理员账号
95 def get_partner_account_from_database(): 94 def get_partner_account_from_database():
96 db = GetConnect() 95 db = GetConnect()
@@ -34,12 +34,12 @@ def get_admin_account_from_database(tbl): @@ -34,12 +34,12 @@ def get_admin_account_from_database(tbl):
34 db.rollback() 34 db.rollback()
35 db.close() 35 db.close()
36 36
37 -def get_id_from_database(tbl): 37 +#实际订单的发货单号
  38 +def get_actual_delivery_code_from_database():
38 db = GetConnect() 39 db = GetConnect()
39 cursor = db.cursor() 40 cursor = db.cursor()
40 - # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '  
41 - sql = 'select id from \"{}\" order by id DESC'.format(tbl)  
42 - # print(sql) 41 + sql = '''select delivery_code from order_base where order_type = 1 order by id DESC'''
  42 + #print(sql)
43 try: 43 try:
44 cursor.execute(sql) 44 cursor.execute(sql)
45 result = cursor.fetchone() 45 result = cursor.fetchone()
@@ -50,12 +50,12 @@ def get_id_from_database(tbl): @@ -50,12 +50,12 @@ def get_id_from_database(tbl):
50 db.rollback() 50 db.rollback()
51 db.close() 51 db.close()
52 52
53 -def get_actual_id_from_database(tbl): 53 +#实际订单的id
  54 +def get_actual_id_from_database():
54 db = GetConnect() 55 db = GetConnect()
55 cursor = db.cursor() 56 cursor = db.cursor()
56 - # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '  
57 - sql = 'select id from \"{}\" where order_type = 1 order by id DESC'.format(tbl)  
58 - # print(sql) 57 + sql = '''select id from order_base where order_type = 1 order by id DESC'''
  58 + #print(sql)
59 try: 59 try:
60 cursor.execute(sql) 60 cursor.execute(sql)
61 result = cursor.fetchone() 61 result = cursor.fetchone()
@@ -65,26 +65,13 @@ def get_actual_id_from_database(tbl): @@ -65,26 +65,13 @@ def get_actual_id_from_database(tbl):
65 print(err) 65 print(err)
66 db.rollback() 66 db.rollback()
67 db.close() 67 db.close()
  68 +
68 #意向订单id 69 #意向订单id
69 def get_purpose_id_from_database(): 70 def get_purpose_id_from_database():
70 db = GetConnect() 71 db = GetConnect()
71 cursor = db.cursor() 72 cursor = db.cursor()
72 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 73 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
73 - sql = '''select id from "order" where order_type = 2 order by id DESC'''  
74 - try:  
75 - cursor.execute(sql)  
76 - result = cursor.fetchone()  
77 - return result[0]  
78 - except Exception as err:  
79 - # 发生错误时回滚  
80 - print(err)  
81 - db.rollback()  
82 - db.close()  
83 -  
84 -def get_account_from_database(tbl):  
85 - db = GetConnect()  
86 - cursor = db.cursor()  
87 - sql= "select account from " + tbl + ' ' + 'order by id desc ' 74 + sql = '''select id from order_base where order_type = 2 order by id DESC'''
88 try: 75 try:
89 cursor.execute(sql) 76 cursor.execute(sql)
90 result = cursor.fetchone() 77 result = cursor.fetchone()
@@ -94,67 +81,26 @@ def get_account_from_database(tbl): @@ -94,67 +81,26 @@ def get_account_from_database(tbl):
94 print(err) 81 print(err)
95 db.rollback() 82 db.rollback()
96 db.close() 83 db.close()
97 -  
98 -def get_partnername_from_database(tbl):  
99 - db = GetConnect()  
100 - cursor = db.cursor()  
101 - sql= "select partner_name from " + tbl + ' ' + 'order by id desc '  
102 - try:  
103 - cursor.execute(sql)  
104 - result = cursor.fetchone()  
105 - return result[0]  
106 - except Exception as err:  
107 - # 发生错误时回滚  
108 - print(err)  
109 - db.rollback()  
110 - db.close()  
111 -  
112 -def get_area_from_database(tbl):  
113 - db = GetConnect()  
114 - cursor = db.cursor()  
115 - sql= "select region_info from " + tbl + ' ' + 'order by id desc '  
116 - try:  
117 - cursor.execute(sql)  
118 - result = cursor.fetchone()  
119 - return result[0]['regionName']  
120 - except Exception as err:  
121 - # 发生错误时回滚  
122 - print(err)  
123 - db.rollback()  
124 - db.close()  
125 -  
126 -def get_salesman_from_database(tbl): 84 +#意向订单的产品ID
  85 +def get_ID_from_database(id):
127 db = GetConnect() 86 db = GetConnect()
128 cursor = db.cursor() 87 cursor = db.cursor()
129 - sql= "select salesman from " + tbl + ' ' + 'order by id desc '  
130 - try:  
131 - cursor.execute(sql)  
132 - result = cursor.fetchone()  
133 - return result[0][0]['name']  
134 - except Exception as err:  
135 - # 发生错误时回滚  
136 - print(err)  
137 - db.rollback()  
138 - db.close()  
139 -  
140 -def get_phone_from_database(tbl):  
141 - db = GetConnect()  
142 - cursor = db.cursor()  
143 - sql= "select salesman from " + tbl + ' ' + 'order by id desc ' 88 + sql= '''select id from order_good where order_id = {} order by id ASC '''.format(get_purpose_id_from_database())
  89 + # print(sql)
144 try: 90 try:
145 cursor.execute(sql) 91 cursor.execute(sql)
146 - result = cursor.fetchone()  
147 - return result[0][0]['telephone'] 92 + result = cursor.fetchall()
  93 + return result[id][0]
148 except Exception as err: 94 except Exception as err:
149 # 发生错误时回滚 95 # 发生错误时回滚
150 print(err) 96 print(err)
151 db.rollback() 97 db.rollback()
152 db.close() 98 db.close()
153 99
154 -def get_status_from_database(tbl): 100 +def get_account_from_database(tbl):
155 db = GetConnect() 101 db = GetConnect()
156 cursor = db.cursor() 102 cursor = db.cursor()
157 - sql= "select status from " + tbl + ' ' + 'order by id desc ' 103 + sql= "select account from " + tbl + ' ' + 'order by id desc '
158 try: 104 try:
159 cursor.execute(sql) 105 cursor.execute(sql)
160 result = cursor.fetchone() 106 result = cursor.fetchone()
@@ -168,37 +114,7 @@ def get_status_from_database(tbl): @@ -168,37 +114,7 @@ def get_status_from_database(tbl):
168 def get_partnername_from_database(tbl): 114 def get_partnername_from_database(tbl):
169 db = GetConnect() 115 db = GetConnect()
170 cursor = db.cursor() 116 cursor = db.cursor()
171 - sql= "select partner_name from " + tbl + ' ' + "where partner_category = 1" + ' ' + 'order by id desc '  
172 - try:  
173 - cursor.execute(sql)  
174 - result = cursor.fetchone()  
175 - return result[0]  
176 - except Exception as err:  
177 - # 发生错误时回滚  
178 - print(err)  
179 - db.rollback()  
180 - db.close()  
181 -  
182 -def get_order_status_from_database():  
183 - db = GetConnect()  
184 - cursor = db.cursor()  
185 - sql = '''select bonus_status from order_base where order_type = 1 order by id DESC'''  
186 - # print(sql)  
187 - try:  
188 - cursor.execute(sql)  
189 - result = cursor.fetchone()  
190 - return result[0]  
191 - except Exception as err:  
192 - # 发生错误时回滚  
193 - print(err)  
194 - db.rollback()  
195 - db.close()  
196 -  
197 -def get_purpose_order_status_from_database(tbl):  
198 - db = GetConnect()  
199 - cursor = db.cursor()  
200 - sql = 'select order_status from \"{}\" where order_type = 2 order by id DESC'.format(tbl)  
201 - # print(sql) 117 + sql= "select partner_name from " + tbl + ' ' + 'order by id desc '
202 try: 118 try:
203 cursor.execute(sql) 119 cursor.execute(sql)
204 result = cursor.fetchone() 120 result = cursor.fetchone()
@@ -209,100 +125,11 @@ def get_purpose_order_status_from_database(tbl): @@ -209,100 +125,11 @@ def get_purpose_order_status_from_database(tbl):
209 db.rollback() 125 db.rollback()
210 db.close() 126 db.close()
211 127
212 -def get_actual_address_from_database(tbl):  
213 - db = GetConnect()  
214 - cursor = db.cursor()  
215 - sql = 'select buyer from \"{}\" where order_type = 1 order by id DESC'.format(tbl)  
216 - try:  
217 - cursor.execute(sql)  
218 - result = cursor.fetchone()  
219 - return result[0]['shippingAddress']  
220 - except Exception as err:  
221 - # 发生错误时回滚  
222 - print(err)  
223 - db.rollback()  
224 - db.close()  
225 -  
226 -def get_actual_buyer_from_database(tbl):  
227 - db = GetConnect()  
228 - cursor = db.cursor()  
229 - sql = 'select buyer from \"{}\" where order_type = 1 order by id DESC'.format(tbl)  
230 - # print(sql)  
231 - try:  
232 - cursor.execute(sql)  
233 - result = cursor.fetchone()  
234 - return result[0]['buyerName']  
235 - except Exception as err:  
236 - # 发生错误时回滚  
237 - print(err)  
238 - db.rollback()  
239 - db.close()  
240 -  
241 -def get_purpose_buyer_from_database(tbl):  
242 - db = GetConnect()  
243 - cursor = db.cursor()  
244 - sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)  
245 - # print(sql)  
246 - try:  
247 - cursor.execute(sql)  
248 - result = cursor.fetchone()  
249 - return result[0]['buyerName']  
250 - except Exception as err:  
251 - # 发生错误时回滚  
252 - print(err)  
253 - db.rollback()  
254 - db.close()  
255 128
256 -def get_actual_orderDist_from_database(tbl):  
257 - db = GetConnect()  
258 - cursor = db.cursor()  
259 - sql = 'select order_region_info from \"{}\" where order_type = 1 order by id DESC'.format(tbl)  
260 - # print(sql)  
261 - try:  
262 - cursor.execute(sql)  
263 - result = cursor.fetchone()  
264 - return result[0]['regionName']  
265 - except Exception as err:  
266 - # 发生错误时回滚  
267 - print(err)  
268 - db.rollback()  
269 - db.close()  
270 -  
271 -def get_purpose_orderDist_from_database(tbl):  
272 - db = GetConnect()  
273 - cursor = db.cursor()  
274 - sql = 'select order_region_info from \"{}\" where order_type = 2 order by id DESC'.format(tbl)  
275 - # print(sql)  
276 - try:  
277 - cursor.execute(sql)  
278 - result = cursor.fetchone()  
279 - return result[0]['regionName']  
280 - except Exception as err:  
281 - # 发生错误时回滚  
282 - print(err)  
283 - db.rollback()  
284 - db.close()  
285 -  
286 -def get_actual_delivery_code_from_database():  
287 - db = GetConnect()  
288 - cursor = db.cursor()  
289 - sql = '''select delivery_code from order_base where order_type = 1 order by id DESC'''  
290 - # print(sql)  
291 - try:  
292 - cursor.execute(sql)  
293 - result = cursor.fetchone()  
294 - return result[0]  
295 - except Exception as err:  
296 - # 发生错误时回滚  
297 - print(err)  
298 - db.rollback()  
299 - db.close()  
300 -# print(get_actual_delivery_code_from_database())  
301 -def get_purpose_orderId_from_database(tbl): 129 +def get_partnername_from_database(tbl):
302 db = GetConnect() 130 db = GetConnect()
303 cursor = db.cursor() 131 cursor = db.cursor()
304 - sql = 'select order_code from \"{}\" where order_type = 2 order by id DESC'.format(tbl)  
305 - # print(sql) 132 + sql= "select partner_name from " + tbl + ' ' + "where partner_category = 1" + ' ' + 'order by id desc '
306 try: 133 try:
307 cursor.execute(sql) 134 cursor.execute(sql)
308 result = cursor.fetchone() 135 result = cursor.fetchone()
@@ -312,6 +139,3 @@ def get_purpose_orderId_from_database(tbl): @@ -312,6 +139,3 @@ def get_purpose_orderId_from_database(tbl):
312 print(err) 139 print(err)
313 db.rollback() 140 db.rollback()
314 db.close() 141 db.close()
315 -  
316 -print(get_order_status_from_database())  
317 -  
1 { 1 {
2 "testcase":[ 2 "testcase":[
3 - "testcases/dividend/dividend_statistics_testcases.yml" 3 + "testcases/actual/ACTUAL003_actual_list_testcases.yml"
4 ] 4 ]
5 } 5 }
@@ -3,7 +3,6 @@ config: @@ -3,7 +3,6 @@ config:
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - orderStatue: ${get_order_status_from_database(order)}  
7 teardown_hooks: 6 teardown_hooks:
8 - ${sleep(2)} 7 - ${sleep(2)}
9 8
@@ -17,6 +16,3 @@ teststeps: @@ -17,6 +16,3 @@ teststeps:
17 - eq: 16 - eq:
18 - content.msg 17 - content.msg
19 - ok 18 - ok
20 - - eq:  
21 - - content.data.gridResult.lists.0.orderStatue  
22 - - $orderStatue  
@@ -3,7 +3,6 @@ config: @@ -3,7 +3,6 @@ config:
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - orderStatue: ${get_order_status_from_database(order)}  
7 teardown_hooks: 6 teardown_hooks:
8 - ${sleep(2)} 7 - ${sleep(2)}
9 8
@@ -17,6 +16,3 @@ teststeps: @@ -17,6 +16,3 @@ teststeps:
17 - eq: 16 - eq:
18 - content.msg 17 - content.msg
19 - ok 18 - ok
20 - - eq:  
21 - - content.data.gridResult.lists.0.status  
22 - - $orderStatue  
@@ -3,7 +3,6 @@ config: @@ -3,7 +3,6 @@ config:
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - orderStatue: ${get_order_status_from_database(order)}  
7 teardown_hooks: 6 teardown_hooks:
8 - ${sleep(2)} 7 - ${sleep(2)}
9 8
@@ -17,6 +16,3 @@ teststeps: @@ -17,6 +16,3 @@ teststeps:
17 - eq: 16 - eq:
18 - content.msg 17 - content.msg
19 - ok 18 - ok
20 - - eq:  
21 - - content.data.orderStatue  
22 - - $orderStatue  
@@ -3,7 +3,6 @@ config: @@ -3,7 +3,6 @@ config:
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 phone: ${get_admin_account_from_database(admin_user)} 5 phone: ${get_admin_account_from_database(admin_user)}
6 - orderStatue: ${get_purpose_order_status_from_database(order)}  
7 teardown_hooks: 6 teardown_hooks:
8 - ${sleep(2)} 7 - ${sleep(2)}
9 8
@@ -17,6 +16,3 @@ teststeps: @@ -17,6 +16,3 @@ teststeps:
17 - eq: 16 - eq:
18 - content.msg 17 - content.msg
19 - ok 18 - ok
20 - - eq:  
21 - - content.data.gridResult.lists.0.orderStatue  
22 - - $orderStatue  
@@ -54,8 +54,8 @@ testcases: @@ -54,8 +54,8 @@ 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：搜索订单号——实际订单列表  
58 - testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml 57 +#- name: ACTUAL004：搜索订单号——实际订单列表
  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
@@ -71,8 +71,8 @@ testcases: @@ -71,8 +71,8 @@ testcases:
71 #- name: PURPOSE003：合伙人搜索——意向订单列表 71 #- name: PURPOSE003：合伙人搜索——意向订单列表
72 # testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 72 # testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
73 73
74 -#- name: PURPOSE004：搜索订单号——意向订单列表  
75 -# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 74 +- name: PURPOSE004：搜索订单号——意向订单列表
  75 + testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
76 76
77 #- name: PURPOSE005：意向订单转发实发订单 77 #- name: PURPOSE005：意向订单转发实发订单
78 # testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml 78 # testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml