bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 0f25741f62cb72d0b2f11638705557771df90d22 1 个父辈 dd2d872b

add README

内嵌 并排对比
正在显示 24 个修改的文件 包含 774 行增加 和 243 行删除
@@ -2,35 +2,22 @@ @@ -2,35 +2,22 @@
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_edit_order_actual_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" afterDir="false" />  
8 - <change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />  
9 - <change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" afterDir="false" />  
10 - <change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" afterDir="false" />  
11 - <change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" />  
12 - <change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" afterDir="false" /> 5 + <change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" afterDir="false" />
  8 + <change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" afterDir="false" />
  9 + <change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" afterDir="false" />
  10 + <change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" afterDir="false" />
  11 + <change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 12 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
14 - <change beforePath="$PROJECT_DIR$/api/m_api/m_order_actual_api.yml" beforeDir="false" />  
15 - <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" /> 13 + <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" afterDir="false" />
  14 + <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" />
  15 + <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" />
  16 + <change beforePath="$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml" beforeDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/api/m_api/m_profile_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" afterDir="false" />
16 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> 18 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
17 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 19 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.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" /> 20 <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" />  
20 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" afterDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" afterDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" afterDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" afterDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/testcases/m_login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/m_login_testcases.yml" afterDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" afterDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" afterDir="false" />  
29 - <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" />  
30 - <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" />  
31 - <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" />  
32 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" afterDir="false" />  
33 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" 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$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
35 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 22 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
36 </list> 23 </list>
@@ -42,43 +29,41 @@ @@ -42,43 +29,41 @@
42 </component> 29 </component>
43 <component name="CoverageDataManager"> 30 <component name="CoverageDataManager">
44 <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" 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$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  32 + <SUITE FILE_PATH="coverage/partner_api$pg_app_db_func.coverage" NAME="pg_app_db_func Coverage Results" MODIFIED="1594742672628" 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$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$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$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594655535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 34 + <SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594718579059" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
47 </component> 35 </component>
48 <component name="FileEditorManager"> 36 <component name="FileEditorManager">
49 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 37 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
50 <file pinned="false" current-in-tab="false"> 38 <file pinned="false" current-in-tab="false">
51 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">  
52 - <provider selected="true" editor-type-id="text-editor">  
53 - <state relative-caret-position="66">  
54 - <caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />  
55 - </state>  
56 - </provider>  
57 - </entry>  
58 - </file>  
59 - <file pinned="false" current-in-tab="true">  
60 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml"> 39 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
61 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
62 - <state relative-caret-position="22">  
63 - <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" /> 41 + <state relative-caret-position="158">
  42 + <caret line="84" column="71" selection-start-line="84" selection-start-column="71" selection-end-line="84" selection-end-column="71" />
64 </state> 43 </state>
65 </provider> 44 </provider>
66 </entry> 45 </entry>
67 </file> 46 </file>
68 <file pinned="false" current-in-tab="false"> 47 <file pinned="false" current-in-tab="false">
69 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml"> 48 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
70 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
71 - <state relative-caret-position="246">  
72 - <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" /> 50 + <state relative-caret-position="176">
  51 + <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
  52 + <folding>
  53 + <element signature="e#0#13#0" expanded="true" />
  54 + </folding>
73 </state> 55 </state>
74 </provider> 56 </provider>
75 </entry> 57 </entry>
76 </file> 58 </file>
77 - <file pinned="false" current-in-tab="false">  
78 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 59 + <file pinned="false" current-in-tab="true">
  60 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
79 <provider selected="true" editor-type-id="text-editor"> 61 <provider selected="true" editor-type-id="text-editor">
80 - <state relative-caret-position="246">  
81 - <caret line="64" column="68" selection-start-line="64" selection-start-column="68" selection-end-line="64" selection-end-column="68" /> 62 + <state relative-caret-position="369">
  63 + <caret line="70" selection-start-line="70" selection-end-line="70" />
  64 + <folding>
  65 + <element signature="e#108#123#0" expanded="true" />
  66 + </folding>
82 </state> 67 </state>
83 </provider> 68 </provider>
84 </entry> 69 </entry>
@@ -98,17 +83,6 @@ @@ -98,17 +83,6 @@
98 <component name="IdeDocumentHistory"> 83 <component name="IdeDocumentHistory">
99 <option name="CHANGED_PATHS"> 84 <option name="CHANGED_PATHS">
100 <list> 85 <list>
101 - <option value="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" />  
102 - <option value="$PROJECT_DIR$/.env" />  
103 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" />  
104 - <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" />  
105 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />  
106 - <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" />  
107 - <option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />  
108 - <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_list_api.yml" />  
109 - <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" />  
110 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />  
111 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" />  
112 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" /> 86 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />
113 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" /> 87 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
114 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" /> 88 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
@@ -118,11 +92,9 @@ @@ -118,11 +92,9 @@
118 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" /> 92 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" />
119 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" /> 93 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" />
120 <option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" /> 94 <option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
121 - <option value="$PROJECT_DIR$/debugtalk.py" />  
122 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_api.yml" /> 95 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_api.yml" />
123 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" /> 96 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
124 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" /> 97 <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
125 - <option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />  
126 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" /> 98 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
127 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" /> 99 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
128 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" /> 100 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />
@@ -140,12 +112,28 @@ @@ -140,12 +112,28 @@
140 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" /> 112 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" />
141 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" /> 113 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" />
142 <option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" /> 114 <option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />
143 - <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />  
144 - <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />  
145 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" /> 115 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
146 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
147 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" /> 116 <option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />
  117 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml" />
  118 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml" />
  119 + <option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />
  120 + <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
148 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" /> 121 <option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />
  122 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml" />
  123 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml" />
  124 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
  125 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml" />
  126 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml" />
  127 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml" />
  128 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml" />
  129 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml" />
  130 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml" />
  131 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_actual_detail_testcases.yml" />
  132 + <option value="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml" />
  133 + <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml" />
  134 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
  135 + <option value="$PROJECT_DIR$/debugtalk.py" />
  136 + <option value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
149 </list> 137 </list>
150 </option> 138 </option>
151 </component> 139 </component>
@@ -191,7 +179,7 @@ @@ -191,7 +179,7 @@
191 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 179 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
192 <item name="api" type="462c0819:PsiDirectoryNode" /> 180 <item name="api" type="462c0819:PsiDirectoryNode" />
193 <item name="m_api" type="462c0819:PsiDirectoryNode" /> 181 <item name="m_api" type="462c0819:PsiDirectoryNode" />
194 - <item name="partners" type="462c0819:PsiDirectoryNode" /> 182 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
195 </path> 183 </path>
196 <path> 184 <path>
197 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 185 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
@@ -212,6 +200,12 @@ @@ -212,6 +200,12 @@
212 <path> 200 <path>
213 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 201 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
214 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 202 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
  203 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  204 + <item name="purpose" type="462c0819:PsiDirectoryNode" />
  205 + </path>
  206 + <path>
  207 + <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
  208 + <item name="partner_api" type="462c0819:PsiDirectoryNode" />
215 <item name="testsuites" type="462c0819:PsiDirectoryNode" /> 209 <item name="testsuites" type="462c0819:PsiDirectoryNode" />
216 </path> 210 </path>
217 </expand> 211 </expand>
@@ -228,14 +222,15 @@ @@ -228,14 +222,15 @@
228 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 222 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
229 </component> 223 </component>
230 <component name="RecentsManager"> 224 <component name="RecentsManager">
231 - <key name="MoveFile.RECENT_KEYS">  
232 - <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />  
233 - </key>  
234 <key name="CopyFile.RECENT_KEYS"> 225 <key name="CopyFile.RECENT_KEYS">
  226 + <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
  227 + <recent name="E:\mmm_auto\partner_api\testcases\purpose" />
235 <recent name="E:\mmm_auto\partner_api\testcases\actual" /> 228 <recent name="E:\mmm_auto\partner_api\testcases\actual" />
236 <recent name="E:\mmm_auto\partner_api\api\m_api\actual" /> 229 <recent name="E:\mmm_auto\partner_api\api\m_api\actual" />
237 <recent name="E:\mmm_auto\partner_api\testcases\partners" /> 230 <recent name="E:\mmm_auto\partner_api\testcases\partners" />
238 - <recent name="E:\mmm_auto\partner_api\api\m_api" /> 231 + </key>
  232 + <key name="MoveFile.RECENT_KEYS">
  233 + <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
239 <recent name="E:\mmm_auto\partner_api\api\m_api\partners" /> 234 <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
240 </key> 235 </key>
241 </component> 236 </component>
@@ -251,7 +246,7 @@ @@ -251,7 +246,7 @@
251 </list> 246 </list>
252 </option> 247 </option>
253 </component> 248 </component>
254 - <component name="RunManager" selected="Python.pg_db_func"> 249 + <component name="RunManager" selected="Python.pg_app_db_func">
255 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 250 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
256 <module name="partner_api" /> 251 <module name="partner_api" />
257 <option name="INTERPRETER_OPTIONS" value="" /> 252 <option name="INTERPRETER_OPTIONS" value="" />
@@ -296,6 +291,28 @@ @@ -296,6 +291,28 @@
296 <option name="INPUT_FILE" value="" /> 291 <option name="INPUT_FILE" value="" />
297 <method v="2" /> 292 <method v="2" />
298 </configuration> 293 </configuration>
  294 + <configuration name="pg_app_db_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
  295 + <module name="partner_api" />
  296 + <option name="INTERPRETER_OPTIONS" value="" />
  297 + <option name="PARENT_ENVS" value="true" />
  298 + <envs>
  299 + <env name="PYTHONUNBUFFERED" value="1" />
  300 + </envs>
  301 + <option name="SDK_HOME" value="" />
  302 + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/helpfunc" />
  303 + <option name="IS_MODULE_SDK" value="true" />
  304 + <option name="ADD_CONTENT_ROOTS" value="true" />
  305 + <option name="ADD_SOURCE_ROOTS" value="true" />
  306 + <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
  307 + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" />
  308 + <option name="PARAMETERS" value="" />
  309 + <option name="SHOW_COMMAND_LINE" value="false" />
  310 + <option name="EMULATE_TERMINAL" value="false" />
  311 + <option name="MODULE_MODE" value="false" />
  312 + <option name="REDIRECT_INPUT" value="false" />
  313 + <option name="INPUT_FILE" value="" />
  314 + <method v="2" />
  315 + </configuration>
299 <configuration name="pg_db_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 316 <configuration name="pg_db_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
300 <module name="partner_api" /> 317 <module name="partner_api" />
301 <option name="INTERPRETER_OPTIONS" value="" /> 318 <option name="INTERPRETER_OPTIONS" value="" />
@@ -320,6 +337,7 @@ @@ -320,6 +337,7 @@
320 </configuration> 337 </configuration>
321 <recent_temporary> 338 <recent_temporary>
322 <list> 339 <list>
  340 + <item itemvalue="Python.pg_app_db_func" />
323 <item itemvalue="Python.pg_db_func" /> 341 <item itemvalue="Python.pg_db_func" />
324 <item itemvalue="Python.db_pg_func" /> 342 <item itemvalue="Python.db_pg_func" />
325 <item itemvalue="Python.debugtalk" /> 343 <item itemvalue="Python.debugtalk" />
@@ -345,21 +363,23 @@ @@ -345,21 +363,23 @@
345 <workItem from="1594540531041" duration="1200000" /> 363 <workItem from="1594540531041" duration="1200000" />
346 <workItem from="1594542274462" duration="237000" /> 364 <workItem from="1594542274462" duration="237000" />
347 <workItem from="1594565757545" duration="5110000" /> 365 <workItem from="1594565757545" duration="5110000" />
348 - <workItem from="1594608711608" duration="14164000" /> 366 + <workItem from="1594608711608" duration="14402000" />
  367 + <workItem from="1594710916949" duration="12278000" />
349 </task> 368 </task>
350 <servers /> 369 <servers />
351 </component> 370 </component>
352 <component name="TimeTrackingManager"> 371 <component name="TimeTrackingManager">
353 - <option name="totallyTimeSpent" value="62690000" /> 372 + <option name="totallyTimeSpent" value="75206000" />
354 </component> 373 </component>
355 <component name="ToolWindowManager"> 374 <component name="ToolWindowManager">
356 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 375 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
  376 + <editor active="true" />
357 <layout> 377 <layout>
358 <window_info id="Favorites" order="0" side_tool="true" /> 378 <window_info id="Favorites" order="0" side_tool="true" />
359 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2934947" /> 379 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2980333" />
360 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 380 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
361 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 381 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
362 - <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" /> 382 + <window_info anchor="bottom" id="Terminal" order="1" weight="0.42078364" />
363 <window_info anchor="bottom" id="Message" order="2" /> 383 <window_info anchor="bottom" id="Message" order="2" />
364 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> 384 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
365 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" /> 385 <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
@@ -382,63 +402,6 @@ @@ -382,63 +402,6 @@
382 <option name="version" value="1" /> 402 <option name="version" value="1" />
383 </component> 403 </component>
384 <component name="editorHistoryManager"> 404 <component name="editorHistoryManager">
385 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_api.yml" />  
386 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />  
387 - <entry file="file://$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml">  
388 - <provider selected="true" editor-type-id="text-editor">  
389 - <state relative-caret-position="176">  
390 - <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />  
391 - </state>  
392 - </provider>  
393 - </entry>  
394 - <entry file="file://$PROJECT_DIR$/api/m_api/m_order_actual_api.yml">  
395 - <provider selected="true" editor-type-id="text-editor" />  
396 - </entry>  
397 - <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py" />  
398 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">  
399 - <provider selected="true" editor-type-id="text-editor">  
400 - <state relative-caret-position="246">  
401 - <caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />  
402 - </state>  
403 - </provider>  
404 - </entry>  
405 - <entry file="file://$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml" />  
406 - <entry file="file://$PROJECT_DIR$/api/demo_api.yml" />  
407 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">  
408 - <provider selected="true" editor-type-id="text-editor">  
409 - <state relative-caret-position="66">  
410 - <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />  
411 - </state>  
412 - </provider>  
413 - </entry>  
414 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">  
415 - <provider selected="true" editor-type-id="text-editor">  
416 - <state relative-caret-position="66">  
417 - <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />  
418 - </state>  
419 - </provider>  
420 - </entry>  
421 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">  
422 - <provider selected="true" editor-type-id="text-editor">  
423 - <state relative-caret-position="88">  
424 - <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />  
425 - </state>  
426 - </provider>  
427 - </entry>  
428 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">  
429 - <provider selected="true" editor-type-id="text-editor">  
430 - <state relative-caret-position="154">  
431 - <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />  
432 - </state>  
433 - </provider>  
434 - </entry>  
435 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">  
436 - <provider selected="true" editor-type-id="text-editor">  
437 - <state relative-caret-position="198">  
438 - <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="52" />  
439 - </state>  
440 - </provider>  
441 - </entry>  
442 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml"> 405 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
443 <provider selected="true" editor-type-id="text-editor"> 406 <provider selected="true" editor-type-id="text-editor">
444 <state relative-caret-position="220"> 407 <state relative-caret-position="220">
@@ -481,16 +444,6 @@ @@ -481,16 +444,6 @@
481 </state> 444 </state>
482 </provider> 445 </provider>
483 </entry> 446 </entry>
484 - <entry file="file://$PROJECT_DIR$/debugtalk.py">  
485 - <provider selected="true" editor-type-id="text-editor">  
486 - <state relative-caret-position="198">  
487 - <caret line="38" selection-start-line="38" selection-end-line="38" />  
488 - <folding>  
489 - <element signature="e#0#13#0" expanded="true" />  
490 - </folding>  
491 - </state>  
492 - </provider>  
493 - </entry>  
494 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml"> 447 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
495 <provider selected="true" editor-type-id="text-editor"> 448 <provider selected="true" editor-type-id="text-editor">
496 <state relative-caret-position="44"> 449 <state relative-caret-position="44">
@@ -505,34 +458,6 @@ @@ -505,34 +458,6 @@
505 </state> 458 </state>
506 </provider> 459 </provider>
507 </entry> 460 </entry>
508 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">  
509 - <provider selected="true" editor-type-id="text-editor">  
510 - <state relative-caret-position="182">  
511 - <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="35" />  
512 - </state>  
513 - </provider>  
514 - </entry>  
515 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">  
516 - <provider selected="true" editor-type-id="text-editor">  
517 - <state>  
518 - <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="19" />  
519 - </state>  
520 - </provider>  
521 - </entry>  
522 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml">  
523 - <provider selected="true" editor-type-id="text-editor">  
524 - <state relative-caret-position="88">  
525 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
526 - </state>  
527 - </provider>  
528 - </entry>  
529 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">  
530 - <provider selected="true" editor-type-id="text-editor">  
531 - <state relative-caret-position="9">  
532 - <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />  
533 - </state>  
534 - </provider>  
535 - </entry>  
536 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml"> 461 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
537 <provider selected="true" editor-type-id="text-editor"> 462 <provider selected="true" editor-type-id="text-editor">
538 <state relative-caret-position="50"> 463 <state relative-caret-position="50">
@@ -629,45 +554,66 @@ @@ -629,45 +554,66 @@
629 <state relative-caret-position="-198" /> 554 <state relative-caret-position="-198" />
630 </provider> 555 </provider>
631 </entry> 556 </entry>
632 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 557 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
633 <provider selected="true" editor-type-id="text-editor"> 558 <provider selected="true" editor-type-id="text-editor">
634 - <state relative-caret-position="176">  
635 - <caret line="8" column="10" lean-forward="true" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" /> 559 + <state relative-caret-position="66">
  560 + <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
636 </state> 561 </state>
637 </provider> 562 </provider>
638 </entry> 563 </entry>
639 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml"> 564 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
640 <provider selected="true" editor-type-id="text-editor"> 565 <provider selected="true" editor-type-id="text-editor">
641 <state relative-caret-position="66"> 566 <state relative-caret-position="66">
642 <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" /> 567 <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
643 </state> 568 </state>
644 </provider> 569 </provider>
645 </entry> 570 </entry>
646 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml"> 571 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
647 <provider selected="true" editor-type-id="text-editor"> 572 <provider selected="true" editor-type-id="text-editor">
648 <state relative-caret-position="66"> 573 <state relative-caret-position="66">
649 - <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" /> 574 + <caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />
650 </state> 575 </state>
651 </provider> 576 </provider>
652 </entry> 577 </entry>
653 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml"> 578 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
654 <provider selected="true" editor-type-id="text-editor"> 579 <provider selected="true" editor-type-id="text-editor">
655 - <state relative-caret-position="176">  
656 - <caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="48" /> 580 + <state relative-caret-position="484">
  581 + <caret line="22" selection-start-line="22" selection-end-line="26" />
657 </state> 582 </state>
658 </provider> 583 </provider>
659 </entry> 584 </entry>
660 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 585 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
661 <provider selected="true" editor-type-id="text-editor"> 586 <provider selected="true" editor-type-id="text-editor">
662 - <state relative-caret-position="213">  
663 - <caret line="254" column="41" lean-forward="true" selection-start-line="254" selection-start-column="41" selection-end-line="254" selection-end-column="41" /> 587 + <state>
  588 + <caret column="6" selection-start-column="6" selection-end-column="19" />
664 </state> 589 </state>
665 </provider> 590 </provider>
666 </entry> 591 </entry>
667 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml"> 592 <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">
668 <provider selected="true" editor-type-id="text-editor"> 593 <provider selected="true" editor-type-id="text-editor">
669 - <state relative-caret-position="44">  
670 - <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" /> 594 + <state relative-caret-position="88">
  595 + <caret line="4" column="50" selection-start-line="4" selection-start-column="50" selection-end-line="4" selection-end-column="50" />
  596 + </state>
  597 + </provider>
  598 + </entry>
  599 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
  600 + <provider selected="true" editor-type-id="text-editor">
  601 + <state relative-caret-position="176">
  602 + <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
  603 + </state>
  604 + </provider>
  605 + </entry>
  606 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml">
  607 + <provider selected="true" editor-type-id="text-editor">
  608 + <state relative-caret-position="88">
  609 + <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
  610 + </state>
  611 + </provider>
  612 + </entry>
  613 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
  614 + <provider selected="true" editor-type-id="text-editor">
  615 + <state relative-caret-position="88">
  616 + <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
671 </state> 617 </state>
672 </provider> 618 </provider>
673 </entry> 619 </entry>
@@ -678,31 +624,142 @@ @@ -678,31 +624,142 @@
678 </state> 624 </state>
679 </provider> 625 </provider>
680 </entry> 626 </entry>
681 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 627 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
682 <provider selected="true" editor-type-id="text-editor"> 628 <provider selected="true" editor-type-id="text-editor">
683 - <state relative-caret-position="246">  
684 - <caret line="64" column="68" selection-start-line="64" selection-start-column="68" selection-end-line="64" selection-end-column="68" /> 629 + <state relative-caret-position="374">
  630 + <caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
685 </state> 631 </state>
686 </provider> 632 </provider>
687 </entry> 633 </entry>
688 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml"> 634 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
  635 + <provider selected="true" editor-type-id="text-editor">
  636 + <state relative-caret-position="88">
  637 + <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
  638 + </state>
  639 + </provider>
  640 + </entry>
  641 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
  642 + <provider selected="true" editor-type-id="text-editor">
  643 + <state relative-caret-position="550">
  644 + <caret line="25" selection-start-line="25" selection-end-line="25" />
  645 + </state>
  646 + </provider>
  647 + </entry>
  648 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">
  649 + <provider selected="true" editor-type-id="text-editor">
  650 + <state relative-caret-position="286">
  651 + <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
  652 + </state>
  653 + </provider>
  654 + </entry>
  655 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">
  656 + <provider selected="true" editor-type-id="text-editor">
  657 + <state relative-caret-position="154">
  658 + <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
  659 + </state>
  660 + </provider>
  661 + </entry>
  662 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml">
  663 + <provider selected="true" editor-type-id="text-editor">
  664 + <state relative-caret-position="-110">
  665 + <caret line="2" selection-start-line="2" selection-end-line="9" selection-end-column="59" />
  666 + </state>
  667 + </provider>
  668 + </entry>
  669 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_partner_list_api.yml">
  670 + <provider selected="true" editor-type-id="text-editor">
  671 + <state>
  672 + <caret line="3" column="57" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="57" />
  673 + </state>
  674 + </provider>
  675 + </entry>
  676 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE003_purpose_list_testcases.yml">
  677 + <provider selected="true" editor-type-id="text-editor">
  678 + <state relative-caret-position="110">
  679 + <caret line="5" column="61" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="61" />
  680 + </state>
  681 + </provider>
  682 + </entry>
  683 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE004_purpose_list_testcases.yml">
  684 + <provider selected="true" editor-type-id="text-editor">
  685 + <state relative-caret-position="110">
  686 + <caret line="14" column="67" selection-start-line="14" selection-start-column="67" selection-end-line="14" selection-end-column="67" />
  687 + </state>
  688 + </provider>
  689 + </entry>
  690 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_searchText_list_api.yml">
  691 + <provider selected="true" editor-type-id="text-editor">
  692 + <state>
  693 + <caret column="6" selection-start-column="6" selection-end-column="19" />
  694 + </state>
  695 + </provider>
  696 + </entry>
  697 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_edit_api.yml">
689 <provider selected="true" editor-type-id="text-editor"> 698 <provider selected="true" editor-type-id="text-editor">
690 <state relative-caret-position="246"> 699 <state relative-caret-position="246">
691 - <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" /> 700 + <caret line="34" lean-forward="true" selection-start-line="2" selection-end-line="34" />
692 </state> 701 </state>
693 </provider> 702 </provider>
694 </entry> 703 </entry>
695 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml"> 704 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_convert_api.yml">
  705 + <provider selected="true" editor-type-id="text-editor">
  706 + <state>
  707 + <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="16" />
  708 + </state>
  709 + </provider>
  710 + </entry>
  711 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_convert_testcases.yml">
696 <provider selected="true" editor-type-id="text-editor"> 712 <provider selected="true" editor-type-id="text-editor">
697 <state relative-caret-position="66"> 713 <state relative-caret-position="66">
698 - <caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" /> 714 + <caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="27" />
699 </state> 715 </state>
700 </provider> 716 </provider>
701 </entry> 717 </entry>
702 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml"> 718 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
703 <provider selected="true" editor-type-id="text-editor"> 719 <provider selected="true" editor-type-id="text-editor">
704 - <state relative-caret-position="22">  
705 - <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" /> 720 + <state relative-caret-position="3998">
  721 + <caret line="197" column="42" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="42" />
  722 + </state>
  723 + </provider>
  724 + </entry>
  725 + <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_detail_api.yml">
  726 + <provider selected="true" editor-type-id="text-editor">
  727 + <state>
  728 + <caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="14" />
  729 + </state>
  730 + </provider>
  731 + </entry>
  732 + <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE006_purpose_detail_testcases.yml">
  733 + <provider selected="true" editor-type-id="text-editor">
  734 + <state relative-caret-position="176">
  735 + <caret line="14" column="58" selection-start-line="14" selection-start-column="58" selection-end-line="14" selection-end-column="58" />
  736 + </state>
  737 + </provider>
  738 + </entry>
  739 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
  740 + <provider selected="true" editor-type-id="text-editor">
  741 + <state relative-caret-position="158">
  742 + <caret line="84" column="71" selection-start-line="84" selection-start-column="71" selection-end-line="84" selection-end-column="71" />
  743 + </state>
  744 + </provider>
  745 + </entry>
  746 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
  747 + <provider selected="true" editor-type-id="text-editor">
  748 + <state relative-caret-position="176">
  749 + <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
  750 + <folding>
  751 + <element signature="e#0#13#0" expanded="true" />
  752 + </folding>
  753 + </state>
  754 + </provider>
  755 + </entry>
  756 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_app_db_func.py">
  757 + <provider selected="true" editor-type-id="text-editor">
  758 + <state relative-caret-position="369">
  759 + <caret line="70" selection-start-line="70" selection-end-line="70" />
  760 + <folding>
  761 + <element signature="e#108#123#0" expanded="true" />
  762 + </folding>
706 </state> 763 </state>
707 </provider> 764 </provider>
708 </entry> 765 </entry>
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_address_from_database(order)}  
5 - id: ${get_id_from_database(order)}  
6 - buyer: ${get_buyer_from_database(order)}  
7 - buyerPhone: ${get_buyerPhone_from_database(order)}  
8 - orderDist: ${get_orderDist_from_database(order)}  
9 - orderId: ${get_orderId_from_database(order)}  
10 - orderName: ${get_orderName_from_database(order)} 4 + address: ${get_actual_address_from_database(order)}
  5 + id: ${get_actual_id_from_database(order)}
  6 + buyer: ${get_actual_buyer_from_database(order)}
  7 + buyerPhone: ${get_actual_buyerPhone_from_database(order)}
  8 + orderDist: ${get_actual_orderDist_from_database(order)}
  9 + orderId: ${get_actual_orderId_from_database(order)}
  10 + orderName: ${get_actual_orderName_from_database(order)}
11 request: 11 request:
12 headers: 12 headers:
13 Content-Type: application/json;charset=utf-8 13 Content-Type: application/json;charset=utf-8
@@ -2,7 +2,7 @@ name: 查看实际订单详情 @@ -2,7 +2,7 @@ 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)} 4 orderStatue: ${get_order_status_from_database(order)}
5 - id: ${get_id_from_database(order)} 5 + id: ${get_actual_id_from_database(order)}
6 request: 6 request:
7 headers: 7 headers:
8 Content-Type: application/json;charset=utf-8 8 Content-Type: application/json;charset=utf-8
@@ -2,7 +2,7 @@ name: 搜索订单号——实际订单列表 @@ -2,7 +2,7 @@ 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)} 4 orderStatue: ${get_order_status_from_database(order)}
5 - searchText: ${get_orderId_from_database(order)} 5 + searchText: ${get_actual_orderId_from_database(order)}
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/auth/profile  
2 -base_url: ${ENV(base_manager_url)}  
3 -variables:  
4 - phone: 15005046165  
5 - password: d033e22ae348aeb5660fc2140aec35850c4da997  
6 -request:  
7 - headers:  
8 - Content-Type: application/json;charset=utf-8  
9 - User-Agent: okhttp/3.12.3  
10 - Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTMzNTY2NjEsImlhdCI6MTU5MzMxMzQ2MSwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5MzMxMzQ2MSwidWlkIjo2fQ.UOh6EUisrD6gH2m3JrXwfLmRj3OpyaVK0SNwTETDwWk  
11 - json:  
12 - password: $password  
13 - username: ${convert_to_string(13559112969)}  
14 - method: POST  
15 - url: /v1/auth/profile  
@@ -7,15 +7,19 @@ request: @@ -7,15 +7,19 @@ request:
7 Authorization: Bearer ${get_m_accesstoken()} 7 Authorization: Bearer ${get_m_accesstoken()}
8 json: 8 json:
9 buyer: 我是买家${get_second()} 9 buyer: 我是买家${get_second()}
10 - buyerPhone: ${convert_to_string(13459147023)}  
11 - address: '福建省福州市收获地址1'  
12 - partner: 2  
13 - partnerRatio: 99.19 10 + buyerPhone: ${convert_to_string($account)}
  11 + address: '福建省福州市收获地址2'
  12 + partner: 29
  13 + partnerRatio: 10.2
14 salesmanRatio: 0.99 14 salesmanRatio: 0.99
15 orderId: ${get_nowtime()} 15 orderId: ${get_nowtime()}
16 orderName: ${get_nowtime()} 16 orderName: ${get_nowtime()}
17 - orderNum: 50000000000  
18 - orderPrice: 1000000000  
19 - orderDist: '福建一区' 17 + orderNum: 500
  18 + orderPrice: 1000
  19 + orderDist: '福建二区'
20 method: POST 20 method: POST
21 url: v1/order/purpose/update 21 url: v1/order/purpose/update
  22 +validate:
  23 + - eq:
  24 + - content.msg
  25 + - ok
  1 +name: 意向订单转发实发订单
  2 +base_url: ${ENV(base_manager_url)}
  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)}
  11 +request:
  12 + headers:
  13 + Content-Type: application/json;charset=utf-8
  14 + User-Agent: okhttp/3.12.3
  15 + Authorization: Bearer ${get_m_accesstoken()}
  16 + json:
  17 + buyer: $buyer
  18 + buyerPhone: $buyerPhone
  19 + address: $address
  20 + partner: 29
  21 + partnerRatio: 10.2
  22 + salesmanRatio: 0.99
  23 + orderId: $orderId
  24 + orderName: $orderName
  25 + orderNum: 500
  26 + orderPrice: 1000
  27 + orderDist: $orderDist
  28 + id: $id
  29 + orderStatue: 2
  30 + method: POST
  31 + url: v1/order/purpose/update
  32 +validate:
  33 + - eq:
  34 + - content.msg
  35 + - ok
  1 +name: 查看意向订单详情
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + orderStatue: ${get_purpose_order_status_from_database(order)}
  5 + id: ${get_purpose_id_from_database(order)}
  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: ${convert_to_string($id)}
  13 + method: POST
  14 + url: v1/order/purpose/detail
  15 +validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
  19 + - eq:
  20 + - content.data.orderStatue
  21 + - $orderStatue
  1 +name: 意向订单编辑
  2 +base_url: ${ENV(base_manager_url)}
  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)}
  11 +request:
  12 + headers:
  13 + Content-Type: application/json;charset=utf-8
  14 + User-Agent: okhttp/3.12.3
  15 + Authorization: Bearer ${get_m_accesstoken()}
  16 + json:
  17 + buyer: $buyer
  18 + buyerPhone: $buyerPhone
  19 + address: $address
  20 + partner: 29
  21 + partnerRatio: 10.2
  22 + salesmanRatio: 0.99
  23 + orderId: $orderId
  24 + orderName: $orderName
  25 + orderNum: 500
  26 + orderPrice: 1000
  27 + orderDist: $orderDist
  28 + id: $id
  29 + method: POST
  30 + url: v1/order/purpose/update
  31 +validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  1 +name: 合伙人搜索——意向订单列表
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + orderStatue: ${get_purpose_order_status_from_database(order)}
  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 + pageNumber: 1
  12 + pageSize: 10
  13 + partner: 29
  14 + searchText: ''
  15 + method: POST
  16 + url: v1/order/purpose/list
  17 +validate:
  18 + - eq:
  19 + - content.msg
  20 + - ok
  21 + - eq:
  22 + - content.data.gridResult.lists.0.orderStatue
  23 + - $orderStatue
  1 +name: 搜索订单号——意向订单列表
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + orderStatue: ${get_purpose_order_status_from_database(order)}
  5 + searchText: ${get_purpose_orderId_from_database(order)}
  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 + pageNumber: 1
  13 + pageSize: 10
  14 + partner: 29
  15 + searchText: $searchText
  16 + method: POST
  17 + url: v1/order/purpose/list
  18 +validate:
  19 + - eq:
  20 + - content.msg
  21 + - ok
  22 + - eq:
  23 + - content.data.gridResult.lists.0.orderStatue
  24 + - $orderStatue
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ3MDAxOTIsImlhdCI6MTU5NDY1Njk5MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDY1Njk5MiwidWlkIjoxOH0.8G6kqdQYKgJPmLPGTgwLwXbjKWG5jqlEx5zG6vh1RlQ  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ3ODMxNTIsImlhdCI6MTU5NDczOTk1MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDczOTk1MiwidWlkIjoxOH0.DI-32mxFfLg3r-8jdi-4DS7a_crDZS949MlnY5UU-us
@@ -6,6 +6,7 @@ from helpfunc.pg_db_func import * @@ -6,6 +6,7 @@ from helpfunc.pg_db_func import *
6 from helpfunc.db_func import * 6 from helpfunc.db_func import *
7 from helpfunc.header_func import * 7 from helpfunc.header_func import *
8 from random import randint 8 from random import randint
  9 +from helpfunc.pg_app_db_func import *
9 10
10 def sleep(n_secs): 11 def sleep(n_secs):
11 time.sleep(n_secs) 12 time.sleep(n_secs)
  1 +#! /usr/bin/env python
  2 +# -*- coding: utf-8 -*-
  3 +# Date: 2020/7/12 16:27
  4 +# @Author:bxh
  5 +# @file: pg_db_func.py
  6 +import psycopg2
  7 +import datetime
  8 +
  9 +# 获得连接
  10 +def GetConnect():
  11 + conn = False
  12 + try:
  13 + conn = psycopg2.connect(database="partner_test",
  14 + user="bianxinhua_user",
  15 + password="Bianxinhua_user#123",
  16 + host="101.37.68.23",
  17 + port="15432")
  18 + except Exception as err:
  19 + print("连接数据库失败，%s" % err)
  20 + return conn
  21 +#获取超级管理员账号
  22 +def get_partner_id_from_database(tbl):
  23 + db = GetConnect()
  24 + cursor = db.cursor()
  25 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  26 + sql = '''select id from \"{}\" where account = '13459147023' '''.format(tbl)
  27 + # print(sql)
  28 + try:
  29 + cursor.execute(sql)
  30 + result = cursor.fetchone()
  31 + return result[0]
  32 + except Exception as err:
  33 + # 发生错误时回滚
  34 + print(err)
  35 + db.rollback()
  36 + db.close()
  37 +#累计实发订单
  38 +def get_cumulativeQuantity_from_database(tbl):
  39 + db = GetConnect()
  40 + cursor = db.cursor()
  41 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  42 + sql = '''select COUNT(id) from \"{}\" where partner_id = {} and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'))
  43 + # print(sql)
  44 + try:
  45 + cursor.execute(sql)
  46 + result = cursor.fetchone()
  47 + return result[0]
  48 + except Exception as err:
  49 + # 发生错误时回滚
  50 + print(err)
  51 + db.rollback()
  52 + db.close()
  53 +
  54 +#累计实发订单金额
  55 +def get_cumulativeMoney_from_database(tbl):
  56 + db = GetConnect()
  57 + cursor = db.cursor()
  58 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  59 + sql = '''select sum(order_actual_amount) from \"{}\" where partner_id = {} and order_status in (2,3) '''.format(tbl,get_partner_id_from_database('partner_info'))
  60 + # print(sql)
  61 + try:
  62 + cursor.execute(sql)
  63 + result = cursor.fetchone()
  64 + return int(result[0])
  65 + except Exception as err:
  66 + # 发生错误时回滚
  67 + print(err)
  68 + db.rollback()
  69 + db.close()
  70 +# print(get_cumulativeMoney_from_database('order'))
  71 +
@@ -50,6 +50,38 @@ def get_id_from_database(tbl): @@ -50,6 +50,38 @@ 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):
  54 + db = GetConnect()
  55 + 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)
  59 + try:
  60 + cursor.execute(sql)
  61 + result = cursor.fetchone()
  62 + return result[0]
  63 + except Exception as err:
  64 + # 发生错误时回滚
  65 + print(err)
  66 + db.rollback()
  67 + db.close()
  68 +
  69 +def get_purpose_id_from_database(tbl):
  70 + db = GetConnect()
  71 + cursor = db.cursor()
  72 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  73 + sql = 'select id from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
  74 + # print(sql)
  75 + try:
  76 + cursor.execute(sql)
  77 + result = cursor.fetchone()
  78 + return result[0]
  79 + except Exception as err:
  80 + # 发生错误时回滚
  81 + print(err)
  82 + db.rollback()
  83 + db.close()
  84 +
53 def get_account_from_database(tbl): 85 def get_account_from_database(tbl):
54 db = GetConnect() 86 db = GetConnect()
55 cursor = db.cursor() 87 cursor = db.cursor()
@@ -151,7 +183,7 @@ def get_partnername_from_database(tbl): @@ -151,7 +183,7 @@ def get_partnername_from_database(tbl):
151 def get_order_status_from_database(tbl): 183 def get_order_status_from_database(tbl):
152 db = GetConnect() 184 db = GetConnect()
153 cursor = db.cursor() 185 cursor = db.cursor()
154 - sql = 'select order_status from \"{}\" order by id DESC'.format(tbl) 186 + sql = 'select order_status from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
155 # print(sql) 187 # print(sql)
156 try: 188 try:
157 cursor.execute(sql) 189 cursor.execute(sql)
@@ -163,14 +195,28 @@ def get_order_status_from_database(tbl): @@ -163,14 +195,28 @@ def get_order_status_from_database(tbl):
163 db.rollback() 195 db.rollback()
164 db.close() 196 db.close()
165 197
166 -def get_address_from_database(tbl): 198 +def get_purpose_order_status_from_database(tbl):
167 db = GetConnect() 199 db = GetConnect()
168 cursor = db.cursor() 200 cursor = db.cursor()
169 - sql = 'select buyer from \"{}\" order by id DESC'.format(tbl) 201 + sql = 'select order_status from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
170 # print(sql) 202 # print(sql)
171 try: 203 try:
172 cursor.execute(sql) 204 cursor.execute(sql)
173 result = cursor.fetchone() 205 result = cursor.fetchone()
  206 + return result[0]
  207 + except Exception as err:
  208 + # 发生错误时回滚
  209 + print(err)
  210 + db.rollback()
  211 + db.close()
  212 +
  213 +def get_actual_address_from_database(tbl):
  214 + db = GetConnect()
  215 + cursor = db.cursor()
  216 + sql = 'select buyer from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
  217 + try:
  218 + cursor.execute(sql)
  219 + result = cursor.fetchone()
174 return result[0]['shippingAddress'] 220 return result[0]['shippingAddress']
175 except Exception as err: 221 except Exception as err:
176 # 发生错误时回滚 222 # 发生错误时回滚
@@ -178,10 +224,39 @@ def get_address_from_database(tbl): @@ -178,10 +224,39 @@ def get_address_from_database(tbl):
178 db.rollback() 224 db.rollback()
179 db.close() 225 db.close()
180 226
181 -def get_buyer_from_database(tbl): 227 +def get_purpose_address_from_database(tbl):
  228 + db = GetConnect()
  229 + cursor = db.cursor()
  230 + sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
  231 + try:
  232 + cursor.execute(sql)
  233 + result = cursor.fetchone()
  234 + return result[0]['shippingAddress']
  235 + except Exception as err:
  236 + # 发生错误时回滚
  237 + print(err)
  238 + db.rollback()
  239 + db.close()
  240 +
  241 +def get_actual_buyer_from_database(tbl):
  242 + db = GetConnect()
  243 + cursor = db.cursor()
  244 + sql = 'select buyer from \"{}\" where order_type = 1 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 +
  256 +def get_purpose_buyer_from_database(tbl):
182 db = GetConnect() 257 db = GetConnect()
183 cursor = db.cursor() 258 cursor = db.cursor()
184 - sql = 'select buyer from \"{}\" order by id DESC'.format(tbl) 259 + sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
185 # print(sql) 260 # print(sql)
186 try: 261 try:
187 cursor.execute(sql) 262 cursor.execute(sql)
@@ -193,10 +268,25 @@ def get_buyer_from_database(tbl): @@ -193,10 +268,25 @@ def get_buyer_from_database(tbl):
193 db.rollback() 268 db.rollback()
194 db.close() 269 db.close()
195 270
196 -def get_buyerPhone_from_database(tbl): 271 +def get_actual_buyerPhone_from_database(tbl):
  272 + db = GetConnect()
  273 + cursor = db.cursor()
  274 + sql = 'select buyer from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
  275 + # print(sql)
  276 + try:
  277 + cursor.execute(sql)
  278 + result = cursor.fetchone()
  279 + return result[0]['contactInfo']
  280 + except Exception as err:
  281 + # 发生错误时回滚
  282 + print(err)
  283 + db.rollback()
  284 + db.close()
  285 +
  286 +def get_purpose_buyerPhone_from_database(tbl):
197 db = GetConnect() 287 db = GetConnect()
198 cursor = db.cursor() 288 cursor = db.cursor()
199 - sql = 'select buyer from \"{}\" order by id DESC'.format(tbl) 289 + sql = 'select buyer from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
200 # print(sql) 290 # print(sql)
201 try: 291 try:
202 cursor.execute(sql) 292 cursor.execute(sql)
@@ -208,10 +298,10 @@ def get_buyerPhone_from_database(tbl): @@ -208,10 +298,10 @@ def get_buyerPhone_from_database(tbl):
208 db.rollback() 298 db.rollback()
209 db.close() 299 db.close()
210 300
211 -def get_orderDist_from_database(tbl): 301 +def get_actual_orderDist_from_database(tbl):
212 db = GetConnect() 302 db = GetConnect()
213 cursor = db.cursor() 303 cursor = db.cursor()
214 - sql = 'select order_region_info from \"{}\" order by id DESC'.format(tbl) 304 + sql = 'select order_region_info from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
215 # print(sql) 305 # print(sql)
216 try: 306 try:
217 cursor.execute(sql) 307 cursor.execute(sql)
@@ -223,10 +313,40 @@ def get_orderDist_from_database(tbl): @@ -223,10 +313,40 @@ def get_orderDist_from_database(tbl):
223 db.rollback() 313 db.rollback()
224 db.close() 314 db.close()
225 315
226 -def get_orderId_from_database(tbl): 316 +def get_purpose_orderDist_from_database(tbl):
227 db = GetConnect() 317 db = GetConnect()
228 cursor = db.cursor() 318 cursor = db.cursor()
229 - sql = 'select order_code from \"{}\" order by id DESC'.format(tbl) 319 + sql = 'select order_region_info from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
  320 + # print(sql)
  321 + try:
  322 + cursor.execute(sql)
  323 + result = cursor.fetchone()
  324 + return result[0]['regionName']
  325 + except Exception as err:
  326 + # 发生错误时回滚
  327 + print(err)
  328 + db.rollback()
  329 + db.close()
  330 +
  331 +def get_actual_orderId_from_database(tbl):
  332 + db = GetConnect()
  333 + cursor = db.cursor()
  334 + sql = 'select order_code from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
  335 + # print(sql)
  336 + try:
  337 + cursor.execute(sql)
  338 + result = cursor.fetchone()
  339 + return result[0]
  340 + except Exception as err:
  341 + # 发生错误时回滚
  342 + print(err)
  343 + db.rollback()
  344 + db.close()
  345 +
  346 +def get_purpose_orderId_from_database(tbl):
  347 + db = GetConnect()
  348 + cursor = db.cursor()
  349 + sql = 'select order_code from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
230 # print(sql) 350 # print(sql)
231 try: 351 try:
232 cursor.execute(sql) 352 cursor.execute(sql)
@@ -238,10 +358,10 @@ def get_orderId_from_database(tbl): @@ -238,10 +358,10 @@ def get_orderId_from_database(tbl):
238 db.rollback() 358 db.rollback()
239 db.close() 359 db.close()
240 360
241 -def get_orderName_from_database(tbl): 361 +def get_actual_orderName_from_database(tbl):
242 db = GetConnect() 362 db = GetConnect()
243 cursor = db.cursor() 363 cursor = db.cursor()
244 - sql = 'select order_name from \"{}\" order by id DESC'.format(tbl) 364 + sql = 'select order_name from \"{}\" where order_type = 1 order by id DESC'.format(tbl)
245 # print(sql) 365 # print(sql)
246 try: 366 try:
247 cursor.execute(sql) 367 cursor.execute(sql)
@@ -252,4 +372,20 @@ def get_orderName_from_database(tbl): @@ -252,4 +372,20 @@ def get_orderName_from_database(tbl):
252 print(err) 372 print(err)
253 db.rollback() 373 db.rollback()
254 db.close() 374 db.close()
255 -print(get_orderId_from_database('order'))  
  375 +
  376 +def get_purpose_orderName_from_database(tbl):
  377 + db = GetConnect()
  378 + cursor = db.cursor()
  379 + sql = 'select order_name from \"{}\" where order_type = 2 order by id DESC'.format(tbl)
  380 + # print(sql)
  381 + try:
  382 + cursor.execute(sql)
  383 + result = cursor.fetchone()
  384 + return result[0]
  385 + except Exception as err:
  386 + # 发生错误时回滚
  387 + print(err)
  388 + db.rollback()
  389 + db.close()
  390 +
  391 +# print(get_purpose_order_status_from_database('order'))
  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_add_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_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_edit_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_admin_account_from_database(admin_user)}
  6 + orderStatue: ${get_purpose_order_status_from_database(order)}
  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/purpose/m_order_purpose_partner_list_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.gridResult.lists.0.orderStatue
  22 + - $orderStatue
  1 +config:
  2 + name: 搜索订单号——意向订单列表
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_admin_account_from_database(admin_user)}
  6 + orderStatue: ${get_purpose_order_status_from_database(order)}
  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/purpose/m_order_purpose_searchText_list_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.gridResult.lists.0.orderStatue
  22 + - $orderStatue
  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_convert_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_admin_account_from_database(admin_user)}
  6 + orderStatue: ${get_purpose_order_status_from_database(order)}
  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/purpose/m_order_purpose_detail_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.orderStatue
  22 + - $orderStatue
@@ -46,20 +46,40 @@ testcases: @@ -46,20 +46,40 @@ testcases:
46 # 46 #
47 #- name: PARTNERS006：启用合伙人 47 #- name: PARTNERS006：启用合伙人
48 # testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml 48 # testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
49 - 49 +#
50 #- name: ACTUAL001：新增实际订单 50 #- name: ACTUAL001：新增实际订单
51 # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml 51 # testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
52 # parameters: 52 # parameters:
53 # account: ${create_phone_number(1)} 53 # account: ${create_phone_number(1)}
54 - 54 +#
55 #- name: ACTUAL002：编辑实际订单 55 #- name: ACTUAL002：编辑实际订单
56 # testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml 56 # testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
57 - 57 +#
58 #- name: ACTUAL003：合伙人搜索——实际订单列表 58 #- name: ACTUAL003：合伙人搜索——实际订单列表
59 # testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml 59 # testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml
60 - 60 +#
61 #- name: ACTUAL004：搜索订单号——实际订单列表 61 #- name: ACTUAL004：搜索订单号——实际订单列表
62 # testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml 62 # testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
  63 +#
  64 +#- name: ACTUAL005：查看实际订单详情
  65 +# testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
  66 +
  67 +#- name: PURPOSE001：新增意向订单
  68 +# testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml
  69 +# parameters:
  70 +# account: ${create_phone_number(1)}
  71 +
  72 +#- name: PURPOSE002：编辑意向订单
  73 +# testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml
  74 +
  75 +#- name: PURPOSE003：合伙人搜索——意向订单列表
  76 +# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
  77 +
  78 +#- name: PURPOSE004：搜索订单号——意向订单列表
  79 +# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
  80 +
  81 +#- name: PURPOSE005：意向订单转发实发订单
  82 +# testcase: testcases/purpose/PURPOSE005_purpose_convert_testcases.yml
63 83
64 -- name: ACTUAL005：查看实际订单详情  
65 - testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml  
  84 +- name: PURPOSE006：查看意向订单详情
  85 + testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml