saleDate字段参数化及case合并调整

@@ -13,9 +13,7 @@ base_business_admin=http://suplus-business-admin-gateway-test.fjmaimaimai.com
 companyId=214
 adminphone=19911111111
 partnerphone=15510101010
-companyId_app=366
-adminphone_app=19990000000
-partnerId_app = 1040
-visitorphone = 19990000011
-managerphone = 19990000012
+partnerId = 1047
+visitorphone = 15510101011
+managerphone = 19911110001
 id = 358
\ No newline at end of file

@@ -7,7 +7,7 @@ variables:
     sign: ${make_sign($currtime, $uuid, $var_access_token)}
     startTime: 0
     endTime: ${get_nowTimestamp_1()}
-    partnerId: ${ENV(partnerId_app)}
+    partnerId: ${ENV(partnerId)}
     ###明细类型
     detailAction: ${convert_to_int($detailAction)}
     msg: 成功

@@ -4,7 +4,7 @@ variables:
     currtime: ${make_time()}
     uuid: ${make_uuid()}
     access_token: ''
-    cid: ${ENV(companyId_app)}
+    cid: ${ENV(companyId)}
     sign: ${make_sign($currtime, $uuid, $access_token)}
     clientId: pdf233Znkjo
 request:

@@ -5,7 +5,7 @@ variables:
     uuid: ${make_uuid()}
     var_access_token: $accessToken
     sign: ${make_sign($currtime, $uuid, $var_access_token)}
-    partnerId: ${ENV(partnerId_app)}
+    partnerId: ${ENV(partnerId)}
     msg: 成功
 request:
     headers:

-name: 实际订单新增
-base_url: ${ENV(base_manager_url)}
-variables:
-    partnerID: ${ENV(partnerId_app)}
-    commissionProportion: 0
-    orderNum1: 100
-    univalence: 10
-    partnerRatio: 1.2
-    orderNum2: 200
-
-teardown_hooks:
-    - ${sleep(2)}
-request:
-    headers:
-        Content-Type: application/json;charset=utf-8
-        User-Agent: okhttp/3.12.3
-        Authorization: Bearer ${get_m_accesstoken()}
-    json:
-        orderId: $partnerCategory-实发订单号${get_stringcode(5)}
-        shipmentsId: $partnerCategory-实发订单发货单号${get_stringcode(5)}
-        partnerID: ${convert_to_int($partnerID)}
-        partnerCategoryId: $partnerCategoryId
-        buyer: '客户名称${get_stringcode(5)}'
-        orderDist: '订单区域${get_stringcode(5)}'
-        commissionProportion: $commissionProportion
-        saleDate: $saleDate
-        product:
-        -   productName: 产品名称${get_stringcode(5)}
-            orderNum: $orderNum1
-            univalence: $univalence
-            partnerRatio: $partnerRatio
-        -   productName: 产品名称${get_stringcode(5)}
-            orderNum: $orderNum2
-            univalence: $univalence
-            partnerRatio: $partnerRatio
-    method: POST
-    url: /v1/order/actual/update
-validate:
-    -   eq:
-        - content.msg
-        - ok

 name: 实际订单新增
 base_url: ${ENV(base_manager_url)}
 variables:
-    partnerID: 1047
+    partnerID: ${ENV(partnerId)}
     commissionProportion: 5
     orderNum1: 100
     univalence: 10
@@ -23,12 +23,12 @@ request:
     json:
         orderId: $orderId
         shipmentsId: $shipmentsId
-        partnerID: $partnerID
+        partnerID: ${convert_to_int($partnerID)}
         partnerCategoryId: $partnerCategoryId
         buyer: '客户名称${get_stringcode(5)}'
         orderDist: '订单区域${get_stringcode(5)}'
         commissionProportion: $commissionProportion
-        saleDate: '2020-10-10 00:00:00'
+        saleDate: $saleDate
         product:
         -   productName: $productName
             orderNum: $orderNum1

@@ -22,7 +22,7 @@ request:
         area: '合伙人所属区域${get_stringcode(5)}'
         account: 155${get_randint(10000000,99999999)}
         state: 1
-        cooperationTime: ${get_today()}
+        cooperationTime: ${get_now()}
         salesmanName: '业务员姓名${get_stringcode(5)}'
         phone: 155${get_randint(10000000,99999999)}
         remark: '系统自动添加'

@@ -17,7 +17,7 @@ request:
         area: '合伙人所属区域修改${get_stringcode(5)}'
         account: 155${get_randint(10000000,99999999)}
         state: 0
-        cooperationTime: ${get_today()}
+        cooperationTime: ${get_now()}
         salesmanName: '业务员姓名修改${get_stringcode(5)}'
         phone: 155${get_randint(10000000,99999999)}
         id: $id

-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MTM5MzkzMjgsImlhdCI6MTYxMzg5NjEyOCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTYxMzg5NjEyOCwidWlkIjozMjQ3MzY2MDExOTEzMjE2LCJjb21wYW55SWQiOjM2Nn0.08OJFyJ2zo-iwyV5YbE_9BN17C0iklZ8Dv849c1Nhfs
\ No newline at end of file
+eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MTQwODk0NjMsImlhdCI6MTYxNDA0NjI2MywiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTYxNDA0NjI2MywidWlkIjozMjQyMzEyOTU1MTM1NzQ0LCJjb21wYW55SWQiOjIxNH0.g72J0Cyp-EYq9iWlNWW7WWWmkyr63ojR90T2G_F04Ts
\ No newline at end of file

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

@@ -3,9 +3,8 @@ import string
 import os
 import time,datetime
 from urllib import parse
-
+from helpfunc.pg_app_db_func import *
 from helpfunc.login_func import *
-from helpfunc.pg_db_func import *
 from helpfunc.other_func import *
 # from helpfunc.db_func import *
 from helpfunc.statistics_func import *
@@ -28,28 +27,33 @@ def convert_to_int(value):
     return int(value)
 
 
-def get_nowtime():
-    return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time()))
-
-def get_today():
+def get_now():
     now_today = datetime.datetime.now()
     str_time = now_today.strftime("%Y-%m-%d")
     return str_time
 
+def get_today():
+    now_today = datetime.datetime.now()
+    str_time = now_today.strftime('%Y-%m-%d %H:%M:%S')
+    return str_time
 def get_tomorrow():
-    tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
+    tomorrow = (date.today() + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')
     return tomorrow
-#获取今天时间并转str
-def today_time_str():
-    curr_time = datetime.datetime.now()
-    time_str = datetime.datetime.strftime(curr_time,'%Y-%m-%d %H:%M:%S')
-    return time_str
+
+# # #获取今天时间并转str
+# def today_time_str():
+#     curr_time = datetime.datetime.now()
+#     zeroToday = curr_time - datetime.timedelta(hours=curr_time.hour, minutes=curr_time.minute, seconds=curr_time.second,
+#                                          microseconds=curr_time.microsecond)
+#     time_str = datetime.datetime.strftime(zeroToday,'%Y-%m-%d %H:%M:%S')
+#     return time_str
+# print(today_time_str())
 #获取明天时间并转str
-def tomorrow_time_str():
-    curr_time = datetime.datetime.now()
-    tomorrow_time = curr_time + datetime.timedelta(days=1)
-    time_str = datetime.datetime.strftime(tomorrow_time,'%Y-%m-%d %H:%M:%S')
-    return time_str
+# def tomorrow_time_str():
+#     curr_time = datetime.datetime.now()
+#     tomorrow_time = curr_time + datetime.timedelta(days=1)
+#     time_str = datetime.datetime.strftime(tomorrow_time,'%Y-%m-%d %H:%M:%S')
+#     return time_str
 #获取昨天时间并转str
 def yes_time_str():
     curr_time = datetime.datetime.now()
@@ -110,6 +114,7 @@ list_time = getMonth()
 ###获取当月1号时间戳
 def get_starTimestamp():
     return int(time.mktime(time.strptime(list_time[0], '%Y-%m-%d %H:%M:%S'))*1000)
+
 ###获取当月最后一天时间戳
 def get_endTimestamp():
     return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
@@ -168,16 +173,6 @@ def get_partnerCategory(n):
 def get_randint(value1, value2):
     return randint(value1, value2)
 
-
-def convert_to_string(value):
-    return str(value)
-
-
-def convert_to_int(value):
-    return int(value)
-
-
-
 #获取季度对应的月份
 def getql():
     today=datetime.date.today()

@@ -7,44 +7,37 @@ import psycopg2
 from datetime import date, timedelta
 import datetime,time
 
-def get_today():
-    now_today = datetime.datetime.now()
-    str_time = now_today.strftime("%Y-%m-%d")
-    return str_time
+# def getMonth():
+#     year = str(datetime.date.today().year)
+#     d = datetime.date.today()
+#     month = '%02d' % d.month
+#     if month in ['01', '03', '05', '07', '08', '10', '12']:
+#         s = str("-01 00:00:00")
+#         e = str("-31 23:59:59")
+#         startTime = year + "-" + str(month) + s
+#         endTime = year + "-" + str(month) + e
+#         list = [startTime, endTime]
+#         return list
+#     elif month == '02':
+#         s = str("-01 00:00:00")
+#         e = str("-28 23:59:59")
+#         startTime = year + "-" + str(month) + s
+#         endTime = year + "-" + str(month) + e
+#         list = [startTime, endTime]
+#         return list
+#     else:
+#         s = str("-01 00:00:00")
+#         e = str("-30 23:59:59")
+#         startTime = year + "-" + str(month) + s
+#         endTime = year + "-" + str(month) + e
+#         list = [startTime, endTime]
+#         return list
+# list_time = getMonth()
+# def get_starTimestamp():
+#     return list_time[0]
+# def get_endTimestamp():
+#     return list_time[1]
 
-def get_tomorrow():
-    tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
-    return tomorrow
-def getMonth():
-    year = str(datetime.date.today().year)
-    d = datetime.date.today()
-    month = '%02d' % d.month
-    if month in ['01', '03', '05', '07', '08', '10', '12']:
-        s = str("-01 00:00:00")
-        e = str("-31 23:59:59")
-        startTime = year + "-" + str(month) + s
-        endTime = year + "-" + str(month) + e
-        list = [startTime, endTime]
-        return list
-    elif month == '02':
-        s = str("-01 00:00:00")
-        e = str("-28 23:59:59")
-        startTime = year + "-" + str(month) + s
-        endTime = year + "-" + str(month) + e
-        list = [startTime, endTime]
-        return list
-    else:
-        s = str("-01 00:00:00")
-        e = str("-30 23:59:59")
-        startTime = year + "-" + str(month) + s
-        endTime = year + "-" + str(month) + e
-        list = [startTime, endTime]
-        return list
-list_time = getMonth()
-def get_starTimestamp():
-    return list_time[0]
-def get_endTimestamp():
-    return list_time[1]
 # 获得连接
 def GetConnect():
     conn = False
@@ -57,3 +50,28 @@ def GetConnect():
     except Exception as err:
         print("连接数据库失败，%s" % err)
     return conn
+
+# 清除数据
+def setup_hook_clean_db(companyid):
+    """
+    初始化时清理数据库中对应公司的历史数据
+    :return:
+    """
+    db = GetConnect()
+    cursor = db.cursor()
+    companyid = str(companyid)
+
+    try:
+        cursor.execute('delete from order_base where company_id=' + 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:
+        # 发生错误时回滚
+        print("this is:", err)
+        db.rollback()
+    db.close()
+

-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-# Date: 2020/7/12 16:27
-# @Author:bxh
-# @file: pg_db_func.py
-import psycopg2
-
-
-# 获得连接
-def GetConnect():
-    conn = False
-    try:
-        conn = psycopg2.connect(database="partner_test",
-                                user="bianxinhua",
-                                password="bianxinhua_123",
-                                host="114.55.200.59",
-                                port="31543")
-    except Exception as err:
-        print("连接数据库失败，%s" % err)
-    return conn
-
-
-# 清除数据
-def setup_hook_clean_db(companyid):
-    """
-    初始化时清理数据库中对应公司的历史数据
-    :return:
-    """
-    db = GetConnect()
-    cursor = db.cursor()
-    companyid = str(companyid)
-
-    try:
-        cursor.execute('delete from order_base where company_id=' + companyid)
-        db.commit()
-        cursor.execute('delete from order_good where company_id=' + companyid)
-        db.commit()
-        print("delete OK")
-    except Exception as err:
-        # 发生错误时回滚
-        print("this is:", err)
-        db.rollback()
-    db.close()
-

@@ -28,6 +28,7 @@ def get_statistics(*args_v):
 def statistics_func(keys,*args_v):
     # print("====================args_v===============================")
     # print(args_v)
+    # print(keys)
     value = []
     num = 0
     for i in range(len(args_v)):
@@ -44,6 +45,8 @@ def statistics_func(keys,*args_v):
     # print('num=',num)
     return num
 
+
+
 #统计订单金额
 def statistics_actual_func(keys,*args_v):
     # print("====================args_v===============================")

 {
     "testcase":[
-        "testcases/dividends/DIV001_dividendslist_testcases.yml"
+        "testcases/partners/PARTNERS006_partner_remove.yml"
     ]
 }
\ No newline at end of file

@@ -3,7 +3,7 @@ config:
     base_url: ${ENV(base_url)}
     variables:
         phone: ${ENV(managerphone)}
-        id: ${ENV(companyId_app)}
+        id: ${ENV(companyId)}
         msg: '成功'
 #
 teststeps:

@@ -2,8 +2,8 @@ config:
     name: APP多公司高管登录
     base_url: ${ENV(base_url)}
     variables:
-        phone: ${ENV(adminphone_app)}
-        id: ${ENV(companyId_app)}
+        phone: ${ENV(adminphone)}
+        id: ${ENV(companyId)}
         msg: '成功'
 #
 teststeps:
@@ -13,7 +13,7 @@ teststeps:
     validate:
         - length_equals:
             - content.data.center.partner.companys
-            - 3
+            - 0
         - length_equals:
               - content.data.center.manager
               - 3

@@ -2,7 +2,7 @@ config:
     name: APP登录用例
     base_url: ${ENV(base_url)}
     variables:
-        phone: ${ENV(adminphone_app)}
+        phone: ${ENV(partnerphone)}
         msg: '成功'
     output:
       - accessToken

 config:
     name: COMP001-企业统计值正确
     base_url: ${ENV(base_manager_url)}
-
+    variables:
+      phone: ${ENV(adminphone)}
 
 teststeps:
 
--   name: $phone 登录天联共创app端系统
+-   name:  登录天联共创app端系统
      ####身份类型 1：合伙人  2：高管
     variables:
       idType: ${convert_to_int(2)}
@@ -15,7 +16,6 @@ teststeps:
 
 -   name: 查看企业统计
     api: api/app_api/company/statistics_api.yml
-
     extract:
       quarters: content.data.statistics
       totalCount: content.data.statistics.totalCount
@@ -26,11 +26,11 @@ teststeps:
       ####合伙人支出
       - eq:
             - ${get_statistics(careerDividend,businessDividend,developDividend,appDividend,$quarters)}
-            - 2136
+            - 1950
       ####订单金额
       - eq:
             - ${get_statistics(careerOrdersMoney,businessOrdersMoney,developOrdersMoney,appOrdersMoney,$quarters)}
-            - 25500
+            - 21000
 
 -   name: 查看企业合伙人列表
     variables:

 config:
     name: COMP001-按照类型过滤，查看合伙人列表，数据正确
     base_url: ${ENV(base_manager_url)}
-
+    variables:
+      phone: ${ENV(adminphone)}
 
 teststeps:
 
--   name: $phone 登录天联共创app端系统
+-   name: 登录天联共创app端系统
      ####身份类型 1：合伙人  2：高管
     variables:
       idType: ${convert_to_int(2)}

 config:
     name: DIVI001-事业-初始状态-统计值正确
     base_url: ${ENV(base_manager_url)}
-#    variables:
+
 #      partnerCategoryId: 1
 #      orderType: 1
 
 
 teststeps:
 -   name: 登录天联共创管理后台系统-分红列表-数据源来自于实发订单(业务合伙)
-    testcase: testcases/dividends/DIV001_app_dividendslist_testcases.yml
+    variables:
+      saleDate: ${get_today()}
+      partnerCategoryId: 2
+    testcase: testcases/dividends/DIV001_dividendslist_testcases.yml
 
 -   name: 登录天联共创管理后台系统-分红管理-初始状态-各个值计算正确
-    testcase: testcases/dividends/DIV003_1_app_dividends_cal_testcases.yml
-#
+    variables:
+      partnerCategoryId: 1
+    testcase: testcases/dividends/DIV003_1_dividends_cal_testcases.yml
+
 -   name: 查看实际订单列表
     api: api/m_api/actual/m_order_actual_list_api.yml
     extract:
@@ -22,7 +27,7 @@ teststeps:
     output:
       - career_actual_list
       - career_partnerCategory
-#
+
 -   name: 查看事业分红列表
     variables:
       partnerCategoryId: 1
@@ -80,7 +85,7 @@ teststeps:
     testcase: testcases/app/common/app_login_testcases.yml
     output:
       - accessToken
-#
+
 -   name: 查看分红统计
     api: api/app_api/dividend/statistics_api.yml
     extract:
@@ -116,15 +121,15 @@ teststeps:
 -   name: 查看订单统计
     api: api/app_api/order/statistics_api.yml
     validate:
-#      ###今日新增实发订单
+      ###今日新增实发订单
       - eq:
             - content.data.career.todayRealQuantity
             - $career_totalRow
-#      ####今日新增实发订单金额
+      ####今日新增实发订单金额
       - eq:
             - content.data.career.todayRealMoney
             - ${statistics_actual_func($career_partnerCategory,$career_actual_list)}
-#      ###累计实发订单
+      ###累计实发订单
       - eq:
             - content.data.career.cumulativeQuantity
             - $career_totalRow

@@ -3,18 +3,22 @@ config:
     base_url: ${ENV(base_manager_url)}
 
 
+
 teststeps:
 -   name: 登录天联共创管理后台系统-分红管理-调整数量由100改为50-各个值计算正确
-    testcase: testcases/dividends/DIV004_1_app_dividends_editnum_testcases.yml
+    variables:
+      partnerCategoryId: 1
+    testcase: testcases/dividends/DIV004_1_dividends_editnum_testcases.yml
 
 -   name: 登录天联共创管理后台系统-分红管理-产品1支付分红成功，数据正确
-    testcase: testcases/dividends/DIV007_app_dividends_payDividends_testcases.yml
+    variables:
+      partnerCategoryId: 1
+    testcase: testcases/dividends/DIV007_dividends_payDividends_testcases.yml
 
 -   name: 登录天联共创管理后台系统--分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确
-    testcase: testcases/dividends/DIV008_app_dividends_payDividends_editnum_testcases.yml
-
--   name: 登录天联共创管理后台系统--分红管理-批量支付分红成功，数据正确
-    testcase: testcases/dividends/DIV010_app_dividends_payDividends_batch_testcases.yml
+    variables:
+      partnerCategoryId: 1
+    testcase: testcases/dividends/DIV008_dividends_payDividends_editnum_testcases.yml
 
 -   name: 查看实际订单列表
     api: api/m_api/actual/m_order_actual_list_api.yml
@@ -51,7 +55,7 @@ teststeps:
       business_lists: content.data.gridResult.lists
     output:
       - business_lists
-#
+
 -   name: 查看研发分红列表
     variables:
       partnerCategoryId: 3
@@ -63,7 +67,7 @@ teststeps:
       develop_lists: content.data.gridResult.lists
     output:
       - develop_lists
-#
+
 -   name: 查看业务-产品应用分红列表
     variables:
       partnerCategoryId: 4
@@ -95,7 +99,7 @@ teststeps:
       - eq:
             - content.data.statistics.receivable
             - ${statistics_func(dividendsReceivable,$career_lists,$business_lists,$develop_lists,$applicationOrders_lists)}
-###      ####累计所有年份已收分红
+      ####累计所有年份已收分红
       - eq:
             - content.data.statistics.received
             - ${statistics_func(receiveDividends,$career_lists,$business_lists,$develop_lists,$applicationOrders_lists)}

@@ -6,8 +6,8 @@ config:
 teststeps:
 -   name: 登录天联共创管理后台系统
     variables:
-      phone: ${ENV(adminphone_app)}
-    testcase: testcases/common/m_app_login_testcases.yml
+      phone: ${ENV(adminphone)}
+    testcase: testcases/common/m_login_testcases.yml
 
 -   name: 查看事业分红列表
     variables:

@@ -4,7 +4,7 @@ config:
 
 
 teststeps:
--   name: $phone 登录天联共创app端系统
+-   name: 登录天联共创app端系统
     ####身份类型 1：合伙人  2：高管
     variables:
       idType: ${convert_to_int(1)}

@@ -6,8 +6,8 @@ teststeps:
 
 -   name: 登录天联共创管理后台系统
     variables:
-        phone: ${ENV(adminphone_app)}
-    testcase: testcases/common/m_app_login_testcases.yml
+        phone: ${ENV(adminphone)}
+    testcase: testcases/common/m_login_testcases.yml
 
 -   name: 登录天联共创管理后台系统-查看事业分红列表
     variables:

@@ -2,13 +2,13 @@ config:
     name: COM001-新增明日实际订单
     base_url: ${ENV(base_manager_url)}
     variables:
-      partnerID: ${ENV(partnerId_app)}
+      partnerID: ${ENV(partnerId)}
       commissionProportion: 0
       orderNum1: 100
       univalence: 15
       partnerRatio: 10
       orderNum2: 200
-      partnerCategory: ${get_partnerCategory(1)}
+#      partnerCategory: ${get_partnerCategory(1)}
       partnerCategoryId: 1
     output:
       - actual_saleDate
@@ -20,13 +20,13 @@ config:
 teststeps:
 -   name: 登录系统
     variables:
-      phone: ${ENV(adminphone_app)}
-    testcase: testcases/common/m_app_login_testcases.yml
+      phone: ${ENV(adminphone)}
+    testcase: testcases/common/m_login_testcases.yml
 
 -   name: 新增明日实发订单
     variables:
-      saleDate: ${tomorrow_time_str()}
-    api: api/m_api/actual/m_add_app_order_actual_api.yml
+      saleDate: ${get_tomorrow()}
+    api: api/m_api/actual/m_add_order_actual_api.yml
     extract:
       - orderid: content.data.id
     validate:

@@ -2,7 +2,7 @@ config:
     name: COM001-新增实际订单
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -22,6 +22,8 @@ teststeps:
     testcase: testcases/common/m_login_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+      saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     extract:
       - orderid: content.data.id

-config:
-    name: COM001-新增实际订单
-    base_url: ${ENV(base_manager_url)}
-    variables:
-        partnerID: ${ENV(partnerId_app)}
-        commissionProportion: 5
-        orderNum1: 100
-        univalence: 15
-        partnerRatio: 10
-        orderNum2: 200
-#        partnerRatio2: 20
-    output:
-      - actual_id
-      - product_id_1
-      - product_id_2
-
-
-teststeps:
--   name: $phone 登录系统
-    variables:
-      phone: ${ENV(adminphone_app)}
-    testcase: testcases/common/m_app_login_testcases.yml
-
--   name: 新增实发订单
-    api: api/m_api/actual/m_add_app_order_actual_api.yml
-    extract:
-      - orderid: content.data.id
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 查看实际订单列表
-    api: api/m_api/actual/m_order_actual_list_api.yml
-    extract:
-      - actual_id: content.data.gridResult.lists.0.id
-    validate:
-        - eq:
-          - content.data.gridResult.lists.0.id
-          - ${convert_to_string($orderid)}
-        - eq:
-            - content.msg
-            - ok
-
--   name: 查看实际订单详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/actual/m_order_actual_detail_api.yml
-    extract:
-      - product_id_1: content.data.product.0.id
-      - product_id_2: content.data.product.1.id
-    validate:
-        - eq:
-            - content.data.orderNumCount
-            - ${add($orderNum1,$orderNum2)}
-        - eq:
-            - content.data.orderAmountAdjustmentCount
-            - ${cal_orderPrice($univalence, $orderNum1, $orderNum2)}
-        - eq:
-            - content.data.product.0.orderPrice
-            - ${cal_orderPrice($univalence, $orderNum1)}
-        - eq:
-            - content.data.product.1.orderPrice
-            - ${cal_orderPrice($univalence, $orderNum2)}
\ No newline at end of file

-config:
-    name: 管理后台登陆
-#    base_url: ${ENV(base_manager_url)}
-    variables:
-        phone: ${ENV(adminphone_app)}
-
-teststeps:
--   name: $phone 登录企业平台
-    api: api/m_api/m_login_api/m_pwdLogin_api.yml
-    extract:
-        pwdLogintoken: content.data.access.token
-    validate:
-        - eq:
-              - content.msg
-              - ok
-
--   name: 选择公司登录
-    variables:
-      companyId: ${ENV(companyId_app)}
-    api: api/m_api/m_login_api/m_anonymousLogin_api.yml
-    extract:
-        anonymousLogintoken: content.data.access.token
-    validate:
-        - eq:
-              - content.msg
-              - ok
-#
--   name: 单点登录，获取secret用于登录子系统
-    api: api/m_api/m_login_api/m_getSingleLoginMenus_api.yml
-    extract:
-        url: content.data.list.1.url
-    validate:
-        - eq:
-              - content.msg
-              - ok
-
--   name: 使用secret登录合伙人系统
-    api: api/m_api/m_login_api/m_login_api.yml
-    teardown_hooks:
-      - ${teardown_hook_get_m_accesstoken($response)}
-    validate:
-        - eq:
-              - content.msg
-              - ok
\ No newline at end of file

-config:
-    name: start_testcases
-    #清理数据
-    setup_hooks:
-        - ${setup_hook_clean_db(366)}
-        - ${setup_hook_clean_orderid()}
-    teardown_hooks:
-        - ${sleep(2)}
-
-teststeps:
--   name: start_testcases
-    api: api/app_api/login/gettimestamp_api.yml
\ No newline at end of file

-config:
-    name: DIV001-分红列表-数据源来自于实发订单
-    base_url: ${ENV(base_manager_url)}
-    variables:
-        orderType: null
-        partnerCategoryId: 2
-        searchText: ''
-        createTime: []
-
-teststeps:
--   name: 登录系统
-    variables:
-      phone: ${ENV(adminphone_app)}
-    testcase: testcases/common/m_app_login_testcases.yml
-
--   name: 查看业务分红列表
-
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    extract:
-      - num1: content.data.gridResult.totalRow
-
--   name: 新增实发订单(业务订单)
-    variables:
-      partnerCategory: ${get_partnerCategory(2)}
-      partnerCategoryId: 2
-      saleDate: ${today_time_str()}
-    api: api/m_api/actual/m_add_app_order_actual_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-#
--   name: 查看业务分红列表
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-        - eq:
-          - content.data.gridResult.totalRow
-          - ${add($num1,1)}
\ No newline at end of file

@@ -14,6 +14,8 @@ teststeps:
       - num1: content.data.gridResult.totalRow
 
 -   name: 新增实发订单
+    variables:
+      saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

-config:
-    name: DIV003_1-分红管理-初始状态-各个值计算正确
-    base_url: ${ENV(base_manager_url)}
-    variables:
-      partnerID: ${ENV(partnerId_app)}
-      commissionProportion: 5
-      orderNum1: 100
-      univalence: 15
-      partnerRatio: 10
-      orderNum2: 200
-      partnerCategory: ${get_partnerCategory(1)}
-      partnerCategoryId: 1
-      saleDate: ${today_time_str()}
-#      partnerRatio2: 20
-
-teststeps:
--   name: 新增实际订单
-
-    testcase: testcases/common/COM001_app_actual_add_testcases.yml
-    output:
-      - actual_id
-
--   name: 查看该订单的分红详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/dividends/m_dividends_detail_api.yml
-    validate:
-        - eq:
-          - content.data.order.orderId
-          - $actual_id
-        #####合伙人应收分红总额
-        - eq:
-              - content.data.order.partnerDividends
-              - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}
-        #####合伙人已收分红总额
-        - eq:
-            - content.data.order.receivedDividends
-            - ${convert_to_string(0)}
-        #####合伙人未收分红总额
-        - eq:
-            - content.data.order.notReceivedDividend
-            - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}
-        #####合伙人分红支出总额
-        - eq:
-            - content.data.order.dividendSpending
-            - ${convert_to_string(0)}
-        #####订单类型
-        - eq:
-            - content.data.order.orderType
-            - 1
-        #####产品1总金额
-        - eq:
-            - content.data.product.detail.0.commodityPrice
-            - 1500
-      #####产品1总数量
-        - eq:
-            - content.data.product.detail.0.orderNum
-            - $orderNum1
-        #####产品1应收分红
-        - eq:
-              - content.data.product.detail.0.partnerDividends
-              - ${cal_Ratio($partnerRatio, $univalence, $orderNum1)}
-        #####产品1分红状态
-        - eq:
-            - content.data.product.detail.0.paymentStatus
-            - 1
-        #####产品2总金额
-        - eq:
-            - content.data.product.detail.1.commodityPrice
-            - 3000
-            #####产品2总数量
-        - eq:
-            - content.data.product.detail.1.orderNum
-            - $orderNum2
-        #####产品2应收分红
-        - eq:
-              - content.data.product.detail.1.partnerDividends
-              - ${cal_Ratio($partnerRatio, $univalence, $orderNum2)}
-        #####产品2分红状态
-        - eq:
-            - content.data.product.detail.1.paymentStatus
-            - 1
-        #####订单总数量
-        - eq:
-            - content.data.product.orderNumCount
-            - ${add($orderNum1,$orderNum2)}
-        #####总金额
-        - eq:
-            - content.data.product.orderAmountAdjustmentCount
-            - ${cal_orderPrice($univalence, $orderNum1, $orderNum2)}
-        ####合伙人应收分红合计
-        - eq:
-            - content.data.product.partnerDividendsCount
-            - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}
\ No newline at end of file

@@ -2,7 +2,7 @@ config:
     name: DIV003_1-分红管理-初始状态-各个值计算正确
     base_url: ${ENV(base_manager_url)}
     variables:
-      partnerID: 1047
+      partnerID: ${ENV(partnerId)}
       commissionProportion: 5
       orderNum1: 100
       univalence: 15

-config:
-    name: DIV004_1-分红管理-调整数量由100改为50-各个值计算正确
-    base_url: ${ENV(base_manager_url)}
-    variables:
-      goodNumber: 50
-      partnerCategory: ${get_partnerCategory(1)}
-      partnerCategoryId: 1
-      saleDate: ${today_time_str()}
-      orderType: 1
-      createTime: []
-
-
-teststeps:
--   name: 新增实际订单
-    testcase: testcases/common/COM001_app_actual_add_testcases.yml
-    output:
-      - actual_id
-      - product_id_1
-      - product_id_2
-
--   name: 编辑分红-数量由100调整为50
-    variables:
-        orderId: ${convert_to_string($actual_id)}
-        state: 1
-        partnerBonusPercent: 10
-        reason: '修改原因${get_stringcode(5)}'
-        productId: ${convert_to_string($product_id_1)}
-    api: api/m_api/dividends/m_dividends_modify_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 查看分红列表
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    validate:
-      #####等待支付状态=1
-      - eq:
-          - content.data.gridResult.lists.0.stateOfPayment
-          - 1
-      ######应收分红
-      - eq:
-          - content.data.gridResult.lists.0.dividendsReceivable
-          - ${convert_to_string(375)}
-      #####已收分红
-      - eq:
-          - content.data.gridResult.lists.0.receiveDividends
-          - ${convert_to_string(0)}
-      #####未收分红
-      - eq:
-          - content.data.gridResult.lists.0.uncollectedDividends
-          - ${convert_to_string(375)}
-      #####分红支出
-      - eq:
-          - content.data.gridResult.lists.0.dividendSpending
-          - ${convert_to_string(0)}
-
-
--   name: 查看该订单的分红详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/dividends/m_dividends_detail_api.yml
-    validate:
-        - eq:
-            - content.data.order.orderId
-            - $actual_id
-        #####合伙人未收分红总额
-        - eq:
-            - content.data.order.notReceivedDividend
-            - ${convert_to_string(375)}
-        #####合伙人已收分红总额
-        - eq:
-          - content.data.order.receivedDividends
-          - ${convert_to_string(0)}
-      #####合伙人应收分红总额
-        - eq:
-            - content.data.order.partnerDividends
-            - ${convert_to_string(375)}
-      #####合伙人分红支出总额
-        - eq:
-            - content.data.order.dividendSpending
-            - ${convert_to_string(0)}
-      #####初始总数量
-        - eq:
-            - content.data.product.orderNumCount
-            - 250
-      #####初始总金额
-        - eq:
-            - content.data.product.orderAmountAdjustmentCount
-            - 3750
-      #####合伙人应收分红总额调整
-        - eq:
-            - content.data.product.partnerDividendsCount
-            - ${convert_to_string(375)}
-      #####产品1是否正确
-        - eq:
-            - content.data.product.detail.0.productId
-            - ${convert_to_int($product_id_1)}
-        #####产品1总金额
-        - eq:
-            - content.data.product.detail.0.commodityPrice
-            - 750
-        #####产品1应收分红
-        - eq:
-            - content.data.product.detail.0.partnerDividends
-            - ${convert_to_string(75)}
-        #####产品1数量调整
-        - eq:
-            - content.data.product.detail.0.orderNum
-            - $goodNumber
-        #####产品1分红状态
-        - eq:
-            - content.data.product.detail.0.paymentStatus
-            - 1
-        #####产品2总金额
-        - eq:
-            - content.data.product.detail.1.commodityPrice
-            - 3000
-        #####产品2应收分红
-        - eq:
-            - content.data.product.detail.1.partnerDividends
-            - ${convert_to_string(300)}
-        #####产品2分红状态
-        - eq:
-            - content.data.product.detail.1.paymentStatus
-            - 1
-
--   name: 查看实际订单列表
-    api: api/m_api/actual/m_order_actual_list_api.yml
-    validate:
-        - eq:
-              - content.data.gridResult.lists.0.id
-              - $actual_id
-        - eq:
-              - content.data.gridResult.lists.0.orderNum
-              - 300
-        - eq:
-              - content.data.gridResult.lists.0.quantityControl
-              - ${convert_to_string(250)}
-        - eq:
-              - content.data.gridResult.lists.0.orderPrice
-              - 4500
-        - eq:
-                - content.data.gridResult.lists.0.priceControl
-                - ${convert_to_string(3750)}
-
--   name: 查看实际订单详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/actual/m_order_actual_detail_api.yml
-    validate:
-        - eq:
-              - content.data.orderNumCount
-              - 300
-        - eq:
-              - content.data.orderAmountAdjustmentCount
-              - 4500
-        - eq:
-              - content.data.orderNumCountControl
-              - ${convert_to_string(250)}
-        - eq:
-              - content.data.orderAmountAdjustmentCountControl
-              - ${convert_to_string(3750)}
-        - eq:
-              - content.data.product.0.orderPrice
-              - 1500
-        - eq:
-              - content.data.product.0.quantityControl
-              - ${convert_to_string($goodNumber)}
-        - eq:
-              - content.data.product.0.priceControl
-              - ${convert_to_string(750)}
-        - eq:
-              - content.data.product.1.orderPrice
-              - 3000
\ No newline at end of file

-config:
-    name: DIV007-分红管理-产品1支付分红成功，数据正确
-    base_url: ${ENV(base_manager_url)}
-    variables:
-      partnerID: ${ENV(partnerId_app)}
-      partnerCategory: ${get_partnerCategory(1)}
-      partnerCategoryId: 1
-      saleDate: ${today_time_str()}
-      orderType: 1
-      createTime: []
-
-
-teststeps:
--   name: 新增实际订单
-    testcase: testcases/common/COM001_app_actual_add_testcases.yml
-    output:
-      - actual_id
-      - product_id_1
-      - product_id_2
-
--   name: 支付分红
-    variables:
-        orderId: ${convert_to_string($actual_id)}
-        productId: ${convert_to_string($product_id_1)}
-    api: api/m_api/dividends/m_dividends_payDividends_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 查看分红列表
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    validate:
-      #####已支付状态=2
-      - eq:
-          - content.data.gridResult.lists.0.stateOfPayment
-          - 2
-      ######应收分红
-      - eq:
-          - content.data.gridResult.lists.0.dividendsReceivable
-          - ${convert_to_string(450)}
-      #####已收分红
-      - eq:
-          - content.data.gridResult.lists.0.receiveDividends
-          - ${convert_to_string(150)}
-      #####未收分红
-      - eq:
-          - content.data.gridResult.lists.0.uncollectedDividends
-          - ${convert_to_string(300)}
-          #####分红支出
-      - eq:
-            - content.data.gridResult.lists.0.dividendSpending
-            - ${convert_to_string(0)}
-
-
--   name: 查看该订单的分红详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/dividends/m_dividends_detail_api.yml
-    validate:
-        - eq:
-            - content.data.order.orderId
-            - $actual_id
-        #####合伙人应收分红总额
-        - eq:
-            - content.data.order.partnerDividends
-            - ${convert_to_string(450)}
-        #####合伙人未收分红总额
-        - eq:
-            - content.data.order.notReceivedDividend
-            - ${convert_to_string(300)}
-        #####合伙人已收分红总额
-        - eq:
-          - content.data.order.receivedDividends
-          - ${convert_to_string(150)}
-      #####合伙人分红支出总额
-        - eq:
-            - content.data.order.dividendSpending
-            - ${convert_to_string(0)}
-      #####产品1是否正确
-        - eq:
-            - content.data.product.detail.0.productId
-            - ${convert_to_int($product_id_1)}
-        #####产品1总金额
-        - eq:
-            - content.data.product.detail.0.commodityPrice
-            - 1500
-        #####产品1应收分红
-        - eq:
-            - content.data.product.detail.0.partnerDividends
-            - ${convert_to_string(150)}
-        #####产品1数量
-        - eq:
-            - content.data.product.detail.0.orderNum
-            - 100
-        #####产品1分红状态
-        - eq:
-            - content.data.product.detail.0.paymentStatus
-            - 2
-        #####产品2总金额
-        - eq:
-            - content.data.product.detail.1.commodityPrice
-            - 3000
-        #####产品2应收分红
-        - eq:
-            - content.data.product.detail.1.partnerDividends
-            - ${convert_to_string(300)}
-        #####产品2分红状态
-        - eq:
-            - content.data.product.detail.1.paymentStatus
-            - 1
-
--   name: 查看实际订单列表
-    api: api/m_api/actual/m_order_actual_list_api.yml
-    validate:
-        - eq:
-              - content.data.gridResult.lists.0.id
-              - $actual_id
-        - eq:
-              - content.data.gridResult.lists.0.orderNum
-              - 300
-        - eq:
-              - content.data.gridResult.lists.0.orderPrice
-              - 4500
-
--   name: 查看实际订单详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/actual/m_order_actual_detail_api.yml
-    validate:
-        - eq:
-            - content.data.orderNumCount
-            - 300
-        - eq:
-            - content.data.orderAmountAdjustmentCount
-            - 4500
-        - eq:
-            - content.data.product.0.orderPrice
-            - 1500
-        - eq:
-            - content.data.product.1.orderPrice
-            - 3000
\ No newline at end of file

-config:
-    name: DIV008-分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确
-    base_url: ${ENV(base_manager_url)}
-    variables:
-        goodNumber: 50
-        partnerCategory: ${get_partnerCategory(1)}
-        partnerCategoryId: 1
-        saleDate: ${today_time_str()}
-        orderType: 1
-        createTime: []
-
-
-teststeps:
--   name: 新增实际订单
-    testcase: testcases/common/COM001_app_actual_add_testcases.yml
-    output:
-      - actual_id
-      - product_id_1
-      - product_id_2
-
--   name: 支付分红
-    variables:
-        orderId: ${convert_to_string($actual_id)}
-        productId: ${convert_to_string($product_id_1)}
-    api: api/m_api/dividends/m_dividends_payDividends_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 编辑分红-数量由100调整为50
-    variables:
-        orderId: ${convert_to_string($actual_id)}
-        state: 1
-        partnerBonusPercent: 10
-        reason: '修改原因${get_stringcode(5)}'
-        productId: ${convert_to_string($product_id_1)}
-    api: api/m_api/dividends/m_dividends_modify_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 查看分红列表
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    validate:
-      #####已支付状态=1
-      - eq:
-          - content.data.gridResult.lists.0.stateOfPayment
-          - 2
-      ######应收分红
-      - eq:
-          - content.data.gridResult.lists.0.dividendsReceivable
-          - ${convert_to_string(375)}
-      #####已收分红
-      - eq:
-          - content.data.gridResult.lists.0.receiveDividends
-          - ${convert_to_string(150)}
-      #####未收分红
-      - eq:
-          - content.data.gridResult.lists.0.uncollectedDividends
-          - ${convert_to_string(300)}
-        #####分红支出
-      - eq:
-            - content.data.gridResult.lists.0.dividendSpending
-            - ${convert_to_string(75)}
-
-
--   name: 查看该订单的分红详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/dividends/m_dividends_detail_api.yml
-    validate:
-        - eq:
-            - content.data.order.orderId
-            - $actual_id
-        #####合伙人应收分红总额
-        - eq:
-            - content.data.order.partnerDividends
-            - ${convert_to_string(375)}
-        #####合伙人未收分红总额
-        - eq:
-            - content.data.order.notReceivedDividend
-            - ${convert_to_string(300)}
-        #####合伙人已收分红总额
-        - eq:
-          - content.data.order.receivedDividends
-          - ${convert_to_string(150)}
-      #####合伙人分红支出总额
-        - eq:
-            - content.data.order.dividendSpending
-            - ${convert_to_string(75)}
-      #####产品1是否正确
-        - eq:
-            - content.data.product.detail.0.productId
-            - ${convert_to_int($product_id_1)}
-        #####产品1总金额
-        - eq:
-            - content.data.product.detail.0.commodityPrice
-            - 750
-        #####产品1应收分红
-        - eq:
-            - content.data.product.detail.0.partnerDividends
-            - ${convert_to_string(75)}
-        #####产品1数量
-        - eq:
-            - content.data.product.detail.0.orderNum
-            - 50
-        #####产品1分红状态
-        - eq:
-            - content.data.product.detail.0.paymentStatus
-            - 2
-        #####产品2总金额
-        - eq:
-            - content.data.product.detail.1.commodityPrice
-            - 3000
-        #####产品2应收分红
-        - eq:
-            - content.data.product.detail.1.partnerDividends
-            - ${convert_to_string(300)}
-        #####产品2分红状态
-        - eq:
-            - content.data.product.detail.1.paymentStatus
-            - 1
-
--   name: 查看实际订单列表
-    api: api/m_api/actual/m_order_actual_list_api.yml
-    validate:
-        - eq:
-              - content.data.gridResult.lists.0.id
-              - $actual_id
-        - eq:
-              - content.data.gridResult.lists.0.orderNum
-              - 300
-        - eq:
-              - content.data.gridResult.lists.0.orderPrice
-              - 4500
-
--   name: 查看实际订单详情
-    variables:
-      id: ${convert_to_string($actual_id)}
-    api: api/m_api/actual/m_order_actual_detail_api.yml
-    validate:
-        - eq:
-            - content.data.orderNumCount
-            - 300
-        - eq:
-            - content.data.orderAmountAdjustmentCount
-            - 4500
-        - eq:
-            - content.data.product.0.orderPrice
-            - 1500
-        - eq:
-            - content.data.product.1.orderPrice
-            - 3000
\ No newline at end of file

-config:
-    name: DIV010-分红管理-批量支付分红成功，数据正确
-    base_url: ${ENV(base_manager_url)}
-    variables:
-        partnerID: ${ENV(partnerId_app)}
-        commissionProportion: 5
-        orderNum1: 100
-        univalence: 15
-        partnerRatio: 10
-        orderNum2: 200
-        partnerCategory: ${get_partnerCategory(1)}
-        partnerCategoryId: 1
-        orderType: 1
-        saleDate: ${today_time_str()}
-        createTime: []
-#        partnerRatio2: 20
-#    output:
-#      - actual_id
-#      - product_id_1
-#      - product_id_2
-
-
-teststeps:
--   name: $phone 登录系统
-    variables:
-      phone: ${ENV(adminphone_app)}
-
-    testcase: testcases/common/m_app_login_testcases.yml
-
--   name: 新增实发订单
-    times: 3
-    api: api/m_api/actual/m_add_app_order_actual_api.yml
-    teardown_hooks:
-      - ${teardown_hook_get_orderid($response)}
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 查看分红列表
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    validate:
-      #####已支付状态=2
-      - eq:
-          - content.data.gridResult.lists.0.stateOfPayment
-          - 1
-
-
--   name: 批量支付分红
-    api: api/m_api/dividends/m_dividends_payDividends_batch_api.yml
-    validate:
-        - eq:
-          - content.msg
-          - ok
-
--   name: 查看分红列表
-    api: api/m_api/dividends/m_dividends_list_api.yml
-    validate:
-      #####已支付状态=2
-      - eq:
-          - content.data.gridResult.lists.0.stateOfPayment
-          - 2
-      - eq:
-          - content.data.gridResult.lists.1.stateOfPayment
-          - 2
-      - eq:
-          - content.data.gridResult.lists.2.stateOfPayment
-          - 2
\ No newline at end of file

@@ -2,12 +2,13 @@ config:
     name: DIV010-分红管理-批量支付分红成功，数据正确
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
         partnerRatio: 10
         orderNum2: 200
+        saleDate: ${get_today()}
 #        partnerRatio2: 20
 #    output:
 #      - actual_id

@@ -2,7 +2,7 @@ config:
     name: ACT001-实际订单-各个值计算正确
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -18,6 +18,8 @@ teststeps:
     testcase: testcases/common/m_login_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     extract:
         - orderid: content.data.id

@@ -2,7 +2,7 @@ config:
     name: ACT002-删除订单成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -18,6 +18,8 @@ teststeps:
     testcase: testcases/common/m_login_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+      saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     extract:
         - orderid: content.data.id

@@ -2,7 +2,7 @@ config:
     name: ACT004-订单唯一性校验：新增订单号重复的实际订单，可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -18,6 +18,8 @@ teststeps:
     testcase: testcases/common/COM001_actual_add_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -2,7 +2,7 @@ config:
     name: ACT005-订单唯一性校验：新增发货单号重复的实际订单，可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -18,6 +18,8 @@ teststeps:
     testcase: testcases/common/COM001_actual_add_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -2,7 +2,7 @@ config:
     name: ACT006-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型重复的实际订单，但是产品名称不同，可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -19,6 +19,8 @@ teststeps:
     testcase: testcases/common/COM001_actual_add_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -2,7 +2,7 @@ config:
     name: ACT007-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型+产品名称重复的实际订单，不可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -20,6 +20,8 @@ teststeps:
     testcase: testcases/common/COM001_actual_add_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -2,7 +2,7 @@ config:
     name: ACT008-订单唯一性校验：只有订单号不一致，可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -20,6 +20,8 @@ teststeps:
     testcase: testcases/common/COM001_actual_add_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -2,7 +2,7 @@ config:
     name: ACT009-订单唯一性校验：只有发货单号不一致，可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -20,6 +20,8 @@ teststeps:
     testcase: testcases/common/COM001_actual_add_testcases.yml
 
 -   name: 新增实发订单
+    variables:
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -2,7 +2,7 @@ config:
     name: ACT010-订单唯一性校验：合伙人类型不一致，可以新增成功
     base_url: ${ENV(base_manager_url)}
     variables:
-        partnerID: 1047
+        partnerID: ${ENV(partnerId)}
         commissionProportion: 5
         orderNum1: 100
         univalence: 15
@@ -22,6 +22,7 @@ teststeps:
 -   name: 新增实发订单
     variables:
         partnerCategoryId: 2
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     validate:
         - eq:

@@ -21,6 +21,7 @@ teststeps:
 -   name: 新增实发订单
     variables:
         partnerID: $partnerid
+        saleDate: ${get_today()}
     api: api/m_api/actual/m_add_order_actual_api.yml
     extract:
         - orderid: content.data.id

@@ -3,9 +3,9 @@ config:
 testcases:
 
 -   name: start....初始化数据库和文件
-    testcase: testcases/common/start_app_testcases.yml
+    testcase: testcases/common/start_testcases.yml
 
-##############################APP端合伙人开始################################
+#############################APP端合伙人开始################################
 -   name: DIVI001-事业-初始状态-统计值正确
     testcase: testcases/app/dividends/DIVI001_career_dividendslist_testcases.yml
 
@@ -23,7 +23,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,8 +35,8 @@ 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