调整下测试账号

@@ -14,6 +14,7 @@ companyId=214
 adminphone=19911111111
 partnerphone=15510101010
 partnerId = 1047
-visitorphone = 15510101011
+visitorphone = 15510101012
 managerphone = 19911110001
-id = 358
\ No newline at end of file
+managerphone1 = 19911110003
+id = 366
\ No newline at end of file

@@ -27,3 +27,4 @@ request:
         clientId: 'pdf233Znkjo'
     method: POST
     url: /v1/auth/centerCompanys
+

-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MTQwODk0NjMsImlhdCI6MTYxNDA0NjI2MywiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTYxNDA0NjI2MywidWlkIjozMjQyMzEyOTU1MTM1NzQ0LCJjb21wYW55SWQiOjIxNH0.g72J0Cyp-EYq9iWlNWW7WWWmkyr63ojR90T2G_F04Ts
\ No newline at end of file
+eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MjQyOTA1MzMsImlhdCI6MTYyNDI0NzMzMywiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTYyNDI0NzMzMywidWlkIjozMjQyMzEyOTU1MTM1NzQ0LCJjb21wYW55SWQiOjIxNH0.l0DtLzMjKwOpoTi6Z4yqbD-Xq0M9UZlmFstzhXJUEsY
\ No newline at end of file

-4972,4973,4974,4975,4976,
\ No newline at end of file

@@ -241,4 +241,6 @@ def get_saleDate_bigger_today(*args_v):
     else:
         return 1
 
-
+# a = {'code': 0, 'msg': '成功', 'data': {'center': {'accid': 3289075587008169984, 'imToken': '7cfb4197a9c6686a444191268beca32a', 'csAccountID': '3129687690100739', 'credentials': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjE1NTEwMTAxMDExLCJjb21wYW55SWQiOjAsImFkbWluVHlwZSI6MCwicGhvbmUiOiIxNTUxMDEwMTAxMSIsImV4cCI6MTYyNjgzMzQ2MSwiaXNzIjoiand0In0.LpeAV863FuyF76tzWOKDNu3lrrLcwHKk-VSbs4Qlxd0', 'phone': '15510101011', 'partner': {'companys': [], 'id': 1, 'name': '合伙人'}, 'manager': {'companys': [{'id': 214, 'name': 'auto_test company', 'shortName': '自动化测试', 'image': {'path': 'http://suplus-file-dev.fjmaimaimai.com/upload/image/2020031002532231962.jpg'}, 'phone': '123'}], 'id': 2, 'name': '企业高管'}}}}
+#
+# print(a['data']['center']['partner'])
\ No newline at end of file

@@ -66,8 +66,6 @@ def setup_hook_clean_db(companyid):
         db.commit()
         cursor.execute('delete from order_good where company_id=' + companyid)
         db.commit()
-        # cursor.execute('delete from partner_info where company_id=' + companyid + 'and id <> 1047')
-        # db.commit()
         print("delete OK")
     except Exception as err:
         # 发生错误时回滚

@@ -12,7 +12,7 @@ teststeps:
     api: api/app_api/login/auth_centerCompanys_api.yml
     validate:
         - eq:
-            - content.data.center.partner.companys.0.id
+            - content.data.center.partner.companys.-1.id
             - ${convert_to_int($id)}
         - length_equals:
             - content.data.center.manager.companys

@@ -2,7 +2,7 @@ config:
     name: APP高管登录
     base_url: ${ENV(base_url)}
     variables:
-        phone: ${ENV(managerphone)}
+        phone: ${ENV(managerphone1)}
         id: ${ENV(companyId)}
         msg: '成功'
 #

@@ -2,7 +2,7 @@ config:
     name: APP合伙人登录,提示"当前账号已被禁用"
     base_url: ${ENV(base_url)}
     variables:
-        phone: ${ENV(visitorphone)}
+        phone: ${ENV(managerphone)}
         id: ${ENV(id)}
         msg: '当前账号已被禁用'
 #

@@ -14,37 +14,37 @@ teststeps:
     output:
       - accessToken
 
--   name: 查看企业统计
-    api: api/app_api/company/statistics_api.yml
-    extract:
-      quarters: content.data.statistics
-      totalCount: content.data.statistics.totalCount
-    output:
-      - totalCount
-      - quarters
-    validate:
-      ####合伙人支出
-      - eq:
-            - ${get_statistics(careerDividend,businessDividend,developDividend,appDividend,$quarters)}
-            - 1950
-      ####订单金额
-      - eq:
-            - ${get_statistics(careerOrdersMoney,businessOrdersMoney,developOrdersMoney,appOrdersMoney,$quarters)}
-            - 21000
-
--   name: 查看企业合伙人列表
-    variables:
-      type1: 1
-      name1: '事业合伙'
-      type2: 2
-      name2: '业务合伙'
-      type3: 3
-      name3: '研发合伙'
-      type4: 4
-      name4: '业务-产品应用合伙'
-    api: api/app_api/company/partners_api.yml
-    validate:
-#      ###合伙人数
-      - length_equals:
-            - content.data.partners
-            - $totalCount
\ No newline at end of file
+#-   name: 查看企业统计
+#    api: api/app_api/company/statistics_api.yml
+#    extract:
+#      quarters: content.data.statistics
+#      totalCount: content.data.statistics.totalCount
+#    output:
+#      - totalCount
+#      - quarters
+#    validate:
+#      ####合伙人支出
+#      - eq:
+#            - ${get_statistics(careerDividend,businessDividend,developDividend,appDividend,$quarters)}
+#            - 1950
+#      ####订单金额
+#      - eq:
+#            - ${get_statistics(careerOrdersMoney,businessOrdersMoney,developOrdersMoney,appOrdersMoney,$quarters)}
+#            - 21000
+#
+#-   name: 查看企业合伙人列表
+#    variables:
+#      type1: 1
+#      name1: '事业合伙'
+#      type2: 2
+#      name2: '业务合伙'
+#      type3: 3
+#      name3: '研发合伙'
+#      type4: 4
+#      name4: '业务-产品应用合伙'
+#    api: api/app_api/company/partners_api.yml
+#    validate:
+##      ###合伙人数
+#      - length_equals:
+#            - content.data.partners
+#            - $totalCount
\ No newline at end of file

 config:
     name: 合伙人测试集
 testcases:
-
 -   name: start....初始化数据库和文件
     testcase: testcases/common/start_testcases.yml
-
+#
 #############################APP端合伙人开始################################
 -   name: DIVI001-事业-初始状态-统计值正确
     testcase: testcases/app/dividends/DIVI001_career_dividendslist_testcases.yml
@@ -23,7 +22,7 @@ testcases:
 
 -   name: DIVI006-累计实发订单列表不包含明日
     testcase: testcases/app/dividends/DIVI006_tomorrow_career_dividendslist_testcases.yml
-####################################APP端合伙人权限################################
+#####################################APP端合伙人权限################################
 -   name: COMM1-单个合伙人登录
     testcase: testcases/app/common/COMM1_app_partner_login_testcases.yml
 
@@ -35,12 +34,12 @@ testcases:
 
 -   name: COMM4-APP多公司高管登录
     testcase: testcases/app/common/COMM4_app_more_company_manager_login_testcases.yml
-####################################APP端合伙人结束################################
-####################################APP端高管开始################################
+#####################################APP端合伙人结束################################
+#####################################APP端高管开始################################
 -   name: COMP001-企业统计值正确
     testcase: testcases/app/company/COMP001_company_statistics_testcases.yml
 
 -   name: COMP002-按照类型过滤，查看合伙人列表，数据正确
     testcase: testcases/app/company/COMP002_company_partners_testcases.yml
-###############################APP端高管结束################################
-
+################################APP端高管结束################################
+#

+config:
+    name: 合伙人测试集
+testcases:
+
+-   name: start....初始化数据库和文件
+    testcase: testcases/common/start_testcases.yml
+
+############################分红管理模块开始#################################
+-   name: DIV001-分红列表-数据源来自于实发订单
+    testcase: testcases/dividends/DIV001_dividendslist_testcases.yml
+
+#-   name: DIV002-分红列表-数据源不来自于意向订单
+#    testcase: testcases/dividends/DIV002_dividendslist_testcases.yml
+
+#-   name: DIV003-分红管理-初始状态-各个值计算正确（旧接口）
+#    testcase: testcases/dividends/DIV003_dividends_cal_testcases.yml
+
+-   name: DIV003_1-分红管理-初始状态-各个值计算正确
+    testcase: testcases/dividends/DIV003_1_dividends_cal_testcases.yml
+
+#-   name: DIV004-分红管理-调整数量由100改为50-各个值计算正确（旧接口）
+#    testcase: testcases/dividends/DIV004_dividends_editnum_testcases.yml
+
+-   name: DIV004_1-分红管理-调整数量由100改为50-各个值计算正确
+    testcase: testcases/dividends/DIV004_1_dividends_editnum_testcases.yml
+
+#-   name: DIV005-分红管理-调整数量由100改为50-更改支付状态-各个值计算正确（旧接口）
+#    testcase: testcases/dividends/DIV005_dividends_edit_num_pay_testcases.yml
+
+#-   name: DIV006-分红管理-已支付订单数量减少（旧接口）
+#    testcase: testcases/dividends/DIV006_dividends_edit_num_testcases.yml
+
+-   name: DIV007-分红管理-产品1支付分红成功，数据正确
+    testcase: testcases/dividends/DIV007_dividends_payDividends_testcases.yml
+
+-   name: DIV008-分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确
+    testcase: testcases/dividends/DIV008_dividends_payDividends_editnum_testcases.yml
+
+-   name: DIV009-分红管理-自建订单调整分红比例，系统提示‘操作失败’
+    testcase: testcases/dividends/DIV009_dividends_editnum_testcases.yml
+
+-   name: DIV010-分红管理-批量支付分红成功，数据正确
+    testcase: testcases/dividends/DIV010_dividends_payDividends_batch_testcases.yml
+############################分红管理模块结束##################################
+
+-   name: ACT001-实际订单-各个值计算正确
+    testcase: testcases/order/actual/ACT001_actual_detail_testcases.yml
+
+-   name: ACT002-删除订单成功
+    testcase: testcases/order/actual/ACT002_actual_del_testcases.yml
+
+-   name: ACT003-实际订单导出
+    testcase: testcases/order/actual/ACT003_actual_excel_testcases.yml
+
+#-   name: PUR001-意向订单-各个值计算正确（已废弃）
+#    testcase: testcases/order/purpose/PUR001_pur_detail_testcases.yml
+#
+#-   name: PUR002-意向订单-发货（已废弃）
+#    testcase: testcases/order/purpose/PUR002_pur_sendout_testcases.yml
+
+-   name: ACT004-订单唯一性校验：新增订单号重复的实际订单，可以新增成功
+    testcase: testcases/order/actual/ACT004_actual_ordercode_repeat_testcases.yml
+
+-   name: ACT005-订单唯一性校验：新增发货单号重复的实际订单，可以新增成功
+    testcase: testcases/order/actual/ACT005_actual_delivery_repeat_testcases.yml
+
+-   name: ACT006-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型重复的实际订单，但是产品名称不同，可以新增成功
+    testcase: testcases/order/actual/ACT006_actual_ordercode_delivery_repeat_testcases.yml
+
+-   name: ACT007-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型+产品名称重复的实际订单，不可以新增成功
+    testcase: testcases/order/actual/ACT007_actual_ordercode_delivery_product_repeat_testcases.yml
+
+-   name: ACT008-订单唯一性校验：只有订单号不一致，可以新增成功
+    testcase: testcases/order/actual/ACT008_actual_repeat1_testcases.yml
+
+-   name: ACT009-订单唯一性校验：只有发货单号不一致，可以新增成功
+    testcase: testcases/order/actual/ACT009_actual_repeat2_testcases.yml
+
+-   name: ACT010-订单唯一性校验：合伙人类型不一致，可以新增成功
+    testcase: testcases/order/actual/ACT010_actual_repeat3_testcases.yml
+
+#################################合伙人管理开始################################
+-   name: PARTNERS001-查看合伙人列表，数据正确
+    testcase: testcases/partners/PARTNERS001_list_partner_testcases.yml
+
+-   name: PARTNERS002-合伙人查询无数据时，返回正确
+    testcase: testcases/partners/PARTNERS002_list_partner_search_null_testcases.yml
+
+-   name: PARTNERS003-合伙人批量禁用
+    testcase: testcases/partners/PARTNERS003_list_partner_batchDisabled_testcases.yml
+
+-   name: PARTNERS004-合伙人批量启用
+    testcase: testcases/partners/PARTNERS004_list_partner_batchDisabled_testcases.yml
+
+-   name: PARTNERS005-合伙人增删改查流程
+    testcase: testcases/partners/PARTNERS005_partner_testcases.yml
+
+-   name: PARTNERS006-有业务数据的合伙人不能删除
+    testcase: testcases/partners/PARTNERS006_partner_remove.yml
+
+#################################合伙人管理结束################################
+#################################成员管理开始################################
+-   name: ADMIN001-查看所有成员列表，数据正确
+    testcase: testcases/admin/ADMIN001_list_admin_testcases.yml
+
+-   name: ADMIN002-查看成员列表-空列表返回正确
+    testcase: testcases/admin/ADMIN002_list_admin_search_null_testcases.yml
+
+-   name: ADMIN003-查看权限
+    testcase: testcases/admin/ADMIN003_list_admin_permission_testcases.yml
+
+-   name: ADMIN004-管理员高管设置是否正确
+    testcase: testcases/admin/ADMIN004_admin_isSenior_testcases.yml
+#################################成员管理结束################################
\ No newline at end of file

@@ -79,7 +79,7 @@ testcases:
 -   name: ACT010-订单唯一性校验：合伙人类型不一致，可以新增成功
     testcase: testcases/order/actual/ACT010_actual_repeat3_testcases.yml
 
-#################################合伙人管理开始################################
+################################合伙人管理开始################################
 -   name: PARTNERS001-查看合伙人列表，数据正确
     testcase: testcases/partners/PARTNERS001_list_partner_testcases.yml