Merge branch 'common_dev' into ly_dev

all_backend_api/doctor_v2_request.yaml

@@ -3,6 +3,7 @@ services:
   method: get
   url: /api/doctor_v2/5bd9f05cad51403d853ba8c881989e23/services
   params:
+    device_id: B3248423-2EA5-495B-D3CA-AFB8F99417EC
     offset: 0
     show_tag_distro: 1
     tag_id: all

all_backend_api/hospitals_v2_request.yaml

@@ -3,6 +3,7 @@ services:
   method: get
   url: /api/hospitals_v2/bjxyjcpfbyy/services
   params:
+    device_id: B3248423-2EA5-495B-D3CA-AFB8F99417EC
     offset: 0
     show_tag_distro: 1
     tag_id: "all"

all_backend_api/im_request.py

@@ -29,12 +29,30 @@ class im_request(BaseRequest):
         self.params["extra"] = extra
         return self.api_send(self.data["send_msg"])
 
+    def robot_get_second(self, page_type):
+        " 获取页面触发私信时间 "
+        self.params["page_type"] = page_type
+        return self.api_send(self.data["robot_get_second"])
+
+    def robot_send_msg(self, hospital_id, is_system, page_type, req_source, target_user_id, version):
+        #给用户发私信
+        self.params["hospital_id"] = hospital_id
+        self.params["is_system"] = is_system
+        self.params["page_type"] = page_type
+        self.params["req_source"] = req_source
+        self.params["target_user_id"] = target_user_id
+        self.params["version"] = version
+        return self.api_send(self.data["robot_send_msg"])
+
+
 if __name__ == '__main__':
     print(im_request().conversation_detail("beijing", 0, 4, 0,  "message_home"))
     print("第二个接口")
     print(im_request().auto_msg("2021/04/22/1722/70a1791606d5",368))
     print("send_msg")
     print(im_request().send_msg("368", 0, "message_home", "", 0, "您好，我想咨询一下", {}))
+    print(im_request().robot_get_second("3"))
+    print(im_request().robot_send_msg("715368769fea4a1ba0c85979112ed154", 1, "3", "gengmei", 33909952, "7.46.0"))
 
 
 

all_backend_api/im_request.yaml

@@ -39,4 +39,28 @@ send_msg:
     extra: ${extra}
 
   json: {}
+  isLogin: 1 #需要登录的接口
+
+robot_get_second:
+    method: get
+    url: /api/im/robot/get_second
+    params:
+      page_type: ${page_type}
+    data: {}
+    json: {}
+    isLogin: 1 #需要登录的接口
+
+robot_send_msg:
+  method: post
+  url: /api/im/robot/send_msg
+  params:
+    version: ${version}
+
+  data:
+    hospital_id: ${hospital_id}
+    is_system: ${is_system}
+    page_type: ${page_type}
+    req_source: ${req_source}
+    target_user_id: ${target_user_id}
+  json: {}
   isLogin: 1 #需要登录的接口
\ No newline at end of file

all_backend_api/janus_request.py

@@ -70,7 +70,7 @@ class janus_request(BaseRequest):
     def mine_guess_you_like(self):
         return self.api_send(self.data["mine_guess_you_like"])
 
-    #商祥页-详情
+    #商祥页-详情/商祥页-本院推荐
     def product_detail(self, service_id, service_item_id, version):
         self.params["service_id"] = service_id
         self.params["service_item_id"] = service_item_id
@@ -89,13 +89,19 @@ class janus_request(BaseRequest):
         self.params["tab_id"] = tab_id
         return self.api_send(self.data["product_coupon_my_list"])
 
+    # 商祥页-商品推荐-新接口-748以上
+    def service_promotion_related_service_data(self, service_id, page, current_city_id):
+        self.params["service_id"] = service_id
+        self.params["page"] = page
+        self.params["current_city_id"] = current_city_id
+        return self.api_send(self.data["service_promotion_related_service_data"])
+
     # 品类聚合页面商品列表
-    def tag_service(self, size, tag_ids, offset, tag_id, version, device_id):
+    def tag_service(self, size, tag_ids, offset, version, device_id):
         print("fgx")
         self.params['size'] = size
         self.params['tag_ids'] = tag_ids
         self.params['offset'] = offset
-        self.params['tag_id'] = tag_id
         self.params['version'] = version
         self.params['device_id'] = device_id
 
@@ -296,33 +302,33 @@ if __name__ == '__main__':
     #打印购物车-猜你喜欢列表接口返回
     # print(janus_request().mine_guess_you_like())
     #打印商祥页-详情接口返回
-    print(janus_request().product_detail("5857263", "618788", "7.43.0"))
-    #打印商祥页-sku信息接口返回
-    print(janus_request().sku_info("5857263", "618788"))
-    #打印商祥页-美券列表-我的美券点击-744版本及以后-新接口返回
-    print(janus_request().product_coupon_my_list(0, 0))
-
-    #品类聚合页面商品列表接口返回
-    # print(janus_request().tag_service())
-    print("fgx")
-
-    #品类聚合页面标签和专场
-    # print(janus_request().polymer())
-    print("fgx")
-
-    #打印次卡-确认订单接口返回
-    print(janus_request().beauty_card_order_confirm("10176", 1, 1, 0))
-    #打印次卡-确认订单页面-修改手机号接口返回
-    print(janus_request().beauty_card_update_phone("+8612348543876", 1, "084430"))
-    #打印次卡-提交订单接口返回
-    print(janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0))
-    #打印次卡-支付平台接口返回
-    print(janus_request().beauty_card_payment_method("101670448736595"))
-
-    print(janus_request().product_my_list(0, 0))
-
-    # 次卡商详页-适应机构
-    print(janus_request().beauty_card_service_hospital("10046", 20, 0, 1))
+    # print(janus_request().product_detail("5857263", "618788", "7.43.0"))
+    # #打印商祥页-sku信息接口返回
+    # print(janus_request().sku_info("5857263", "618788"))
+    # #打印商祥页-美券列表-我的美券点击-744版本及以后-新接口返回
+    # print(janus_request().product_coupon_my_list(0, 0))
+    #
+    # #品类聚合页面商品列表接口返回
+    # # print(janus_request().tag_service())
+    # print("fgx")
+    #
+    # #品类聚合页面标签和专场
+    # # print(janus_request().polymer())
+    # print("fgx")
+    #
+    # #打印次卡-确认订单接口返回
+    # print(janus_request().beauty_card_order_confirm("10176", 1, 1, 0))
+    # #打印次卡-确认订单页面-修改手机号接口返回
+    # print(janus_request().beauty_card_update_phone("+8612348543876", 1, "084430"))
+    # #打印次卡-提交订单接口返回
+    # print(janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0))
+    # #打印次卡-支付平台接口返回
+    # print(janus_request().beauty_card_payment_method("101670448736595"))
+    #
+    # print(janus_request().product_my_list(0, 0))
+    #
+    # # 次卡商详页-适应机构
+    # print(janus_request().beauty_card_service_hospital("10046", 20, 0, 1))
     # #打印购物车-猜你喜欢列表接口返回
     # print(janus_request().mine_guess_you_like())
     # #打印商祥页-详情接口返回
@@ -366,13 +372,14 @@ if __name__ == '__main__':
     # #直播-点击【设置封面】
     # print("直播-点击【设置封面】")
     # print(janus_request().page_rules("744.2", "beijing", "post_add_pic"))
-    #直播-点击【设置封面】
-    print("直播-点击【设置封面】")
-    print(janus_request().page_rules("744.2", "beijing", "post_add_pic"))
-    #直播-主播获取美颜
-    print("meiyan")
-    print(janus_request().beauty("739"))
-    #直播-主播修改美颜
-    print("change meiyan")
-    print(janus_request().beauty_post("739","true","0.60","0.40","0.70"))
-
+    # #直播-点击【设置封面】
+    # print("直播-点击【设置封面】")
+    # print(janus_request().page_rules("744.2", "beijing", "post_add_pic"))
+    # #直播-主播获取美颜
+    # print("meiyan")
+    # print(janus_request().beauty("739"))
+    # #直播-主播修改美颜
+    # print("change meiyan")
+    # print(janus_request().beauty_post("739","true","0.60","0.40","0.70"))
+    # 商祥页-推荐商品-新接口
+    print(janus_request().service_promotion_related_service_data('5828374', 1, 'beijing'))

all_backend_api/janus_request.yaml

@@ -69,6 +69,21 @@ product_coupon_my_list:
   json: {}
   isLogin: 1
 
+#商祥页-推荐商品-新接口-748以上
+service_promotion_related_service_data:
+  method: get
+  url: /api/janus/service/promotion/related_service/_data
+  params:
+    service_id: ${service_id}
+    page: ${page}
+    current_city_id: ${current_city_id}
+    version: "7.48.0"
+    lat: "39.983161"
+    lng: "116.488078"
+  data: {}
+  json: {}
+  isLogin: 1
+
 #品类聚合页面商品列表的
 tag_service:
   method: GET
@@ -77,7 +92,6 @@ tag_service:
     size: ${size}
     tag_ids: ${tag_ids}
     offset: ${offset}
-    tag_id: ${tag_id}
     version: ${version}
     device_id: ${device_id}
   data: { }

all_backend_api/live_request.py

@@ -71,7 +71,7 @@ if __name__ == '__main__':
     # (living_request().danmu_v2("739", "1"))
     # (living_request().pushlive_info("小冤家", "2021/04/22/1003/cef471cff5e6", "", "1", "1", "1"))
     # print (living_request().sendmsg("739","你好"))
-    # print(living_request().finish("745", "746.0"))
+    print(living_request().finish("739", "747.0"))
     # print(living_request().get_live_info_audience("745", "7.46.0"))
     # print(living_request().replay_info("123456978", "746.0"))
-    print(living_request().replay_msg("123456978", "746.0"))
\ No newline at end of file
+    # print(living_request().replay_msg("123456978", "746.0")
\ No newline at end of file

all_backend_api/services_request.py

@@ -17,9 +17,9 @@ class services_request(BaseRequest):
     def v1(self, coupon_info_id, order_by):
         self.params["coupon_info_id"] = coupon_info_id
         self.params["order_by"] = order_by
-        return self.api_send(self.data["share_data"])
+        return self.api_send(self.data["v1"])
 
 if __name__ == '__main__':
     #打印商祥页-分享接口返回
-    # print(services_request().share_data("5857263", "618788"))
-    print(services_request().v1(32366785, 0))
\ No newline at end of file
+    print(services_request().share_data("5857263", "618788"))
+    # print(services_request().v1(32366785, 0))
\ No newline at end of file

all_backend_api/services_request.yaml

@@ -10,7 +10,7 @@ share_data:
 
 
 #获取美购列表，美券
-share_data:
+v1:
   method: get
   url: /api/services/v1
   params:

all_backend_api/visual_beauty_card.py

@@ -28,12 +28,13 @@ class visual_beauty_card_request(BaseRequest):
         return self.api_send(self.data['beautycard_filters'])
 
     #自定义专题-更美次卡商品列表组件商品
-    def beautycard_skus(self, unit_id, tag_id, area, sort_type, page, page_size, device_id = '97B6764B-2135-4761-9911-701C38CBC272'):
+    def beautycard_skus(self, unit_id, tag_id, area, sort_type, page, page_size, version, device_id = '97B6764B-2135-4761-9911-701C38CBC272'):
         self.params["unit_id"] = unit_id
         self.params["tag_id"] = tag_id
         self.params["area"] = area
         self.params["sort_type"] = sort_type
         self.params["page"] = page
         self.params["page_size"] = page_size
+        self.params["version"] = version
 
         return self.api_send(self.data['beautycard_skus'])
\ No newline at end of file

all_backend_api/visual_beauty_card.yaml

@@ -42,6 +42,8 @@ beautycard_skus:
     page : ${page}
     #分页大小
     page_size : ${page_size}
+    #版本!!!
+    version : ${version}
 
   data: {}
   json: {}

path_setting.py

@@ -333,6 +333,10 @@ SEND_MSG = os.path.join(BASE_DIR, "backend_auto/test_backend_data/im_data", "sen
 #发送消息
 PRIVATE_CONVERSATION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "private_conversation_request.yaml")
 PRIVATE_CONVERSATION = os.path.join(BASE_DIR, "backend_auto/test_backend_data/private_conversation_data", "private_conversation.yaml")
+#私信机器人-获取页面触发私信时间
+ROBOT_GET_SECOND = os.path.join(BASE_DIR, "backend_auto/test_backend_data/im_data", "robot_get_second.yaml")
+#私信机器人-给用户发送私信
+ROBOT_SEND_MSG = os.path.join(BASE_DIR, "backend_auto/test_backend_data/im_data", "robot_send_msg.yaml")
 
 HOME_V5_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "service_request.yaml")
 HOME_V5=os.path.join(BASE_DIR,"backend_auto/test_backend_data/service_data","home_v5.yaml")
@@ -384,6 +388,8 @@ PRODUCT_COUPON_MY_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/
 #商祥页-推荐商品列表
 HYBRID_PROMOTION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hybrid_promotion_request.yaml")
 RELATED_SERVICE_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_promotion_data", "related_service_data.yaml")
+# 商祥页-推荐商品列表-新接口-748以上
+SERVICE_PROMOTION_RELATED_SERVICE_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "service_promotion_related_service_data.yaml")
 
 #次卡-确认订单
 BEAUTY_CARD_ORDER_CONFIRM = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_order_confirm.yaml")

test_backend_case/im_case/test_robot_get_second.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.im_request import im_request
+
+
+class TestRobotGetSecond:
+    data = BaseRequest().api_load(path_setting.ROBOT_GET_SECOND)
+    robot_get_second_case, robot_get_second_data = get_ids(data, "robot_get_second")
+
+    @pytest.mark.parametrize("param", robot_get_second_data, ids=robot_get_second_case)
+    def test_robot_get_second(self, param):
+        r = im_request().robot_get_second(param["page_type"])
+        print(r)
+        if r["error"] == 0:
+            assert r["data"]["second"] == param["assert"]
+

test_backend_case/im_case/test_robot_send_msg.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.im_request import im_request
+
+
+class TestRobotSendMsg:
+    data = BaseRequest().api_load(path_setting.ROBOT_SEND_MSG)
+    robot_send_msg_case, robot_send_msg_data = get_ids(data, "robot_send_msg")
+
+    @pytest.mark.parametrize("param", robot_send_msg_data, ids=robot_send_msg_case)
+    def test_robot_send_msg(self, param):
+        r = im_request().robot_send_msg(param["hospital_id"], param["is_system"], param["page_type"], param["req_source"], param["target_user_id"], param["version"])
+        print(r)
+        assert r["error"] == param["assert"]
+        #if r["error"] == 0:
+            #assert r["data"]["second"] == param["assert"]
+

test_backend_case/janus_case/test_product_detail.py

@@ -16,7 +16,7 @@ class TestProductDetail:
 
         if r["error"] == 0:
             assert r["error"] == param["assert_error"]
+            assert r["data"]["service_hospital"]["services"] != param["assert_service_hospital"]
         if r["error"] == 1:
             assert r["message"] == param["assert_spu_message"]
-        # if r["error"] == -1:
-        #     assert r["message"] == param["assert_version_message"]
+

test_backend_case/janus_case/test_service_promotion_related_service_data.py

+import pytest
+
+from all_backend_api.janus_request import janus_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestServicePromotionRelatedServiceData:
+    data = BaseRequest().api_load(path_setting.SERVICE_PROMOTION_RELATED_SERVICE_DATA)
+    service_promotion_related_service_data_case, service_promotion_related_service_data_data = \
+        get_ids(data, "service_promotion_related_service_data")
+
+    @pytest.mark.parametrize("param", service_promotion_related_service_data_data,
+                             ids=service_promotion_related_service_data_case)
+    def test_service_promotion_related_service_data_case(self, param):
+        r = janus_request().service_promotion_related_service_data(param["service_id"], param["page"],
+                                                                   param["current_city_id"])
+
+        if param["page"] == 1:
+            assert len(r["data"]["services"]) == param["assert_page1_len"]
+        if param["page"] == 2:
+            assert len(r["data"]["services"]) == param["assert_page2_len"]
+        if r["error"] == 0:
+            assert r["data"]["services"][0]["title"] is not None
+            assert r["data"]["services"][0]["price_info"] is not None
+            assert r["data"]["services"][0]["sell_num_desc"] is not None
+            assert r["data"]["services"][0]["doctor_hospital_name"] is not None
+            assert r["data"]["services"][0]["distance"] is not None
+

test_backend_case/janus_case/test_tag_service.py

@@ -8,13 +8,13 @@ from all_backend_api.janus_request import janus_request
 
 class TestTagService:
     data = BaseRequest().api_load(path_setting.TAG_SERVICE)
-    tagservice_case, tagservice_data = get_ids(data, "tag_service")
+    tag_service_case, tag_service_data = get_ids(data, "tag_service")
 
-    @pytest.mark.parametrize("param", tagservice_data, ids=tagservice_case)
+    @pytest.mark.parametrize("param", tag_service_data, ids=tag_service_case)
     def test_tag_service(self, param):
-        r = janus_request().tag_service(param["size"], param["tag_ids"], param["offset"], param["tag_id"], param["version"], param["device_id"])
-        #print('feng=', r)
+        r = janus_request().tag_service(param["size"], param["tag_ids"], param["offset"],
+                                        param["version"], param["device_id"])
+        # print('feng=', r)
 
         if r["error"] == 0:
-         assert r["error"] == param["assert"]
-         assert r["data"]["offset"] == param["offset"]
+            assert r["error"] == param["assert"]

test_backend_case/janus_live_case/test_add_live_service.py

@@ -2,6 +2,7 @@ import pytest
 
 import path_setting
 from all_backend_api.janus_live_request import live_request
+from all_backend_api.live_request import living_request
 from ids_list import get_ids
 from in_common.base_request import BaseRequest
 
@@ -13,6 +14,14 @@ class TestAddLiveService:
     @pytest.mark.parametrize("param", addliveservice_data, ids=addliveservice_case)
     def test_add_live_service(self, param):
         print(111111111111111111111)
+        pushlive = living_request().pushlive_info("啊哈", "2021/08/14/1003/cef471cff5e6", "啊哈-公告", "1", "2", "1")
+        param["channel_id"] = pushlive["data"]["channel"]
         r = live_request().add_live_service(param["channel_id"], param["service_item_ids"], param["version"])
         if r["error"] == 0:
-            assert r["data"]["toast"] == param["assert"]
\ No newline at end of file
+            assert r["data"]["toast"] == param["assert"]
+        else:
+            assert r["message"] == param["assert_message"]
+            print("接口出错了")
+        living_request().finish(param["channel_id"], "747.0")
+        living_request().finish(param["channel_id"], "747.0")
+        living_request().finish(param["channel_id"], "747.0")
\ No newline at end of file

test_backend_case/visual_beauty_card_case/test_beautycard_skus.py

@@ -13,7 +13,11 @@ class TestBeautyCardSkus:
     @pytest.mark.parametrize("param", beautycard_skus_data, ids=beautycard_skus_case)
     def test_beautycard_skus(self, param):
         print('次卡商品列表组件商品')
-        r = visual_beauty_card_request().beautycard_skus(param["unit_id"], param["tag_id"], param["area"], param["sort_type"], param["page"], param["page_size"])
+        r = visual_beauty_card_request().beautycard_skus(param["unit_id"], param["tag_id"], param["area"], param["sort_type"], param["page"], param["page_size"], param["version"])
         if r["data"]:
             print('次卡商品列表组件有商品召回')
-            assert len(r["data"]["beautycards"]) != param["assert"]
\ No newline at end of file
+            assert len(r["data"]["beautycards"]) != param["assert"]
+            assert r["message"] == param["assert_message"]
+        else:
+            assert r["message"] == param["assert_message"]
+            print('接口出错了')
\ No newline at end of file

test_backend_data/im_data/robot_get_second.yaml

+robot_get_second:
+#获取页面触发私信时间-商详页case
+  -
+    case: "商详页"
+    page_type: "1"
+    assert: 5
+
+#获取页面触发私信时间-机构主页case
+  -
+    case: "机构主页"
+    page_type: "2"
+    assert: 5
+
+#获取页面触发私信时间-医生主页case
+  -
+    case: "医生主页"
+    page_type: "3"
+    assert: 5
+
+#获取页面触发私信时间-综搜页case
+  -
+    case: "综搜页"
+    page_type: "4"
+    assert: 1
+
+#获取页面触发私信时间-聚合页case
+  -
+    case: "聚合页"
+    page_type: "5"
+    assert: 1
\ No newline at end of file

test_backend_data/im_data/robot_send_msg.yaml

+robot_send_msg:
+#给用户发私信-商详页普通用户case
+  -
+    case: "商详页"
+    version: "7.46.0"
+    page_type: "1"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33909952
+    assert: 0
+#给用户发私信-商详页医生用户case
+  -
+    case: "商详页"
+    version: "7.46.0"
+    page_type: "1"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33910245
+    assert: 0
+
+#给用户发私信-机构主页普通用户case
+  -
+    case: "机构主页"
+    version: "7.46.0"
+    page_type: "2"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33909952
+    assert: 0
+
+#给用户发私信-机构主页医生用户case
+  -
+    case: "机构主页"
+    version: "7.46.0"
+    page_type: "2"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33910245
+    assert: 0
+
+#给用户发私信-医生主页普通用户case
+  -
+    case: "医生主页普通用户"
+    version: "7.46.0"
+    page_type: "3"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33909952
+    assert: 0
+
+#给用户发私信-医生主页医生用户case
+  -
+    case: "医生主页医生用户"
+    version: "7.46.0"
+    page_type: "3"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33910245
+    assert: 0
+
+#给用户发私信-综搜页普通用户case
+  -
+    case: "综搜页普通用户"
+    version: "7.46.0"
+    page_type: "4"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33909952
+    assert: 0
+
+#给用户发私信-综搜页医生用户case
+  -
+    case: "综搜页医生用户"
+    version: "7.46.0"
+    page_type: "4"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33910245
+    assert: 0
+
+#给用户发私信-聚合页普通用户case
+  -
+    case: "聚合页"
+    version: "7.46.0"
+    page_type: "5"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33909952
+    assert: 0
+
+#给用户发私信-聚合页医生用户case
+  -
+    case: "聚合页"
+    version: "7.46.0"
+    page_type: "5"
+    hospital_id: "715368769fea4a1ba0c85979112ed154"
+    is_system: 1
+    req_source: "gengmei"
+    target_user_id: 33910245
+    assert: 0
\ No newline at end of file

test_backend_data/janus_data/product_detail.yaml

@@ -5,12 +5,22 @@ product_detail:
     service_item_id: "618788"
     version: "7.43.0"
     assert_error: 0
+    assert_service_hospital: ""
+  -
+    case: "校验本院推荐返回不为空case"
+    service_id: "585726"
+    service_item_id: "618788"
+    version: "7.43.0"
+    assert_error: 0
+    assert_service_hospital: ""
+    assert_spu_message: "美购不存在"
   -
     case: "校验spu_id错误case"
     service_id: "585726"
     service_item_id: "618788"
     version: "7.43.0"
     assert_spu_message: "美购不存在"
+
 #  -
 #    case: "校验sku_id错误case"
 #    service_id: "5857263"

test_backend_data/janus_data/service_promotion_related_service_data.yaml

+service_promotion_related_service_data:
+  -
+    case: "校验第一页返回数据2条case"
+    service_id: "5828374"
+    page: 1
+    current_city_id: "beijing"
+    assert_page1_len: 2
+  -
+    case: "校验第二页返回数据10条case"
+    service_id: "5828374"
+    page: 2
+    current_city_id: "beijing"
+    assert_page2_len: 10
+  -
+    case: "校验必要字段接口返回不为空"
+    service_id: "5828374"
+    page: 2
+    current_city_id: "beijing"
+    assert_page1_len: 2
+    assert_page2_len: 10
\ No newline at end of file

test_backend_data/janus_data/tag_service.yaml

@@ -6,7 +6,6 @@ tag_service:
     size: 10
     tag_ids: []
     offset: 0
-    tag_id:
     version: 7.43.0
     device_id: 869378034450718
 

test_backend_data/janus_live_data/add_live_service.yaml

@@ -2,15 +2,17 @@ add_live_service:
 #主播-推荐袋添加商品-添加一个商品
   -
     case: "主播-推荐袋添加商品-添加一个商品"
-    channel_id: "747"
-    service_item_ids: "560641"
+    channel_id: ""#此字段取值直播开播接口的返参channel
+    service_item_ids: "380519"
     version: "7.45.0"
     assert : 成功添加1件商品
+    assert_message: ""
 
 #主播-推荐袋添加商品-添加多个商品
   -
     case: "主播-推荐袋添加商品-添加多个商品"
-    channel_id: "747"
+    channel_id: ""#此字段取值直播开播接口的返参channel
     service_item_ids: "108278,578088,585823"
     version: "7.45.0"
-    assert : 成功添加3件商品
\ No newline at end of file
+    assert : 成功添加3件商品
+    assert_message: ""
\ No newline at end of file

test_backend_data/topic_data/topic_reply_create.yaml

@@ -3,7 +3,7 @@ reply_create:
   beuzhu: '# 备注： 这个文件有冲突的话，那个版本都行不会影响，回退/接受当前版本都行，因为每次运行content都会改变'
   case: 日记贴一级评论创建--正常校验&创建二级评论--正常校验
   channel: benzhan
-  content: ces测试+2021-08-13 15:36:32
+  content: ces测试+2021-08-16 17:42:16
   message: 请勿回复重复内容
   message1: 回复成功
   message2: 你的回复有点频繁，稍后再来

test_backend_data/visual_beauty_card_data/beautycard_skus.yaml

@@ -8,7 +8,9 @@ beautycard_skus:
     sort_type: "0"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SKU导入，商品默认排序
@@ -19,7 +21,9 @@ beautycard_skus:
     sort_type: "0"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SPU导入，商品价格最低
@@ -30,7 +34,9 @@ beautycard_skus:
     sort_type: "2"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SKU导入，商品价格最低
@@ -41,7 +47,9 @@ beautycard_skus:
     sort_type: "2"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SPU导入，商品销量最高
@@ -52,7 +60,9 @@ beautycard_skus:
     sort_type: "1"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SKU导入，商品销量最高
@@ -63,7 +73,9 @@ beautycard_skus:
     sort_type: "1"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SPU导入，商品最新上架
@@ -74,7 +86,9 @@ beautycard_skus:
     sort_type: "3"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SKU导入，商品最新上架
@@ -85,7 +99,9 @@ beautycard_skus:
     sort_type: "3"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SPU导入，修改城市筛选器为北京，商品正常召回
@@ -96,7 +112,9 @@ beautycard_skus:
     sort_type: "2"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""
 
   -
   #更美次卡商品列表组件商品-按SKU导入，修改城市筛选器为北京，商品正常召回
@@ -107,4 +125,6 @@ beautycard_skus:
     sort_type: "1"
     page: "0"
     page_size: "20"
+    version: "747.0"
     assert: 0
+    assert_message: ""