Merge branch 'common_dev' into zsq_dev

# Conflicts:
#	path_setting.py

all_doctor_api/glmer_request.py

@@ -28,7 +28,13 @@ class glmer_request(BaseRequest):
 
 
 
+    def service_detail(self) :
+        return self.api_send(self.REGISTER_URL["service_detail"])
+
+
+
 
 
 if __name__ == '__main__':
     print(glmer_request().service_register("激光溶脂瘦脸", "[236]", "true", "测试", "wangyang", "1624377600", "1627660800", "<p>12</p>", "https://heras.igengmei.com/service/2021/06/01/0b9b110e60", "UPCOYIJkZOMcdd9FDzpBqYjzWUh55fBpVi3AhWpL:nBdvXYz_CR7wNcuroo3TLyvuQiY=:eyJzY29wZSI6InZpZGVvIiwiZGVhZGxpbmUiOjE2MjI1MTg2NTd9", "0", "false", "1", "false", "0", '[{"gengmei_price":100,"original_price":200,"is_online":true}]',"PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
+    print(glmer_request().service_detail())
\ No newline at end of file

all_doctor_api/glmer_request.yaml

@@ -25,3 +25,12 @@ service_register:
     face_token: ${face_token}
   json: {}
   isLogin: 1
+
+
+service_detail:
+   method: get
+   url: /api/glmer/service/detail/5885425
+   params: {}
+   data: {}
+   json: {}
+   isLogin: 1

all_doctor_api/web2_request.py

@@ -8,6 +8,7 @@ class web2_request(BaseRequest):
         # self.SERVICE_REVIEW_URL = self.api_load(path_setting.SERVICE_REVIEW_URL)
 
     def service_list(self, page,pagesize,is_online,extra_filter_choice):
+        #我的商品查询列表
         self.params["page"] = page
         self.params["pagesize"] = pagesize
         self.params["is_online"] = is_online
@@ -15,25 +16,34 @@ class web2_request(BaseRequest):
         return self.api_send(self.SERVICE_URL["service_list"])
 
     def service_review_list(self,page,pagesize,type):
+        #商品审核查询列表
         self.params["page"] = page
         self.params["pagesize"] = pagesize
         self.params["type"] = type
         return self.api_send(self.SERVICE_URL["service_review_list"])
 
     def servicereview_option(self,id, type,csrfmiddlewaretoken):
+        #商品审核-撤回审核、取消申请
         self.params["id"] = id
         self.params["type"] = type
         self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken
         return self.api_send(self.SERVICE_URL["servicereview_option"])
 
-
     def tag_all(self) :
+        #发布商品-选择类目跳转发布商品页面tag接口
         return self.api_send(self.SERVICE_URL["tag_all"])
 
+    def service_delete(self,is_delete,service_register_id,csrfmiddlewaretoken):
+        #我的商品-删除商品
+        self.params["is_delete"] = is_delete
+        self.params["service_register_id"] = service_register_id
+        self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken
+        return self.api_send(self.SERVICE_URL["service_delete"])
+
 
 if __name__ == '__main__':
     print(web2_request().service_list("1", "10", "-1", "-1"))
     print(web2_request().service_review_list("1", "10", "0"))
     print(web2_request().servicereview_option("209989", "1", "PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
-
     print(web2_request().tag_all())
+    print(web2_request().service_delete("1","209863","PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))

all_doctor_api/web2_request.yaml

@@ -51,3 +51,14 @@ tag_all:
   data: {}
   json: {}
   isLogin: 1
+
+service_delete:
+  method: POST
+  url: /api/web2/service/delete
+  param: {}
+  data:
+    is_delete: ${is_delete}
+    service_register_id: ${service_register_id}
+    csrfmiddlewaretoken: ${csrfmiddlewaretoken}
+  json: {}
+  isLogin: 1

all_doctor_api/web_request.py

@@ -4,16 +4,17 @@ from in_common.base_request import BaseRequest
 
 class web_request(BaseRequest):
     def __init__(self):
-        self.data = self.api_load(path_setting.ACCOUNT_URL)
+        self.ACCOUNT_URL = self.api_load(path_setting.ACCOUNT_URL)
 
     def account_unreadbadgecount(self) :
-        return self.api_send(self.data["account_unreadbadgecount"])
+        return self.api_send(self.ACCOUNT_URL["account_unreadbadgecount"])
 
     def article_videotoken(self) :
-        return self.api_send(self.data["article_videotoken"])
+        return self.api_send(self.ACCOUNT_URL["article_videotoken"])
 
     def doctor_submechanisms(self) :
-        return self.api_send(self.data["doctor_submechanisms"])
+        return self.api_send(self.ACCOUNT_URL["doctor_submechanisms"])
+
 
     def conversation(self, is_star, page):
         self.params["is_star"] = is_star
@@ -21,6 +22,12 @@ class web_request(BaseRequest):
         return self.api_send(self.data["conversation"])
 
 
+    def service_offline(self,id,csrfmiddlewaretoken):
+        self.params["id"] = id
+        self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken
+        return self.api_send(self.ACCOUNT_URL["service_offline"])
+
+
 
 
 
@@ -31,3 +38,5 @@ if __name__ == '__main__':
     print(web_request().doctor_submechanisms())
     print("列表页")
     print(web_request().conversation(0, 1))
+    print(web_request().service_offline("209992", "PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
+

all_doctor_api/web_request.yaml

@@ -37,3 +37,14 @@ conversation:
   json: {}
   isLogin: 1 #需要登录
 
+
+service_offline:
+  method: post
+  url: /api/web/service/offline
+  param: {}
+  data:
+    id: ${id}
+    csrfmiddlewaretoken: ${csrfmiddlewaretoken}
+  json: {}
+  isLogin: 1
+

host.yaml

 develop_host:
+
  # backend: http://backend.paas-develop.env
   doctor: http://doctor.paas-develop.env
+

path_setting.py

@@ -55,6 +55,15 @@ DOCTOR_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "do
 REGISTER_URL=os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "glmer_request.yaml")
 REGISTER_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/glmer_data", "service_register.yaml")
 
+#医生后台-编辑商品
+DETAIL_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/glmer_data", "service_detail.yaml")
+
+#医生后台-我的商品-下线商品
+OFFLINE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "service_offline.yaml")
+
+#医生后台-我的商品-删除商品
+DELETE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "service_delete.yaml")
+
 #搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
 KEYWORDS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "keywords.yaml")

test_doctor_case/glmer_case/test_service_detail.py

+import pytest
+
+import path_setting
+from all_doctor_api.glmer_request import glmer_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestServiceDetail:
+    service_detail = BaseRequest().api_load(path_setting.DETAIL_DATA)
+    ServiceDetail_case, ServiceDetail_data = get_ids(service_detail, "service_detail")
+
+    @pytest.mark.parametrize("params",ServiceDetail_data,ids=ServiceDetail_case)
+    def test_ServiceDetail(self,params):
+
+        r =glmer_request().service_detail()
+        print("------",r)
+        if r["code"] == 0:
+            assert r["code"] == params["assert"]
\ No newline at end of file

test_doctor_case/glmer_case/test_service_register.py

@@ -14,7 +14,6 @@ class TestServiceRegister:
     def test_ServiceRegister(self,params):
 
         r =glmer_request().service_register(params['name'],params['project_type'],params['upgrade'],params['short_description'],params['doctor_id'],params['start_time'],params['end_time'],params['photo_details'],params['image_header'],params['video_token'],params['service_type'],params['is_specialreview'],params['reservation'],params['have_extra_pay'],params['is_draft'],params['items'],params['csrfmiddlewaretoken'])
-        print("======",r)
 
         if r["code"] == 0:
             assert r["code"] == params["assert"]

test_doctor_case/web2_case/test_service_delete.py

+import pytest
+
+import path_setting
+from all_doctor_api.web2_request import web2_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestServiceDelete:
+    service_delete=BaseRequest().api_load(path_setting.DELETE_DATA)
+
+    ServiceDelete_case, ServiceDeletet_data = get_ids(service_delete, "service_delete")
+
+    @pytest.mark.parametrize("params", ServiceDeletet_data, ids=ServiceDelete_case)
+
+    def test_ServiceDelete(self, params):
+
+        r = web2_request().service_delete(params['is_delete'], params['service_register_id'], params['csrfmiddlewaretoken'])
+        print("======", r)
+
+        if r["error"] == 0:
+            assert r["error"] == params["assert"]
+        # elif r["error"] == 1:
+        #     assert r["message"] == params["assert"]

test_doctor_case/web_case/test_doctor_submechanisms.py

@@ -15,7 +15,6 @@ class TestDoctorSubmechanisms:
     def test_DoctorSubmechanisms_data(self,param):
 
         r = web_request().doctor_submechanisms()
-        print("=======",r)
         if r["error"] == 0:
             assert r["error"] == param["assert"]
         # elif r["error"] == 1:

test_doctor_case/web_case/test_service_offline.py

+import pytest
+
+import path_setting
+from all_doctor_api.web_request import web_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestServiceOffline:
+
+    service_offline = BaseRequest().api_load(path_setting.OFFLINE_DATA)
+    ServiceOffline_case, ServiceOffline_data = get_ids(service_offline, "service_offline")
+
+    @pytest.mark.parametrize("params",ServiceOffline_data,ids=ServiceOffline_case)
+    def test_ServiceOffline_data(self,params):
+
+        r = web_request().service_offline(params['id'],params['csrfmiddlewaretoken'])
+        print("=======",r)
+        if r["error"] == 0:
+            assert r["error"] == params["assert"]

test_doctor_data/glmer_data/service_detail.yaml

+service_detail:
+  -
+    case:  "编辑商品-进入商品详情页 "
+    assert: 0
\ No newline at end of file

test_doctor_data/web2_data/service_delete.yaml

+service_delete:
+#我的商品-删除下线商品
+  -
+    case:  "我的商品-删除下线商品"
+    is_delete: "1"
+    service_register_id: "209863"
+    csrfmiddlewaretoken: "PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"
+    assert: 0
\ No newline at end of file

test_doctor_data/web_data/service_offline.yaml

+service_offline:
+  -
+    case:  "我的商品-下线商品"
+    id: 209992
+    csrfmiddlewaretoken: PC8uTySuxipukIMuqNV1OPB376C2ZZ3g
+    assert: 0
\ No newline at end of file