add README

@@ -3,7 +3,7 @@ pfphone=19990000011
 pfphone1=19990000015
 ckotherdeptphone=19990000012
 pfphone2=18100000005
-appphone=19990000000
+appphone=19990000015
 password=123456
 base_url=https://ability-test.fjmaimaimai.com
 base_public_url = http://public-interface-test.fjmaimaimai.com/

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330" />
+=======
+    <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330">
+<<<<<<< HEAD
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+=======
+      <change beforePath="$PROJECT_DIR$/.idea/ability_api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ability_api.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/credentials.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/credentials.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/login_code.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/login_code.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/resource_content.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_content.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/resource_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_id.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/resource_title.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_title.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/serialNo.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/serialNo.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/task_Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_Authorization.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/helpfunc/login_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/login_func.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
+    </list>
+>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,8 +57,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
             <state relative-caret-position="462">
+=======
+<<<<<<< HEAD
+            <state relative-caret-position="780">
+              <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
+=======
+            <state relative-caret-position="66">
+>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
               <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
@@ -37,24 +75,47 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+            <state relative-caret-position="304">
+              <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
+=======
             <state relative-caret-position="154">
               <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
               <folding>
                 <element signature="e#108#137#0" expanded="true" />
               </folding>
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3016">
+              <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
+              <folding>
+                <element signature="e#108#137#0" expanded="true" />
+              </folding>
+=======
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="154">
               <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="416">
+              <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+=======
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -63,6 +124,7 @@
               <folding>
                 <element signature="e#107#119#0" expanded="true" />
               </folding>
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
@@ -88,8 +150,13 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+            <state relative-caret-position="6292">
+              <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
+=======
             <state relative-caret-position="3124">
               <caret line="143" selection-start-line="143" selection-end-line="143" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
               <folding>
                 <element signature="e#117#128#0" expanded="true" />
               </folding>
@@ -97,6 +164,18 @@
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="208">
+              <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+=======
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -193,6 +272,11 @@
         <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
         <option value="$PROJECT_DIR$/helpfunc/m_func.py" />
         <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" />
+<<<<<<< HEAD
+        <option value="$PROJECT_DIR$/debugtalk.py" />
+        <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
+=======
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
       </list>
     </option>
@@ -556,11 +640,19 @@
       <workItem from="1597801010469" duration="16146000" />
       <workItem from="1597886812090" duration="6866000" />
       <workItem from="1597906408146" duration="2887000" />
+<<<<<<< HEAD
+      <workItem from="1597973157365" duration="19140000" />
+      <workItem from="1598337033172" duration="73000" />
+=======
       <workItem from="1597973157365" duration="18949000" />
       <workItem from="1598065887022" duration="4905000" />
       <workItem from="1598108947857" duration="3526000" />
       <workItem from="1598168398954" duration="3596000" />
+<<<<<<< HEAD
       <workItem from="1599145650310" duration="64000" />
+=======
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
+>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
     </task>
     <task id="LOCAL-00001" summary="优化测试用例">
       <created>1571644787323</created>
@@ -888,7 +980,15 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< HEAD
     <option name="totallyTimeSpent" value="366015000" />
+=======
+<<<<<<< HEAD
+    <option name="totallyTimeSpent" value="354188000" />
+=======
+    <option name="totallyTimeSpent" value="365951000" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
+>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
   </component>
   <component name="TodoView" selected-index="3">
     <todo-panel id="selected-file">
@@ -899,9 +999,22 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
+<<<<<<< HEAD
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.23373677" />
+=======
+<<<<<<< HEAD
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22693133" />
+=======
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22995462" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
+>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
       <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
       <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1192,6 +1305,8 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
+<<<<<<< HEAD
+=======
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="130">
           <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" />
@@ -1199,21 +1314,46 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="660">
           <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
+    <entry file="file://$PROJECT_DIR$/debugtalk.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="18">
+          <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+=======
     <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="550">
           <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+        <state relative-caret-position="780">
+          <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3016">
+          <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
+          <folding>
+            <element signature="e#108#137#0" expanded="true" />
+          </folding>
+=======
         <state relative-caret-position="772">
           <caret line="36" selection-start-line="36" selection-end-line="36" />
         </state>
@@ -1230,11 +1370,30 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-299">
           <caret line="7" selection-start-line="7" selection-end-line="7" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/debugtalk.py">
+    <entry file="file://$PROJECT_DIR$/.env">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+        <state relative-caret-position="260">
+          <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="130">
+          <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6292">
+          <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
+=======
         <state relative-caret-position="132">
           <caret line="17" column="21" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="21" />
           <folding>
@@ -1288,16 +1447,46 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3124">
           <caret line="143" selection-start-line="143" selection-end-line="143" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
           <folding>
             <element signature="e#117#128#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+    <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
+=======
+    <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
+        </state>
+      </provider>
+    </entry>
+>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
     <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+        <state relative-caret-position="416">
+          <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+=======
         <state relative-caret-position="154">
           <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </state>
       </provider>
     </entry>

@@ -2,7 +2,7 @@ name: 发布任务
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:
-    id: ${get_task_id()}
+    id: ${get_appoint_task_id()}
     msg: ok
 request:
     headers:

+name: 保存指派任务
+base_url: ${ENV(base_worth_url)}
+verify: False
+variables:
+    name: 测试指派任务名称${get_nowtime()}
+    acceptanceCriteria: 测试指派任务的验收标准${get_nowtime()}
+    description: 测试指派任务的任务描述${get_nowtime()}
+    planTime: ${get_today()}
+    msg: ok
+teardown_hooks:
+    - ${teardown_hook_get_appoint_task_id($response)}
+request:
+    headers:
+        Content-Type: application/json; charset=UTF-8
+        Authorization: Bearer ${get_task_Authorization()}
+        Origin: https://value-test.fjmaimaimai.com
+        Referer: https://value-test.fjmaimaimai.com/
+        User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
+        X-Requested-With: XMLHttpRequest
+    json:
+        appointTo: 3245096039079680
+        planTime: $planTime
+        name: $name
+        resourceType: 1
+        resourceList:
+            - id: ${get_resource_id()}
+              title: ${get_resource_title()}
+              content: ${get_resource_content()}
+              serial: ${get_serialNo()}
+        customerValue:
+            -  31
+        taskCharacter: 12
+        reward: 2000
+        acceptanceCriteria: $acceptanceCriteria
+        description: $description
+        taskBelong: 13
+#        pictures:
+    method: POST
+    url: task/appoint/update
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - $msg
\ No newline at end of file

-name: 删除任务
+name: 发布任务
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:
+    id: ${get_bid_task_id()}
     msg: ok
 request:
     headers:
@@ -13,9 +14,8 @@ request:
         X-Requested-With: XMLHttpRequest
     json:
         id: $id
-
     method: POST
-    url: task/delete
+    url: task/open
 validate:
     -   eq:
         - content.code

+name: 保存竞标任务
+base_url: ${ENV(base_worth_url)}
+verify: False
+variables:
+    name: 测试竞标任务名称${get_nowtime()}
+    acceptanceCriteria: 测试竞标任务的验收标准${get_nowtime()}
+    description: 测试竞标任务的任务描述${get_nowtime()}
+    bidStartTime: ${get_today1()}
+    bidEndTime: ${get_tomorrow()}
+    id: ${get_resource_id()}
+    serial: ${get_serialNo()}
+    msg: ok
+teardown_hooks:
+    - ${teardown_hook_get_bid_task_id($response)}
+request:
+    headers:
+        Content-Type: application/json; charset=UTF-8
+        Authorization: Bearer ${get_task_Authorization()}
+        Origin: https://value-test.fjmaimaimai.com
+        Referer: https://value-test.fjmaimaimai.com/
+        User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
+        X-Requested-With: XMLHttpRequest
+    json:
+        bidStartTime: $bidStartTime
+        bidEndTime:  $bidEndTime
+        name: $name
+        resourceType: 1
+        resourceList:
+            - id: ${convert_to_number($id)}
+              title: ${get_resource_title()}
+              content: ${get_resource_content()}
+              serial: ${convert_to_number($serial)}
+        customerValue:
+            -  31
+        taskCharactor: 12
+        reward: 2000
+        acceptanceCriteria: $acceptanceCriteria
+        description: $description
+        isImportant: true
+        taskBelong: 13
+        isRemind: true
+        pictures:
+    method: POST
+    url: task/bid/update
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - $msg
\ No newline at end of file

-name: 公司悬赏任务
+name: 公司任务（抢单任务）
 base_url: ${ENV(base_url)}
 verify: False
 variables:
@@ -19,10 +19,12 @@ request:
         X-MMM-Uuid: $uuid
         X-MMM-Version: 1.0.0
     json:
+        action: 0
+        newest: 1
         pageIndex: 0
         pageSize: 20
     method: POST
-    url: v1/task/rewards
+    url: v1/task/contendTasks
 validate:
     -   eq:
         - content.code

-name: 公司任务（进行中、已完成）
+name: 公司任务（进行中）
 base_url: ${ENV(base_url)}
 verify: False
 variables:
@@ -19,10 +19,10 @@ request:
         X-MMM-Uuid: $uuid
         X-MMM-Version: 1.0.0
     json:
+        action: 0
+        newest: 1
         pageIndex: 0
         pageSize: 20
-        action: 0
-        newest: 0
     method: POST
     url: v1/task/currentTasks
 validate:

@@ -2,8 +2,7 @@ name: 抢单任务详情
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:
-    id: ${get_task_id()}
-    status: ${get_task_status_from_database()}
+    id: ${get_loot_task_id()}
     msg: ok
 request:
     headers:

+name: 发布任务
+base_url: ${ENV(base_worth_url)}
+verify: False
+variables:
+    id: ${get_loot_task_id()}
+    msg: ok
+request:
+    headers:
+        Content-Type: application/json; charset=UTF-8
+        Authorization: Bearer ${get_task_Authorization()}
+        Origin: https://value-test.fjmaimaimai.com
+        Referer: https://value-test.fjmaimaimai.com/
+        User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
+        X-Requested-With: XMLHttpRequest
+    json:
+        id: $id
+    method: POST
+    url: task/open
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - $msg
\ No newline at end of file

@@ -4,7 +4,7 @@ verify: False
 variables:
     currtime: ${make_time()}
     uuid: ${make_uuid()}
-    access_token: ${get_accesstoken()}
+    access_token: ${get_task_accesstoken()}
     sign: ${make_sign($currtime, $uuid, $access_token)}
 request:
     headers:

@@ -2,7 +2,7 @@ name: 抢单任务验收
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:
-    taskId: ${get_task_status_4_from_database()}
+    taskId: ${get_loot_task_id()}
     remark: 上传报告${get_nowtime()}
     realityTime: ${get_today()}
     uid0: ${get_uid0()}
@@ -21,13 +21,13 @@ request:
         X-Requested-With: XMLHttpRequest
     json:
         receiver:
-            uid: $uid15
-            name: $name15
+            uid: $uid0
+            name: $name0
             percent: 25
             reward: 500
         participant:
-            -  uid: $uid0
-               name: $name0
+            -  uid: $uid15
+               name: $name15
                percent: ${convert_to_number(25)}
                reward: ${convert_to_number(500)}
             -  uid: $uid1
@@ -44,13 +44,13 @@ request:
                solution:
                    total: ${convert_to_number(20)}
                    receiver:
-                       uid: $uid15
-                       name: $name15
+                       uid: $uid0
+                       name: $name0
                        percent: ${convert_to_number(25)}
                        score: ${convert_to_number(5)}
                    participant:
-                       -  uid: $uid0
-                          name: $name0
+                       -  uid: $uid15
+                          name: $name15
                           percent: ${convert_to_number(25)}
                           score: ${convert_to_number(5)}
                        -  uid: $uid1
@@ -67,10 +67,10 @@ request:
         taskId: $taskId
     method: POST
     url: task/loot/accept
-#validate:
-      ##    -   eq:
-      ##        - content.code
-      ##        - 0
-      ##    -   eq:
-  ##        - content.msg
-  ##        - $msg
\ No newline at end of file
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - $msg
\ No newline at end of file

+name: 关闭任务
+base_url: ${ENV(base_worth_url)}
+verify: False
+variables:
+    id: ${get_loot_task_id()}
+    reason: 测试关闭任务${get_nowtime()}
+    msg: ok
+request:
+    headers:
+        Content-Type: application/json; charset=UTF-8
+        Authorization: Bearer ${get_task_Authorization()}
+        Origin: https://value-test.fjmaimaimai.com
+        Referer: https://value-test.fjmaimaimai.com/
+        User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
+        X-Requested-With: XMLHttpRequest
+    json:
+        id: $id
+        reason: $reason
+    method: POST
+    url: task/close
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - $msg
\ No newline at end of file

@@ -2,7 +2,7 @@ name: 确认领取人
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:
-    id: ${get_task_status_7_from_database()}
+    id: ${get_loot_task_id()}
     planTime: ${get_today()}
     msg: ok
 request:

+name: 保存抢单任务
+base_url: ${ENV(base_worth_url)}
+verify: False
+variables:
+    name: 测试抢单任务名称${get_nowtime()}
+    acceptanceCriteria: 测试抢单任务的验收标准${get_nowtime()}
+    description: 测试抢单任务的任务描述${get_nowtime()}
+    msg: ok
+teardown_hooks:
+    - ${teardown_hook_get_loot_task_id($response)}
+request:
+    headers:
+        Content-Type: application/json; charset=UTF-8
+        Authorization: Bearer ${get_task_Authorization()}
+        Origin: https://value-test.fjmaimaimai.com
+        Referer: https://value-test.fjmaimaimai.com/
+        User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
+        X-Requested-With: XMLHttpRequest
+    json:
+        name: $name
+        resourceType: 1
+        resourceList:
+            - id: ${get_resource_id()}
+              title: ${get_resource_title()}
+              content: ${get_resource_content()}
+              serial: ${get_serialNo()}
+        customerValue:
+            -  31
+        taskCharacter: 12
+        reward: 2000
+        acceptanceCriteria: $acceptanceCriteria
+        description: $description
+        isImportant: false
+        taskBelong: 13
+#        pictures:
+    method: POST
+    url: task/loot/update
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - $msg
\ No newline at end of file

-name: 保存任务
+name: 保存抢单任务
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiJiZFZFbmExY1NXSlB1UnNLIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.04Ot6NVzdl0l2_JzaU_USkt2_I7S1xqDRAe1mgd5OMQ
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTkyMzU3NjAsImV4cCI6MTU5OTI0NjU2MCwibmJmIjoxNTk5MjM1NzYwLCJqdGkiOiJaZHQwbDg1cW92YVFVUzB4Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.7v8LblyAi2iynP4FscB6g0lI6qUfnja8rDTpAmNrX0I
\ No newline at end of file

-N324MDwTM7CQBYeBiAYQF3XZn8JdApX5
\ No newline at end of file
+4EQRksNcQrr7jD4RKDQeQcSehbskxWbe
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiI0cks2YnZvY3NLNzdlSVVWIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.uhdyp3cjmtOB_wjYMhmmla58nXPp427gGXQplCZijPU
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTkyMzU3NjEsImV4cCI6MTU5OTI0NjU2MSwibmJmIjoxNTk5MjM1NzYxLCJqdGkiOiJHOXB5UW9WOXB5UlZ3anRYIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.JZyzltMQWNLWObfdrE2HzAo_0HPn9c_ZmWtbVyM_48s
\ No newline at end of file

-yaxyx64gdgg
\ No newline at end of file
+m3sr3hxwlkn
\ No newline at end of file

+3041676743955448832
\ No newline at end of file

-d57ab89805400c7d1b2afdeffa449ff85e409a66cc86270111326500f476199203f5852b
\ No newline at end of file
+65d8a312aa904690f1485c475da3def2f225a4c2362d303b21c09ee07e46748bcf9648a2
\ No newline at end of file

-3667592490893312
\ No newline at end of file
+3679205371953152
\ No newline at end of file

-iLq0Ho7hoEaQUOEqmcTc+rTn+0YEWe7G9BQQGNcPRamovbjWT5emh7Q3YbcvOnAdH9hHXCnb031ErVFVesRTYG6nVujzNYut9NEbJb+Xw8MV9pp9D8QfZB9wNF8rgwZU+g65dD6mlrCU0qsMywVqgrPAna9mci+qvQ5DIAqysFc=
\ No newline at end of file
+IN4bWAJAI2RERL3FgFxWwhRuSDVdefyUwKKBqZ8DoqmrUXV/P0fqAY8QliDl4B8XvWFGJgy7GdvBpIVKToNPD8pV4oaO6r4pELpxvd84awJEQbJvbU0jx+Tzo5vhC5ys9spO+YZIrR6Fu6RvMxY8wlEbEXZRYSMd7QEp4Gw9kJQ=
\ No newline at end of file

+3039395831662248960
\ No newline at end of file

-3247366011913216
\ No newline at end of file
+3248817613779968
\ No newline at end of file

-мֵ1
\ No newline at end of file
+мֵ19
\ No newline at end of file

-3273049130133760
\ No newline at end of file
+3275234834850048
\ No newline at end of file

-мֵ1
\ No newline at end of file
+мֵ19
\ No newline at end of file

-10996
\ No newline at end of file
+11041
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MTY4NTIzLCJleHAiOjE1OTgxNzkzMjMsIm5iZiI6MTU5ODE2ODUyMywianRpIjoiOWRsVEJrYkF2VmZYOUk4ZCIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.4m41YB_OdtpsC6Ezg3-LeFki_ce9TMqnHBvtHvrPhTo
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk5MjM1NzYxLCJleHAiOjE1OTkyNDY1NjEsIm5iZiI6MTU5OTIzNTc2MSwianRpIjoiSXBGQzJ0THlwdHQzSUhSMiIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.CcUAcnQcG193_6UIVknngrTGqC4aG6ADorsSfgg4eNQ
\ No newline at end of file

-jajwB87JfYZZ5QMDP2cHKsjRYfceBR7z
\ No newline at end of file
+NGQDN5sFaCTCK3y5xmhFBJWpiQxD8pKJ
\ No newline at end of file

-nwqq1o9rmsb
\ No newline at end of file
+tovgw90nveo
\ No newline at end of file

-3023771459492774912
\ No newline at end of file
+3026612655420343296
\ No newline at end of file

@@ -4,11 +4,13 @@ import time
 from helpfunc.header_func import *
 from helpfunc.login_func import *
 from helpfunc.m_func import *
-from helpfunc.pg_db_func import *
+from helpfunc.pg_db_loot_func import *
+from helpfunc.pg_db_bid_func import *
 # from helpfunc.time_func import *
 
 import time,datetime,re
 
+
 from urllib.parse import *
 
 
@@ -20,7 +22,7 @@ def convert_to_string(value):
 
 def convert_to_number(value):
     return int(value)
-
+# print(type(convert_to_number(get_resource_id())))
 # def get_base_url(env_type="test"):
 #     """
 #     根据配置选择运行环境
@@ -39,3 +41,14 @@ def get_nowtime():
 def get_second():
     curr_time = datetime.datetime.now()
     return  curr_time.second
+
+def get_tomorrow():
+    td = datetime.timedelta(days=1)
+    tomorrow = (datetime.datetime.utcnow() + td).strftime("%Y-%m-%dT%H:%M:%SZ")
+    return tomorrow
+def get_today1():
+    td = datetime.timedelta(days=0)
+    tomorrow = (datetime.datetime.utcnow() + td).strftime("%Y-%m-%dT%H:%M:%SZ")
+    return tomorrow
+
+# print(get_today1())
\ No newline at end of file

@@ -261,11 +261,12 @@ def teardown_hook_get_cid(response):
 #————————————————————————————————————————————————————————————————————————————————————————————————————————————
 #引用资源模块
 def teardown_hook_get_resource_id(response):
+    global resource_id
+    resource_id = ''
     if response.status_code ==200:
         jsondata = json.loads(response.text)
         resource_id = str(jsondata['data']['list'][0]['id'])
     try:
-
         with open(path + "config/resource_id.txt", 'w+') as f:
             f.write(resource_id)
             print('写入成功，resource_id：{}'.format(resource_id))
@@ -289,6 +290,8 @@ def get_resource_id_to_int():
     return int(get_resource_id())
 
 def teardown_hook_get_resource_title(response):
+    global resource_title
+    resource_title = ''
     if response.status_code ==200:
         jsondata = json.loads(response.text)
         resource_title = jsondata['data']['list'][0]['title']
@@ -314,6 +317,8 @@ def get_resource_title():
     return resource_title
 
 def teardown_hook_get_resource_content(response):
+    global resource_content
+    resource_content = ''
     if response.status_code ==200:
         jsondata = json.loads(response.text)
         resource_content = jsondata['data']['list'][0]['content']

@@ -7,7 +7,6 @@
 import json
 from urllib.parse import *
 
-
 # path = 'E:/task_api/'
 path = 'E:/mmm_auto/task_api/'
 def teardown_hook_get_Authorization(response):
@@ -68,25 +67,76 @@ def teardown_hook_get_login_code(response):
     except Exception as e:
         print('写入失败', e)
     return res
-
-def teardown_hook_get_task_id(response):
+#写入抢单任务id
+def teardown_hook_get_loot_task_id(response):
+    if response.status_code == 200:
+        jsondata = json.loads(response.text)
+        task_id =jsondata['data']['id']
+    try:
+        # 保存token到文件
+        with open(path + 'config/loot_task_id.txt','w+') as f:
+            f.write(task_id)
+            print('写入成功，task_id：{}'.format(task_id))
+            f.close()
+    except Exception as e:
+        print('写入失败', e)
+    return task_id
+#获取抢单任务id
+def get_loot_task_id():
+    try:
+        # 保存token到文件
+        with open(path + "config/loot_task_id.txt", 'r') as f:
+            task_id = f.read()
+            print('读取成功，task_id：{}'.format(task_id))
+    except Exception as e:
+        print('读取失败', e)
+    # Authorization = str(Authorization)
+    return task_id
+#写入竞标任务id
+def teardown_hook_get_bid_task_id(response):
     if response.status_code == 200:
         jsondata = json.loads(response.text)
         task_id =jsondata['data']['id']
     try:
         # 保存token到文件
-        with open(path + 'config/task_id.txt','w+') as f:
+        with open(path + 'config/bid_task_id.txt','w+') as f:
             f.write(task_id)
             print('写入成功，task_id：{}'.format(task_id))
             f.close()
     except Exception as e:
         print('写入失败', e)
     return task_id
+#获取竞标任务id
+def get_bid_task_id():
+    try:
+        # 保存token到文件
+        with open(path + "config/bid_task_id.txt", 'r') as f:
+            task_id = f.read()
+            print('读取成功，task_id：{}'.format(task_id))
+    except Exception as e:
+        print('读取失败', e)
+    # Authorization = str(Authorization)
+    return task_id
 
-def get_task_id():
+#写入指派任务id
+def teardown_hook_get_appoint_task_id(response):
+    if response.status_code == 200:
+        jsondata = json.loads(response.text)
+        task_id =jsondata['data']['id']
+    try:
+        # 保存token到文件
+        with open(path + 'config/appoint_task_id.txt','w+') as f:
+            f.write(task_id)
+            print('写入成功，task_id：{}'.format(task_id))
+            f.close()
+    except Exception as e:
+        print('写入失败', e)
+    return task_id
+#获取指派任务id
+def get_appoint_task_id():
     try:
         # 保存token到文件
-        with open(path + "config/task_id.txt", 'r') as f:
+        with open(path + "config/appoint_task_id.txt", 'r') as f:
             task_id = f.read()
             print('读取成功，task_id：{}'.format(task_id))
     except Exception as e:

+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# Date: 2020/7/12 16:27
+# @Author:bxh
+# @file: pg_db_func.py
+from helpfunc.m_func import *
+import psycopg2
+from datetime import *
+
+# 获得连接
+def GetConnect():
+    conn = False
+    try:
+        conn = psycopg2.connect(database="mmmworthtest",
+                                    user="bianxinhua",
+                                    password="bianxinhua_123",
+                                    host="114.55.200.59",
+                                    port="31543")
+    except Exception as err:
+        print("连接数据库失败，%s" % err)
+    return conn
+
+#获取抢单任务单的状态:待发布
+def get_bid_task_status_1_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks  where company_id = 366 and task_type = 2 and task_status = 1 and id = {} '''.format(get_bid_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+
+#获取抢单任务单的状态:待领取
+def get_task_status_2_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks  where company_id = 366 and task_type = 2 and task_status = 2 and id = {} '''.format(get_bid_task_id())
+    print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+#获取抢单任务单的状态:进行中
+def get_task_status_3_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks  where company_id = 366 and task_type = 2 and task_status = 3 and id = {} '''.format(get_bid_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+# #获取抢单任务单的状态:待确认
+def get_task_status_7_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks  where company_id = 366 and task_status = 7 and id = {}'''.format(get_bid_task_id())
+    print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+
+#获取任务单的状态:待验收
+def get_task_status_4_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3248817613892608'  and id = {}'''.format(get_bid_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+
+#获取任务单的状态:已完成
+def get_task_status_5_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 5 and id = {}'''.format(get_bid_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+
+#获取任务单的状态:已关闭
+def get_task_status_6_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 6 and id = {}'''.format(get_bid_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
\ No newline at end of file

@@ -7,9 +7,12 @@ from helpfunc.m_func import *
 import psycopg2
 from datetime import *
 
+
+
 def get_today():
     today = datetime.now(timezone.utc).astimezone().isoformat()
     return today
+
 # 获得连接
 def GetConnect():
     conn = False
@@ -72,12 +75,12 @@ def get_employee_account_from_database():
         db.rollback()
     db.close()
 
-#获取任务单的状态
-def get_task_status_from_database():
+#获取抢单任务单的状态:待发布
+def get_task_status_1_from_database():
     db = GetConnect()
     cursor = db.cursor()
     # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
-    sql = '''select task_status from tasks  where company_id = 366 and task_type = 1 and id = {} '''.format(get_task_id())
+    sql = '''select task_status from tasks  where company_id = 366 and task_type = 1 and task_status = 1 and id = {} '''.format(get_loot_task_id())
     # print(sql)
     try:
         cursor.execute(sql)
@@ -89,12 +92,28 @@ def get_task_status_from_database():
         db.rollback()
     db.close()
 
-#获取任务单的状态:待确认
-def get_task_status_7_from_database():
+#获取抢单任务单的状态:待领取
+def get_task_status_2_from_database():
     db = GetConnect()
     cursor = db.cursor()
     # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
-    sql = '''select id from tasks  where company_id = 366 and task_status = 7 order by id desc'''
+    sql = '''select task_status from tasks  where company_id = 366 and task_type = 1 and task_status = 2 and id = {} '''.format(get_loot_task_id())
+    print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+#获取抢单任务单的状态:进行中
+def get_task_status_3_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks  where company_id = 366 and task_type = 1 and task_status = 3 and id = {} '''.format(get_loot_task_id())
     # print(sql)
     try:
         cursor.execute(sql)
@@ -105,21 +124,70 @@ def get_task_status_7_from_database():
         print(err)
         db.rollback()
     db.close()
+# #获取抢单任务单的状态:待确认
+def get_task_status_7_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks  where company_id = 366 and task_status = 7 and id = {}'''.format(get_loot_task_id())
+    print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
 
 #获取任务单的状态:待验收
 def get_task_status_4_from_database():
     db = GetConnect()
     cursor = db.cursor()
     # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
-    sql = '''select id from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3247366011913216' order by id desc'''
+    sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3248817613892608'  and id = {}'''.format(get_loot_task_id())
     # print(sql)
     try:
         cursor.execute(sql)
         result = cursor.fetchone()
-        return str(result[0])
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
+
+#获取任务单的状态:已完成
+def get_task_status_5_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 5 and id = {}'''.format(get_loot_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
     except Exception as err:
         # 发生错误时回滚
         print(err)
         db.rollback()
     db.close()
-# print(get_task_status_4_from_database())
\ No newline at end of file
+
+#获取任务单的状态:已关闭
+def get_task_status_6_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 6 and id = {}'''.format(get_loot_task_id())
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()
\ No newline at end of file

 config:
-    name: 价值系统登录
+    name: 用户登录APP
     base_url: ${ENV(base_url)}
 
 teststeps:

 config:
-    name: 账号登录测试
+    name: 用户登录管理后台
     base_url: ${ENV(base_business_url)}
 
 teststeps:

+config:
+    name: 用户新增抢单任务
+
+teststeps:
+
+-   name: 提问问题-审核问题-获取资源
+    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
+
+-   name: 登录系统
+    variables:
+        phone: ${ENV(wpftwphone)}
+    testcase: testcases/common/COM002_m_login_testcases.yml
+
+-   name: 引用资源
+    api: api/m_api/task_resource_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_resource_id($response)}
+        - ${teardown_hook_get_resource_title($response)}
+        - ${teardown_hook_get_resource_content($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+-   name: 保存任务
+    api: api/m_api/loot/loot_update_0_false_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_loot_task_id($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+#-   name: 发布任务
+#    api: api/m_api/loot/loot_open_api.yml
+#    varidate:
+#        validate:
+#          - eq:
+#            - content.msg
+#            - ok
\ No newline at end of file

 config:
-    name: 19990000008保存抢单任务-发布任务
+    name: 用户新增抢单任务-公司重要悬赏
 
 teststeps:
 
 -   name: 提问问题-审核问题-获取资源
     testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
 
--   name: 19990000008登录系统
+-   name: 登录系统
     variables:
         phone: ${ENV(wpftwphone)}
-    testcase: testcases/m_login_testcases.yml
+    testcase: testcases/common/COM002_m_login_testcases.yml
 
 -   name: 引用资源
     api: api/m_api/task_resource_api.yml
@@ -23,17 +23,17 @@ teststeps:
             - content.msg
             - ok
 
--   name: 19990000000保存任务
-    api: api/m_api/loot/loot_update_0_api.yml
+-   name: 保存任务
+    api: api/m_api/loot/loot_update_true_api.yml
     teardown_hooks:
-        - ${teardown_hook_get_task_id($response)}
+        - ${teardown_hook_get_loot_task_id($response)}
     varidate:
         validate:
           - eq:
             - content.msg
             - ok
--   name: 19990000000发布任务
-    api: api/m_api/task_open_api.yml
+-   name: 发布任务
+    api: api/m_api/loot/loot_open_api.yml
     varidate:
         validate:
           - eq:

 config:
-    name: 19990000008保存抢单任务-删除任务
+    name: 用户新增竞标任务
 
 teststeps:
 
+-   name: 提问问题-审核问题-获取资源
+    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
+
 -   name: 登录系统
     variables:
         phone: ${ENV(wpftwphone)}
-    testcase: testcases/m_login_testcases.yml
+    testcase: testcases/common/COM002_m_login_testcases.yml
 
--   name: 保存任务
-    output:
-        - id
-    api: api/m_api/loot/loot_update_0_api.yml
-    extract:
-        id: content.data.id
+-   name: 引用资源
+    api: api/m_api/task_resource_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_resource_id($response)}
+        - ${teardown_hook_get_resource_title($response)}
+        - ${teardown_hook_get_resource_content($response)}
     varidate:
         validate:
           - eq:
-              - content.msg
-              - ok
+            - content.msg
+            - ok
+
+-   name: 保存任务
+    api: api/m_api/bid/bid_update_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_bid_task_id($response)}
+    varidate:
+        validate:
           - eq:
-              - content.data.id
-              - $id
--   name: 删除任务
-    api: api/m_api/task_delete_api.yml
+            - content.msg
+            - ok
+-   name: 发布任务
+    api: api/m_api/bid/bid_open_api.yml
     varidate:
         validate:
           - eq:
-              - content.msg
-              - ok
\ No newline at end of file
+            - content.msg
+            - ok
\ No newline at end of file

+config:
+    name: 用户新增指派任务
+
+teststeps:
+
+-   name: 提问问题-审核问题-获取资源
+    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
+
+-   name: 登录系统
+    variables:
+        phone: ${ENV(wpftwphone)}
+    testcase: testcases/common/COM002_m_login_testcases.yml
+
+-   name: 引用资源
+    api: api/m_api/task_resource_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_resource_id($response)}
+        - ${teardown_hook_get_resource_title($response)}
+        - ${teardown_hook_get_resource_content($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+-   name: 保存任务
+    api: api/m_api/appoint/appoint_update_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_bid_task_id($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+-   name: 发布任务
+    api: api/m_api/appoint/appoint_open_api.yml
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-待发布
+
+teststeps:
+
+-   name: 提问问题-审核问题-获取资源
+    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
+
+-   name: 登录系统
+    variables:
+        phone: ${ENV(wpftwphone)}
+    testcase: testcases/common/COM002_m_login_testcases.yml
+
+-   name: 引用资源
+    api: api/m_api/task_resource_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_resource_id($response)}
+        - ${teardown_hook_get_resource_title($response)}
+        - ${teardown_hook_get_resource_content($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+-   name: 保存任务
+    api: api/m_api/loot/loot_update_false_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_loot_task_id($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+-   name: 查看详情
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_1_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-已发布，待领取
+
+teststeps:
+
+-   name: 提问问题-审核问题-获取资源
+    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
+
+-   name: 登录系统
+    variables:
+        phone: ${ENV(wpftwphone)}
+    testcase: testcases/common/COM002_m_login_testcases.yml
+
+-   name: 引用资源
+    api: api/m_api/task_resource_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_resource_id($response)}
+        - ${teardown_hook_get_resource_title($response)}
+        - ${teardown_hook_get_resource_content($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+#
+-   name: 保存任务
+    api: api/m_api/loot/loot_update_false_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_loot_task_id($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+-   name: 发布任务
+    api: api/m_api/loot/loot_open_api.yml
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+-   name: 查看详情
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_2_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-已领取，待确认
+
+teststeps:
+
+-   name: 抢单任务状态验证-已发布，待领取
+    testcase: testcases/common/COM008_loot_open_status_2_testcase.yml
+
+-   name: app端点击立即抢单
+    testcase: testcases/task/loot/loot_rewards_taskDetails_testcase.yml
+
+-   name: 查看详情
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_7_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-进行中
+
+teststeps:
+
+-   name: 抢单任务状态验证-已领取，待确认
+    testcase: testcases/common/COM009_loot_open_status_7_testcase.yml
+
+-   name: 确认领取人
+    api: api/m_api/loot/loot_task_confirm_api.yml
+    varidate:
+        validate:
+            -   eq:
+                - content.msg
+                - ok
+-   name: 查看详情中的状态
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_3_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-已完成，待验收
+
+teststeps:
+
+-   name: 抢单任务状态验证-进行中
+    testcase: testcases/common/COM010_loot_open_status_3_testcase.yml
+
+##-------------------------APP端完成抢单任务------------------------------
+-   name: 完成任务
+    testcase: testcases/task/loot/loot_task_finishTask_testcase.yml
+
+-   name: 查看详情中的状态
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_4_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-已验收，已完成
+
+teststeps:
+
+-   name: 抢单任务状态验证-已完成，待验收
+    testcase: testcases/common/COM011_loot_open_status_4_testcase.yml
+
+-   name: 用户列表
+    output:
+      - uid0
+      - name0
+      - uid1
+      - name1
+      - uid2
+      - name2
+      - uid15
+      - name15
+    api: api/m_api/common/user_api.yml
+    extract:
+      uid0: content.data.list.0.uid
+      name0: content.data.list.0.name
+      uid1: content.data.list.1.uid
+      name1: content.data.list.1.name
+      uid2: content.data.list.2.uid
+      name2: content.data.list.2.name
+      uid15: content.data.list.15.uid
+      name15: content.data.list.15.name
+
+-   name: 抢单任务验收
+    api: api/m_api/loot/loot_task_accept_api.yml
+    validate:
+      - eq:
+          - content.code
+          - 0
+      - eq:
+          - content.msg
+          - ok
+
+-   name: 查看详情中的状态
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_5_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 抢单任务状态验证-已验收，已完成
+
+teststeps:
+
+-   name: 抢单任务状态验证-已发布，待领取
+    testcase: testcases/common/COM008_loot_open_status_2_testcase.yml
+
+
+-   name: 关闭任务
+    api: api/m_api/loot/loot_task_close_api.yml
+    validate:
+      - eq:
+          - content.code
+          - 0
+      - eq:
+          - content.msg
+          - ok
+
+-   name: 查看详情中的状态
+    api: api/m_api/loot/loot_detail_api.yml
+    variables:
+      status: ${get_task_status_6_from_database()}
+      msg: ok
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - $msg
+          - eq:
+            - content.data.status
+            - $status
\ No newline at end of file

+config:
+    name: 竞标任务状态验证-待发布
+
+teststeps:
+
+-   name: 提问问题-审核问题-获取资源
+    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
+
+-   name: 登录系统
+    variables:
+        phone: ${ENV(wpftwphone)}
+    testcase: testcases/common/COM002_m_login_testcases.yml
+
+-   name: 引用资源
+    api: api/m_api/task_resource_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_resource_id($response)}
+        - ${teardown_hook_get_resource_title($response)}
+        - ${teardown_hook_get_resource_content($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+-   name: 保存任务
+    api: api/m_api/bid/bid_update_api.yml
+    teardown_hooks:
+        - ${teardown_hook_get_bid_task_id($response)}
+    varidate:
+        validate:
+          - eq:
+            - content.msg
+            - ok
+
+#-   name: 查看详情
+#    api: api/m_api/loot/loot_detail_api.yml
+#    variables:
+#      status: ${get_bid_task_status_1_from_database()}
+#      msg: ok
+#    varidate:
+#        validate:
+#          - eq:
+#            - content.msg
+#            - $msg
+#          - eq:
+#            - content.data.status
+#            - $status
\ No newline at end of file

@@ -10,7 +10,7 @@ teststeps:
 -   name: 有评分权限19990000011登录系统
     variables:
         phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
+    testcase: testcases/common/login_testcases.yml
 
 -   name: 19990000011查看待我审核
     output:

-config:
-    name: QX002:同级别评分权限人员-查看问题-权限校验21
-#    #清理数据
-#    teardown_hooks:
-#        - ${teardown_hook_clean_db()}
-#        - ${teardown_hook_sleep_N_secs($response,2)}
-
-teststeps:
-
--   name: 19990000008提出问题
-    testcase: testcases/question/add_question.yml
-
--   name: 有评分权限19990000011登录系统
-    variables:
-        phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 有评分权限19990000011查看待我审核
-    output:
-        - qid
-    api: api/app_api/question_api/audits_ireview_api.yml
-    extract:
-        qid: content.data.questions.0.id
-    validate:
-        - eq:
-              - content.data.questions.0.id
-              - $qid
-#
-#-   name: 有评分权限18200000005审核问题
-#    api: api/question_api/auditquestion_api.yml
-#
-#-   name: 同级别有评分权限18200000007登录系统
-#    variables:
-#        currtime: ${make_time()}
-#        uuid: ${make_uuid()}
-#        access_token: ''
-#        sign: ${make_sign($currtime, $uuid,$access_token)}
-#        phone: ${ENV(pfphone1)}
-#    testcase: testcases/login_testcases.yml
-#
-#-   name: 同级别评分权限18200000007查看问题详情
-#    api: api/question_api/questiondetail_api.yml
-#    validate:
-#        - eq:
-#              - content.data.question.permission
-#              - 21
-
-

@@ -7,7 +7,7 @@ teststeps:
 -   name: 无评分权限的提问人员19990000008登录系统
     variables:
         phone: ${ENV(wpftwphone)}
-    testcase: testcases/login_testcases.yml
+    testcase: testcases/common/login_testcases.yml
 
 -   name: 19990000008发布提问
     api: api/app_api/firstpage_api/addquestion_api.yml

-config:
-    name: jxz:登录系统-查看公司悬赏任务-点击抢单
-
-teststeps:
-
--   name: 19990000011登录系统
-    variables:
-        phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 19990000011查看公司悬赏任务
-    output:
-        - id
-    api: api/task_api/task/rewards/rewards_api.yml
-    extract:
-        id: content.data.tasks.0.id
-    validate:
-        - eq:
-              - content.data.tasks.0.id
-              - $id
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011点击抢单
-    api: api/task_api/task/rewards/submitCompete_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 抢单成功！
-
--   name: 19990000011查看进行中的任务
-    api: api/task_api/task/rewards/currentTasks_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.data.task.status
-              - 3
-        - eq:
-              - content.msg
-              - 获取详情成功
-

-config:
-    name: jxz:登录系统-查看公司悬赏任务-点击竞标
-
-teststeps:
-
--   name: 19990000011登录系统
-    variables:
-        phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 19990000011查看公司悬赏任务
-    output:
-        - id
-    api: api/task_api/task/rewards/rewards_api.yml
-    extract:
-        id: content.data.tasks.0.id
-    validate:
-        - eq:
-              - content.data.tasks.0.id
-              - $id
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011点击竞标
-    api: api/task_api/task/rewards/submitCompete_1_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 已成功参与竞标，等待中标！！
-
--   name: 19990000008登录系统
-    variables:
-        phone: ${ENV(wpftwphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 19990000008查看公司悬赏任务
-    output:
-        - id
-    api: api/task_api/task/rewards/rewards_api.yml
-    extract:
-        id: content.data.tasks.0.id
-    validate:
-        - eq:
-              - content.data.tasks.0.id
-              - $id
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000008任务详情
-    output:
-      - uid
-    api: api/task_api/task/taskDetails_api.yml
-    extract:
-        uid: content.data.tasks.bidders.0.uid
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000008中标
-    api: api/task_api/task/bidTask_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 中标成功
-
--   name: 19990000011登录系统
-    variables:
-        phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 19990000011查看公司悬赏任务
-    output:
-        - id
-    api: api/task_api/task/rewards/rewards_api.yml
-    extract:
-        id: content.data.tasks.0.id
-    validate:
-        - eq:
-              - content.data.tasks.0.id
-              - $id
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011查看进行中的任务
-    api: api/task_api/task/rewards/currentTasks_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.data.task.status
-              - 3
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011完成任务
-    api: api/task_api/task/taskfinishTask_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 完成成功
\ No newline at end of file

-config:
-    name: jxz:登录系统-查看公司悬赏任务-点击抢单
-
-teststeps:
-
--   name: 19990000011登录系统
-    variables:
-        phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 19990000011查看公司悬赏任务
-    output:
-        - id
-    api: api/task_api/task/rewards/rewards_api.yml
-    extract:
-        id: content.data.tasks.0.id
-    validate:
-        - eq:
-              - content.data.tasks.0.id
-              - $id
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011点击抢单
-    api: api/task_api/task/rewards/submitCompete_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 抢单成功！
-
--   name: 19990000011查看进行中的任务
-    api: api/task_api/task/rewards/currentTasks_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.data.task.status
-              - 3
-        - eq:
-              - content.msg
-              - 获取详情成功
-

-config:
-    name: jxz:登录系统-查看公司悬赏任务-点击抢单
-
-teststeps:
-
--   name: 19990000011登录系统
-    variables:
-        phone: ${ENV(pfphone)}
-    testcase: testcases/login_testcases.yml
-
--   name: 19990000011查看公司悬赏任务
-    output:
-        - id
-    api: api/task_api/task/rewards/rewards_api.yml
-    extract:
-        id: content.data.tasks.0.id
-    validate:
-        - eq:
-              - content.data.tasks.0.id
-              - $id
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011点击抢单
-    api: api/task_api/task/rewards/submitCompete_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 抢单成功！
-
--   name: 19990000011查看进行中的任务
-    api: api/task_api/task/rewards/currentTasks_0_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 获取成功
-
--   name: 19990000011任务详情
-    api: api/task_api/task/taskDetails_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.data.task.status
-              - 3
-        - eq:
-              - content.msg
-              - 获取详情成功
-
--   name: 19990000011完成任务
-    api: api/task_api/task/taskfinishTask_api.yml
-    validate:
-        - eq:
-              - content.code
-              - 0
-        - eq:
-              - content.msg
-              - 完成成功
\ No newline at end of file

 config:
     name: 首页-立即抢单
+    variables:
+        phone: ${ENV(appphone)}
 
 teststeps:
 
--   name: 19990000008登录系统
-    variables:
-        phone: ${ENV(appphone)}
-    testcase: testcases/login_testcases.yml
+-   name: 登录系统
+    testcase: testcases/common/login_testcases.yml
 
--   name: 19990000008登录价值系统
-    testcase: testcases/task_login_testcases.yml
+-   name: 登录价值系统
+    testcase: testcases/common/COM001_task_login_testcases.yml
 
--   name: 19990000000查看公司悬赏任务列表
+-   name: 公司任务（抢单任务）
     output:
         - id
-    api: api/m_api/task_rewards_api.yml
+    api: api/m_api/loot/loot_contendTasks_api.yml
     extract:
         id: content.data.tasks.0.id
     validate:
         - eq:
             - content.data.tasks.0.id
             - $id
-#
--   name: 19990000008抢单
+-   name: 抢单
     api: api/m_api/loot/submitCompete_loot_api.yml

-config:
-    name: 保存抢单任务-发布任务-确认领取人
-
-teststeps:
-
--   name: 登录系统
-    testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml
-
--   name: app端点击立即抢单
-    testcase: testcases/task/task_rewards_taskDetails_testcase.yml
-
--   name: 确认领取人
-    api: api/m_api/loot/loot_task_confirm_api.yml
-#    variables:
-#        id: ${get_task_id()}
-    varidate:
-        validate:
-            -   eq:
-                - content.msg
-                - ok
-
--   name: 抢单任务详情
-    output:
-        - status
-    api: api/m_api/loot/task_loot_detail_api.yml
-    extract:
-        status: content.data.status
-#    variables:
-#        id: ${get_task_id()}
-    varidate:
-        validate:
-            -   eq:
-                - content.msg
-                - ok
-            -   eq:
-                - content.data.status
-                - $status
\ No newline at end of file

@@ -2,18 +2,18 @@ config:
     name: 任务完成
 
 teststeps:
--   name: 19990000008登录系统
+-   name: 登录系统
     variables:
         phone: ${ENV(appphone)}
-    testcase: testcases/login_testcases.yml
+    testcase: testcases/common/login_testcases.yml
 
--   name: 19990000008登录价值系统
-    testcase: testcases/task_login_testcases.yml
+-   name: 登录价值系统
+    testcase: testcases/common/COM001_task_login_testcases.yml
 
--   name: 公司任务（进行中、已完成）
+-   name: 公司任务（进行中）
     output:
         - id
-    api: api/m_api/task_currentTasks_api.yml
+    api: api/m_api/loot/loot_currentTasks_api.yml
     extract:
         id: content.data.tasks.0.id
     validate:
@@ -21,5 +21,8 @@ teststeps:
             - content.data.tasks.0.id
             - $id
 
+-   name: 查看抢单任务详情
+    api: api/m_api/loot/loot_task_Details_api.yml
+
 -   name: 完成任务
-    api: api/m_api/task_finishTask_api.yml
\ No newline at end of file
+    api: api/m_api/loot/loot_task_finishTask_api.yml
\ No newline at end of file

-config:
-    name: 保存抢单任务-发布任务-驳回领取人
-
-teststeps:
-
--   name: 登录系统
-    testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml
-
--   name: app端点击立即抢单
-    testcase: testcases/task/task_rewards_taskDetails_testcase.yml
-
--   name: 驳回领取人
-    api: api/m_api/loot/loot_task_reject_api.yml
-    variables:
-        id: ${get_task_id()}
-    varidate:
-        validate:
-            -   eq:
-                - content.msg
-                - ok
-
--   name: 抢单任务详情
-    output:
-        - status
-    api: api/m_api/loot/task_loot_detail_api.yml
-    extract:
-        status: content.data.status
-    variables:
-        id: ${get_task_id()}
-    varidate:
-        validate:
-            -   eq:
-                - content.msg
-                - ok
-            -   eq:
-                - content.data.status
-                - $status
\ No newline at end of file

-config:
-    name: 保存抢单任务-发布任务-确认领取人
-#
-teststeps:
-#-   name: 登录系统
-#    testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml
-#
-#-   name: app端点击立即抢单
-#    testcase: testcases/task/task_rewards_taskDetails_testcase.yml
-#
-#-   name: 确认领取人
-#    api: api/m_api/loot/loot_task_confirm_api.yml
-##    variables:
-##        id: ${get_task_id()}
-#    varidate:
-#        validate:
-#            -   eq:
-#                - content.msg
-#                - ok
-##-------------------------APP端完成抢单任务------------------------------
-#-   name: 完成任务
-#    testcase: testcases/task/task_finishTask_testcase.yml
-
-#-------------------------web端验收抢单任务------------------------------
--   name: 获取用户信息
-    output:
-      - uid0
-      - name0
-      - uid1
-      - name1
-      - uid2
-      - name2
-      - uid15
-      - name15
-    api: api/m_api/common/user_api.yml
-    teardown_hooks:
-      - ${teardown_hook_get_uid0($response)}
-      - ${teardown_hook_get_uid1($response)}
-      - ${teardown_hook_get_uid2($response)}
-      - ${teardown_hook_get_uid15($response)}
-    extract:
-#      uid0: content.data.list.0.uid
-      name0: content.data.list.0.name
-#      uid1: content.data.list.1.uid
-      name1: content.data.list.1.name
-#      uid2: content.data.list.2.uid
-      name2: content.data.list.2.name
-#      uid15: content.data.list.15.uid
-      name15: content.data.list.15.name
-    validate:
-      - eq:
-          - content.data.list.0.name
-          - $name0
-      - eq:
-          - content.data.list.1.name
-          - $name1
-      - eq:
-          - content.data.list.2.name
-          - $name2
-      - eq:
-          - content.data.list.15.name
-          - $name15
-
-#-   name: 验收任务
-#    api: api/m_api/loot/loot_task_accept_api.yml
-
--   name: 验收任务
-    api: api/m_api/loot/loot_task_accept_api.yml
\ No newline at end of file

@@ -13,20 +13,5 @@ testcases:
 #-   name: member_set_permission 成员管理设置权限
 #    testcase: testcases/task/member/member_set_permission_testcases.yml
 
-#-   name: 引用资源
-#    testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
-
-#-   name: loot_update_0 抢单任务-保存任务-删除任务
-#    testcase: testcases/task/loot/save_loot_update_0_delete_testcase.yml
-
-#-   name: app端点击立即抢单
-#    testcase: testcases/task/task_rewards_taskDetails_testcase.yml
-
-#-   name: loot_task_reject 抢单模式-驳回领取人-查看详情
-#    testcase: testcases/task/loot/loot_task_reject_testcase.yml
-
-#-   name: loot_task_confirm 抢单模式-确认领取人-查看详情
-#    testcase: testcases/task/loot/loot_task_confirm_testcase.yml
-
--   name: loot_task_confirm 抢单模式-完成任务-验收任务
-    testcase: testcases/task/loot_task_finishTask_testcase.yml
\ No newline at end of file
+-   name: 任务状态验证-已关闭
+    testcase: testcases/common/COM014_bid_update_status_1_testcase.yml
\ No newline at end of file