Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into ly_dev

# Conflicts:
#	all_backend_api/janus_request.py
#	all_backend_api/janus_request.yaml
#	test_backend_data/topic_data/topic_reply_create.yaml

all_backend_api/conversation_request.py

@@ -22,6 +22,7 @@ class conversation_request(BaseRequest):
 
 if __name__ == '__main__':
     print(conversation_request().message_read("beijing", 1,'[10622,10626,10646,10651]'))
+    print("---------")
     print(conversation_request().detail_messageid(10, 0, 0))
 
 

all_backend_api/janus_request.py

@@ -222,6 +222,15 @@ class janus_request(BaseRequest):
 
         return self.api_send(self.data["feed_service"])
 
+    # 直播-点击【设置封面】
+    def page_rules(self, version, current_city_id, page_name, device_id = '97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params['version'] = version
+        self.params['current_city_id'] = current_city_id
+        self.params['page_name'] = page_name
+
+        return self.api_send(self.data["page_rules"])
+
+
 
 if __name__ == '__main__':
     #打印购物车-猜你喜欢列表接口返回
@@ -294,4 +303,7 @@ if __name__ == '__main__':
     # print(janus_request().beauty_card_refund_submit("102813852173916", 3, "个人身体原因", 0))
     print(janus_request().beauty_card_order_detail(102247770691611))
     # print(janus_request().product_my_list(0, 0))
+    #直播-点击【设置封面】
+    print("直播-点击【设置封面】")
+    print(janus_request().page_rules("744.2", "beijing", "post_add_pic"))
 

all_backend_api/janus_request.yaml

@@ -286,6 +286,19 @@ beauty_card_order_detail:
   isLogin: 1
 
 
+#直播-点击【设置封面】
+page_rules:
+  method: GET
+  url: /api/janus/sales_lead/page_rules
+  params:
+    version: ${version}
+    current_city_id: ${current_city_id}
+    page_name: ${page_name}
+  data: {}
+  json: {}
+  isLogin: 1
+
+
 #首页（灰度）feed-推荐商品类型tab[除必要参数外其余参数使用默认参数形式方便之后调整]
 feed_service:
   method: get
@@ -298,4 +311,4 @@ feed_service:
     first_load: ${first_load}
   data: {}
   json: {}
-  isLogin: 0
\ No newline at end of file
+  isLogin: 0

all_doctor_api/web2_request.py

@@ -48,6 +48,15 @@ class web2_request(BaseRequest):
     def artemis_ad_add_shopping_cart_info(self):
         #我的购物车
         return self.api_send(self.SERVICE_URL["artemis_ad_add_shopping_cart_info"])
+    def artemis_add_value_order_id_detail(self):
+        "我的服务订单-已购买"
+        return self.api_send(self.SERVICE_URL["artemis_add_value_order_id_detail"])
+    def artemis_ad_packageorder_detail(self, package_order_id):
+        "我的服务订单-已支付广告包"
+        self.params["package_order_id"] = package_order_id
+        return self.api_send(self.SERVICE_URL["artemis_ad_packageorder_detail"])
+
+
 
 
 
@@ -60,4 +69,7 @@ if __name__ == '__main__':
     print(web2_request().service_delete("1","209863","PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
     print(web2_request().service_deletelist("1"))#商品回收站
     print(web2_request().artemis_ad_add_shopping_cart_info())
+    print(web2_request().artemis_add_value_order_id_detail())
+    print("---11233353667----")
+    #print(web2_request().artemis_ad_packageorder_detail("685529883901"))
 

all_doctor_api/web2_request.yaml

@@ -74,3 +74,19 @@ artemis_ad_add_shopping_cart_info:
   data: {}
   json: {}
   isLogin: 1 #需要登录
+artemis_add_value_order_id_detail:
+  method: get
+  url: /api/web2/artemis/add_value_order/957727877165/detail
+  params: {}
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录
+
+artemis_ad_packageorder_detail:
+  method: get
+  url: /api/web2/artemis/ad/packageorder/detail
+  params:
+    package_order_id:${package_order_id}
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录
\ No newline at end of file

all_doctor_api/web_request.py

@@ -65,9 +65,13 @@ class web_request(BaseRequest):
         return self.api_send(self.ACCOUNT_URL["cpc_homepage"])
     def artemis_ad_type_list(self):
         return self.api_send(self.ACCOUNT_URL["artemis_ad_type_list"])
-    def artemis_order_list(self,status):
+    def artemis_order_list(self, status, page):
         self.params["status"] = status
+        self.params["page"] = page
         return self.api_send(self.ACCOUNT_URL["artemis_order_list"])
+    def artemis_order_id_detail(self):
+        "上线中订单详情页"
+        return self.api_send(self.ACCOUNT_URL["artemis_order_id_detail"])
 
 
 
@@ -89,6 +93,7 @@ if __name__ == '__main__':
     print(web_request().cpc_homepage())
     print(web_request().artemis_ad_type_list())
     print("发送")
-    print(web_request().artemis_order_list(0))
-    print(web_request().artemis_order_list(1))
-    print(web_request().artemis_order_list(2))
\ No newline at end of file
+    print(web_request().artemis_order_list(0, 1))
+    print(web_request().artemis_order_list(1, 1))
+    print(web_request().artemis_order_list(2, 1))
+    print(web_request().artemis_order_id_detail())
\ No newline at end of file

all_doctor_api/web_request.yaml

@@ -142,6 +142,15 @@ artemis_order_list:
   url: /api/web/artemis/order/list
   params:
     status: ${status}
+    page: ${page}
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录
+
+artemis_order_id_detail:
+  method: get
+  url: /api/web/artemis/order/509151034657/detail
+  params: {}
   data: {}
   json: {}
   isLogin: 1 #需要登录
\ No newline at end of file

host.yaml

 develop_host:
   backend: http://backend.paas-develop.env
 #  om: http://om.paas-develop.env
-#  doctor: http://doctor.paas-develop.env
+# doctor: http://doctor.paas-develop.env
 #  backend: https://backend.igengmei.com

path_setting.py

@@ -15,8 +15,8 @@ DIARY_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "diary_req
 #日记本详情页--字段判空
 DIARY_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/diary_data", "topic_data.yaml")
 #日记本关联美购
-DIARY_SERVICE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "diary_service.yaml")
 DIARY_SERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/diary_data", "diary_service.yaml")
+
 #日记本收藏&取消收藏
 DIARY_FAVOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/diary_data", "favor.yaml")
 # 日记本修改日记信息operation--目前好像直接用接口写无权限稍后解决
@@ -427,6 +427,10 @@ ADTYPELIST=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "art
 ADADDSHOPPINGCARTINFO=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "artemis_ad_add_shopping_cart_info.yaml")
 #医生后台-我的服务订单
 ORDERLIST=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "artemis_order_list.yaml")
+#医生后台-我的服务订单-已上线/待审核/待上线/已下线订单
+ORDERIDDETAIL=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "artemis_order_id_detail.yaml")
+#医生后台-我的服务订单-已购买订单
+VALUEORDERIDDETAIL=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "artemis_add_value_order_id_detail.yaml")
 #医生后台-点点通商品-概览
 CPCHOMEPAGE=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "cpc_homepage.yaml")
 
@@ -516,5 +520,9 @@ FREE_RECRUIT_BANNER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/fee
 FREE_RECRUIT_LIST_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "feed_request.yaml")
 FREE_RECRUIT_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_data", "free_recruit_list.yaml")
 
+#直播-点击【设置封面】
+PAGE_RULES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_request.yaml")
+PAGE_RULES = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "page_rules.yaml")
+
 if __name__ == '__main__':
     print("==========",LIVEYAML_CONFIG)

test_backend_case/conversation_case/test_message_read.py

@@ -15,6 +15,7 @@ class TestMessageRead:
     @pytest.mark.parametrize("param",messageread_data,ids=messageread_case)
     def test_message_read(self,param):
         r = conversation_request().message_read(param["current_city_id"], param["release"], param["message_ids"])
+        print(r)
         if r["error"] == 0:
             assert r["data"]["success"] == param["assert"]
         #if r["error"] == 0:

test_backend_case/janus_case/test_page_rules.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.janus_request import janus_request
+
+
+class TestPageRules:
+    data = BaseRequest().api_load(path_setting.PAGE_RULES)
+    page_rules_case, page_rules_data = get_ids(data, "page_rules")
+
+    @pytest.mark.parametrize("param", page_rules_data, ids=page_rules_case)
+    def test_page_rules(self, param):
+        r = janus_request().page_rules(param["version"], param["current_city_id"], param["page_name"])
+
+        if r["error"] == 0:
+             assert r["error_code"] == param["assert"]

test_backend_data/conversation_data/message_read.yaml

@@ -5,5 +5,5 @@ message_read:
     current_city_id: "beijing"
     release: 1
     #uqid: "1B519701-A4F5-453E-9D99-140B5AF697A0"
-    message_ids: [10622,10626,10646,10651]
-    assert: "true"
\ No newline at end of file
+    message_ids: "[10622,10626,10646,10651]"
+    assert: True
\ No newline at end of file

test_backend_data/im_data/send_msg.yaml

@@ -15,7 +15,7 @@ send_msg:
 
 #验证失败case
   -
-    case: "给咨询师发送消息失败"
+    case: "参数传值错误case：提示—服务器开小差了~"
     #current_city_id: beijing
     conversation_id: 463465
     is_system: 0

test_backend_data/janus_data/page_rules.yaml

+page_rules:
+  -
+  #直播-点击【设置封面】，成功调接口
+    case: "直播-点击【设置封面】，成功调接口"
+    version: "744.2"
+    current_city_id: "beijing"
+    page_name: "post_add_pic"
+    assert:
\ No newline at end of file

test_backend_data/private_conversation_data/private_conversation.yaml

@@ -15,7 +15,7 @@ private_conversation:
 
 #验证成功case
   -
-    case: "发送消息成功"
+    case: "未登录case:提示请登录"
     content: "你好"
     target_uid: 358749351
     referrer: "message_home"

test_doctor_case/web2_case/test_artemis_add_value_order_id_detail.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_doctor_api.web2_request import web2_request
+
+
+class TestArtemisAddValueOrderIdDetail:
+    data = BaseRequest().api_load(path_setting.VALUEORDERIDDETAIL)
+    addvalueorderiddetail_case, addvalueorderiddetail_data = get_ids(data, "artemis_add_value_order_id_detail")
+
+
+    @pytest.mark.parametrize("param",addvalueorderiddetail_data,ids=addvalueorderiddetail_case)
+    def test_artemis_add_value_order_id_detail(self, param):
+        '''我的服务订单-已购买'''
+        r = web2_request().artemis_add_value_order_id_detail()
+        if r["error"] == 0:
+            assert r["data"]["status"] == param["assert"]
+
+
+

test_doctor_case/web_case/test_artemis_order_id_detail.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_doctor_api.web_request import web_request
+
+
+class TestArtemisOrderIdDetail:
+    data = BaseRequest().api_load(path_setting.ORDERIDDETAIL)
+    orderiddetail_case, orderiddetail_data = get_ids(data, "artemis_order_id_detail")
+
+
+    @pytest.mark.parametrize("param",orderiddetail_data,ids=orderiddetail_case)
+    def test_artemis_order_id_detail(self, param):
+        '''我的服务订单'''
+        r = web_request().artemis_order_id_detail()
+        if r["error"] == 0:
+            assert r["data"]["detail_type"] == param["assert_detail_type"]
+            assert r["data"]["status"] == param["assert_status"]
+
+
+
+

test_doctor_case/web_case/test_artemis_order_list.py

@@ -14,7 +14,7 @@ class TestArtemisOrderList:
     @pytest.mark.parametrize("param",orderlist_data,ids=orderlist_case)
     def test_artemis_order_list(self, param):
         '''我的服务订单'''
-        r = web_request().artemis_order_list(param["status"])
+        r = web_request().artemis_order_list(param["status"], param["page"])
         if r["error"] == 0:
             orders = r.get("data").get("orders", [])
             assert len(orders) >= param["assert"]

test_doctor_data/web2_data/artemis_add_value_order_id_detail.yaml

+artemis_add_value_order_id_detail:
+  #已购买case
+  -
+    case: "已购买"
+    assert: "已购买"

test_doctor_data/web_data/artemis_order_id_detail.yaml

+artemis_order_id_detail:
+  #已上线订单服务订单详情页case
+  -
+    case: "已上线订单服务订单详情页case"
+    assert_status: 3
+    assert_detail_type: 6

test_doctor_data/web_data/artemis_order_list.yaml

@@ -3,36 +3,45 @@ artemis_order_list:
   -
     case: "我的服务订单请求失败case"
     status: ""
+    page: 1
     assert: 0
   -
     case: "我的服务订单-待支付广告包case"
     status: 0
+    page: 1
     assert: 0
   -
     case: "我的服务订单-已购买case"
     status: 1
+    page: 1
     assert: 0
   -
     case: "我的服务订单-待审核case"
     status: 2
+    page: 1
     assert: 0
   -
     case: "我的服务订单-待上线case"
     status: 3
+    page: 1
     assert: 0
   -
     case: "我的服务订单-上线中case"
     status: 4
+    page: 1
     assert: 0
   -
     case: "我的服务订单-已下线case"
     status: 5
+    page: 1
     assert: 0
   -
     case: "我的服务订单-已支付广告包case"
     status: 6
+    page: 1
     assert: 0
   -
     case: "我的服务订单-已关闭广告包case"
     status: 7
+    page: 1
     assert: 0