add v0.8.0

@@ -10,6 +10,9 @@ variables:
     partnerCategoryId: 1
 #    univalence2: 15
 #    partnerRatio2: 20
+    orderId: '实发订单号${get_stringcode(5)}'
+    shipmentsId: '实发订单发货单号${get_stringcode(5)}'
+    productName: 产品名称${get_stringcode(5)}
 teardown_hooks:
     - ${sleep(2)}
 request:
@@ -18,15 +21,15 @@ request:
         User-Agent: okhttp/3.12.3
         Authorization: Bearer ${get_m_accesstoken()}
     json:
-        orderId: '实发订单号${get_stringcode(5)}'
-        shipmentsId: '实发订单发货单号${get_stringcode(5)}'
+        orderId: $orderId
+        shipmentsId: $shipmentsId
         partnerID: $partnerID
         partnerCategoryId: $partnerCategoryId
         buyer: '客户名称${get_stringcode(5)}'
         orderDist: '订单区域${get_stringcode(5)}'
         commissionProportion: $commissionProportion
         product:
-        -   productName: 产品名称${get_stringcode(5)}
+        -   productName: $productName
             orderNum: $orderNum1
             univalence: $univalence
             partnerRatio: $partnerRatio

+config:
+    name: ACT004-订单唯一性校验：新增订单号重复的实际订单，可以新增成功
+    base_url: ${ENV(base_manager_url)}
+    variables:
+        partnerID: 1047
+        commissionProportion: 5
+        orderNum1: 100
+        univalence: 15
+        partnerRatio: 10
+        orderNum2: 200
+        orderId: '实发订单号${get_stringcode(5)}'
+#        univalence2: 15
+#        partnerRatio2: 20
+
+teststeps:
+
+-   name: 新增实际订单
+    testcase: testcases/common/COM001_actual_add_testcases.yml
+
+-   name: 新增实发订单
+    api: api/m_api/actual/m_add_order_actual_api.yml
+    validate:
+        - eq:
+          - content.msg
+          - ok

+config:
+    name: ACT005-订单唯一性校验：新增发货单号重复的实际订单，可以新增成功
+    base_url: ${ENV(base_manager_url)}
+    variables:
+        partnerID: 1047
+        commissionProportion: 5
+        orderNum1: 100
+        univalence: 15
+        partnerRatio: 10
+        orderNum2: 200
+        shipmentsId: '实发订单发货单号${get_stringcode(5)}'
+#        univalence2: 15
+#        partnerRatio2: 20
+
+teststeps:
+
+-   name: 新增实际订单
+    testcase: testcases/common/COM001_actual_add_testcases.yml
+
+-   name: 新增实发订单
+    api: api/m_api/actual/m_add_order_actual_api.yml
+    validate:
+        - eq:
+          - content.msg
+          - ok

+config:
+    name: ACT006-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型重复的实际订单，但是产品名称不同，可以新增成功
+    base_url: ${ENV(base_manager_url)}
+    variables:
+        partnerID: 1047
+        commissionProportion: 5
+        orderNum1: 100
+        univalence: 15
+        partnerRatio: 10
+        orderNum2: 200
+        orderId: '实发订单号${get_stringcode(5)}'
+        shipmentsId: '实发订单发货单号${get_stringcode(5)}'
+#        univalence2: 15
+#        partnerRatio2: 20
+
+teststeps:
+
+-   name: 新增实际订单
+    testcase: testcases/common/COM001_actual_add_testcases.yml
+
+-   name: 新增实发订单
+    api: api/m_api/actual/m_add_order_actual_api.yml
+    validate:
+        - eq:
+          - content.msg
+          - ok

+config:
+    name: ACT007-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型+产品名称重复的实际订单，不可以新增成功
+    base_url: ${ENV(base_manager_url)}
+    variables:
+        partnerID: 1047
+        commissionProportion: 5
+        orderNum1: 100
+        univalence: 15
+        partnerRatio: 10
+        orderNum2: 200
+        orderId: '实发订单号${get_stringcode(5)}'
+        shipmentsId: '实发订单发货单号${get_stringcode(5)}'
+        productName: 产品名称${get_stringcode(5)}
+#        univalence2: 15
+#        partnerRatio2: 20
+
+teststeps:
+
+-   name: 新增实际订单
+    testcase: testcases/common/COM001_actual_add_testcases.yml
+
+-   name: 新增实发订单
+    api: api/m_api/actual/m_add_order_actual_api.yml
+    validate:
+        - eq:
+          - content.msg
+          - 订单已存在