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

.gitignore

@@ -104,4 +104,5 @@ venv.bak/
 # mypy
 .mypy_cache/
 
-host.yaml
+host.yaml
\ No newline at end of file
+*/.DS_Store
\ No newline at end of file

all_backend_api/face_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class face_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.FACE_DIARY_CARDS_CONFIG)
+
+
+    # 根据多个标签推荐日记
+    def diarys_cards(self,facial_type2tag_names):
+        self.params["facial_type2tag_names"] = facial_type2tag_names
+        return self.api_send(self.data["face_diarys"])
+
+
+
+
+if __name__ == '__main__':
+    facial_type2tag_names = '{"2":["玻尿酸垫下巴","自体脂肪垫下巴"],"3":["半永久纹眉","植眉"]}'
+    print(face_request().diarys_cards(facial_type2tag_names))

all_backend_api/face_request.yaml

+face_diarys:
+  method: get
+  url: /api/face/diary/cards
+  params:
+    facial_type2tag_names: ${facial_type2tag_names}
\ No newline at end of file

all_backend_api/gmai_request.py

@@ -52,14 +52,18 @@ class gmai_request(BaseRequest):
         self.params["cheek_style_classify_id"] = cheek_style_classify_id
         return self.api_send(self.data["plastic_analystic_v2"])
 
-
+    # 获取3D变脸风格参数
+    def plastic_cheek_style_classify(self,version):
+        self.params["version"] = version
+        return self.api_send(self.data["plastic_cheek_style_classify"])
 
 
 if __name__ == '__main__':
+    print(gmai_request().plastic_cheek_style_classify("7.44.0"))
     # landmark = '[{"x":168.96603,"y":496.76886},{"x":168.35735,"y":527.7101},{"x":169.548,"y":558.3961},{"x":171.72018,"y":588.8369},{"x":174.93307,"y":619.26794},{"x":179.31195,"y":649.03467},{"x":184.17123,"y":678.6978},{"x":191.05627,"y":707.8003},{"x":200.86497,"y":735.76196},{"x":214.62796,"y":761.79736},{"x":231.40042,"y":785.7622},{"x":250.59685,"y":807.22406},{"x":272.07196,"y":826.8049},{"x":295.4251,"y":843.86194},{"x":321.47278,"y":856.83124},{"x":349.9967,"y":864.5885},{"x":379.85767,"y":866.998},{"x":409.25287,"y":865.863},{"x":437.7829,"y":859.18054},{"x":463.35132,"y":846.88574},{"x":486.354,"y":830.38916},{"x":507.7304,"y":811.95135},{"x":527.778,"y":791.59247},{"x":545.7143,"y":769.32104},{"x":561.4353,"y":745.4949},{"x":573.70917,"y":719.9794},{"x":583.3716,"y":690.47156},{"x":591.3898,"y":660.6565},{"x":598.52515,"y":631.38513},{"x":604.5137,"y":601.75684},{"x":609.14844,"y":572.0621},{"x":612.0713,"y":541.85956},{"x":613.5779,"y":511.5329},{"x":203.42625,"y":444.83066},{"x":229.21182,"y":410.30188},{"x":270.9198,"y":399.64984},{"x":313.56497,"y":407.32513},{"x":354.0185,"y":422.54175},{"x":441.31384,"y":427.71216},{"x":482.0569,"y":416.21152},{"x":524.1508,"y":412.38593},{"x":563.6658,"y":426.22824},{"x":585.87964,"y":462.41913},{"x":394.46844,"y":504.41254},{"x":393.96762,"y":546.5007},{"x":393.30322,"y":588.8532},{"x":392.592,"y":631.0979},{"x":342.77267,"y":664.1739},{"x":364.95947,"y":668.7595},{"x":390.1893,"y":673.2006},{"x":415.25336,"y":670.5106},{"x":436.7552,"y":666.998},{"x":242.81853,"y":506.60803},{"x":262.98138,"y":497.55713},{"x":305.08954,"y":499.77777},{"x":321.22906,"y":513.3391},{"x":301.56146,"y":521.4862},{"x":260.00668,"y":519.3686},{"x":462.97388,"y":517.84485},{"x":480.18396,"y":505.8437},{"x":522.09973,"y":506.45386},{"x":540.26013,"y":517.4052},{"x":523.0011,"y":528.3126},{"x":482.06146,"y":527.1489},{"x":239.75659,"y":436.6534},{"x":277.67075,"y":433.85788},{"x":315.04602,"y":438.8376},{"x":351.56638,"y":447.66888},{"x":441.58453,"y":452.58017},{"x":477.96664,"y":447.28973},{"x":515.05225,"y":445.83618},{"x":551.5746,"y":451.62656},{"x":284.38373,"y":496.0074},{"x":280.49805,"y":523.8891},{"x":284.44955,"y":508.43988},{"x":501.19617,"y":503.6411},{"x":502.51047,"y":530.9885},{"x":501.47836,"y":515.5879},{"x":357.51913,"y":508.84628},{"x":428.91504,"y":511.1767},{"x":341.02893,"y":607.7458},{"x":442.021,"y":610.8187},{"x":324.796,"y":641.13324},{"x":456.35925,"y":645.5844},{"x":304.6747,"y":728.90186},{"x":334.5838,"y":715.599},{"x":369.0162,"y":710.4512},{"x":390.31683,"y":714.9321},{"x":411.64032,"y":711.3696},{"x":445.83594,"y":718.7887},{"x":474.80075,"y":735.1745},{"x":451.05292,"y":753.0734},{"x":421.3767,"y":761.7219},{"x":390.41638,"y":763.2075},{"x":358.4326,"y":759.44385},{"x":328.53287,"y":748.5295},{"x":311.38818,"y":729.83777},{"x":350.23193,"y":734.1919},{"x":390.38123,"y":737.72284},{"x":429.7071,"y":736.18054},{"x":468.49692,"y":735.4535},{"x":430.71494,"y":739.61053},{"x":391.11005,"y":741.01697},{"x":349.98578,"y":737.08875},{"x":284.5382,"y":508.54742},{"x":501.50644,"y":515.53107}]'
     # print(gmai_request().plastic_analystic_v2("869412032478155", "2021/06/01/1524/8a28dd0a3b8e",landmark,1))
     # print(gmai_request().simulate_conf("-1"))
-    print(gmai_request().simulate_analyze("869412032478155","2021/06/02/1456/68c702f50309","3","7"))
+    # print(gmai_request().simulate_analyze("869412032478155","2021/06/02/1456/68c702f50309","3","7"))
     # landmark = '[{"x":248.60858,"y":454.0434},{"x":247.92863,"y":476.7021},{"x":248.8779,"y":499.36874},{"x":251.12755,"y":521.8638},{"x":254.58401,"y":544.24164},{"x":259.10333,"y":566.1669},{"x":264.02515,"y":588.0588},{"x":270.59506,"y":609.44214},{"x":279.6361,"y":629.6998},{"x":291.60773,"y":648.29407},{"x":305.6806,"y":665.26465},{"x":321.33615,"y":680.4736},{"x":338.2943,"y":694.64526},{"x":356.13144,"y":707.5386},{"x":375.71283,"y":717.8617},{"x":397.27545,"y":724.19965},{"x":419.9613,"y":726.1914},{"x":441.62817,"y":725.2733},{"x":462.6242,"y":719.917},{"x":481.41635,"y":710.3818},{"x":498.45187,"y":697.98035},{"x":514.59436,"y":684.40234},{"x":529.7782,"y":669.4685},{"x":543.08704,"y":653.1195},{"x":554.60706,"y":635.73456},{"x":563.3266,"y":617.3142},{"x":570.0075,"y":596.0911},{"x":575.7123,"y":574.78046},{"x":581.05774,"y":554.0385},{"x":585.48157,"y":533.1105},{"x":588.66907,"y":512.06683},{"x":590.4706,"y":490.68823},{"x":591.2653,"y":469.50403},{"x":279.37485,"y":410.2143},{"x":299.98352,"y":383.6742},{"x":331.64465,"y":375.0197},{"x":364.35858,"y":381.4741},{"x":395.4406,"y":394.20447},{"x":466.45248,"y":397.95},{"x":496.4015,"y":389.2094},{"x":527.33295,"y":386.7473},{"x":555.7313,"y":398.20285},{"x":571.48254,"y":425.62354},{"x":427.4568,"y":456.95285},{"x":426.77496,"y":483.84033},{"x":426.04883,"y":510.83325},{"x":425.32236,"y":537.75256},{"x":385.83856,"y":572.9858},{"x":403.71045,"y":573.0551},{"x":423.23145,"y":574.53534},{"x":442.28857,"y":574.4508},{"x":459.13876,"y":574.9396},{"x":307.80756,"y":458.6329},{"x":323.8154,"y":450.41855},{"x":359.07312,"y":453.8022},{"x":371.75238,"y":466.2728},{"x":355.36838,"y":470.9956},{"x":321.71375,"y":468.2021},{"x":479.14362,"y":470.68353},{"x":492.57837,"y":459.77023},{"x":526.78955,"y":459.34094},{"x":540.76917,"y":469.22626},{"x":526.91675,"y":477.2774},{"x":494.3828,"y":476.6469},{"x":307.39963,"y":402.42038},{"x":336.54358,"y":400.2494},{"x":365.31128,"y":405.05597},{"x":393.4093,"y":412.95276},{"x":466.55408,"y":416.23398},{"x":493.2259,"y":412.04782},{"x":520.28235,"y":410.81372},{"x":546.7446,"y":415.7663},{"x":341.78073,"y":449.21838},{"x":338.20166,"y":471.98853},{"x":342.39044,"y":460.15692},{"x":509.66327,"y":456.7909},{"x":510.57373,"y":479.22314},{"x":508.77704,"y":467.26038},{"x":399.44565,"y":461.61548},{"x":453.4572,"y":463.86423},{"x":384.4139,"y":527.5456},{"x":463.68613,"y":530.3157},{"x":369.6485,"y":554.5674},{"x":475.98178,"y":558.04224},{"x":358.72372,"y":632.25916},{"x":379.92645,"y":612.99927},{"x":406.5278,"y":600.8932},{"x":422.78525,"y":604.4064},{"x":439.0467,"y":601.5054},{"x":463.0918,"y":613.59924},{"x":480.34888,"y":633.28406},{"x":463.28207,"y":645.23676},{"x":442.62195,"y":651.3627},{"x":420.9704,"y":652.71295},{"x":398.036,"y":651.2082},{"x":376.4565,"y":644.82745},{"x":363.59555,"y":631.5963},{"x":392.39032,"y":626.09314},{"x":422.20786,"y":626.16754},{"x":449.31833,"y":626.3133},{"x":475.72333,"y":632.3503},{"x":448.87988,"y":625.9888},{"x":421.7511,"y":626.1827},{"x":392.28534,"y":625.9193},{"x":342.4176,"y":460.03064},{"x":508.8405,"y":467.07236}]'
     # 测颜值和 上次结果
     # print(gmai_request().plastic_analysis_v3("869412032478155", "2021/06/01/1524/8a28dd0a3b8e",landmark,1))

all_backend_api/gmai_request.yaml

@@ -56,4 +56,11 @@ plastic_analystic_v2:
   data:
     image_url: ${image_url}
     landmark: ${landmark}
-    cheek_style_classify_id: ${cheek_style_classify_id}
+    cheek_style_classify_id: ${cheek_style_classify_id}
\ No newline at end of file
+
+
+plastic_cheek_style_classify:
+  method: get
+  url: /gm_ai/plastic/cheek_style_classify
+  params:
+    version: ${version}
\ No newline at end of file

all_backend_api/hybrid_promotion_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class hybrid_promotion_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.HYBRID_PROMOTION_CONFIG)
+
+    #商祥页-sku信息
+    def related_service_data(self, service_id, page):
+        self.params["service_id"] = service_id
+        self.params["page"] = page
+        return self.api_send(self.data["related_service_data"])
+
+if __name__ == '__main__':
+    #打印商祥页-推荐商品列表接口返回
+    print(hybrid_promotion_request().related_service_data("5815040", 1))
+
+
+
+

all_backend_api/hybrid_promotion_request.yaml

+#商祥页-推荐商品列表
+related_service_data:
+  method: get
+  url: /hybrid/promotion/related_service/_data
+  params:
+    service_id: ${service_id}
+    page: ${page}
+  data: {}
+  json: {}
\ No newline at end of file

all_backend_api/janus_request.py

@@ -74,6 +74,12 @@ class janus_request(BaseRequest):
         self.params["service_item_id"] = service_item_id
         return self.api_send(self.data["sku_info"])
 
+    #商祥页-美券列表-我的美券点击-744版本及以后-新接口
+    def product_coupon_my_list(self, start_num, tab_id):
+        self.params["start_num"] = start_num
+        self.params["tab_id"] = tab_id
+        return self.api_send(self.data["product_coupon_my_list"])
+
     # 品类聚合页面商品列表
     def tag_service(self, size, tag_ids, offset, tag_id, version, device_id):
         print("fgx")
@@ -104,6 +110,70 @@ class janus_request(BaseRequest):
 
         return  self.api_send(self.data['keyword_tip'])
 
+    #次卡-确认订单
+    def beauty_card_order_confirm(self, sku_id, number, use_bc_coupon, bc_coupon_id):
+        self.params["sku_id"] = sku_id
+        self.params["number"] = number
+        self.params["use_bc_coupon"] = use_bc_coupon
+        self.params["bc_coupon_id"] = bc_coupon_id
+        return self.api_send(self.data["beauty_card_order_confirm"])
+
+    #次卡-确认订单页面-修改手机号
+    def beauty_card_update_phone(self, authorize_phone, authorize_phone_type, vfc_code):
+        self.params["authorize_phone"] = authorize_phone
+        self.params["authorize_phone_type"] = authorize_phone_type
+        self.params["vfc_code"] = vfc_code
+        return self.api_send(self.data["beauty_card_update_phone"])
+
+    #次卡-提交订单
+    def beauty_card_order_submit(self, phone, sku_id, number, is_doctor_see, gain_coupon_id, deduction_price):
+        self.params["phone"] = phone
+        self.params["sku_id"] = sku_id
+        self.params["number"] = number
+        self.params["is_doctor_see"] = is_doctor_see
+        self.params["gain_coupon_id"] = gain_coupon_id
+        self.params["deduction_price"] = deduction_price
+        return self.api_send(self.data["beauty_card_order_submit"])
+
+    #次卡-支付平台
+    def beauty_card_payment_method(self, payment_id):
+        self.params["payment_id"] = payment_id
+        return self.api_send(self.data["beauty_card_payment_method"])
+
+    #次卡-微信支付
+    def beauty_card_prepay_wechat(self, payment_id):
+        self.params["payment_id"] = payment_id
+        return self.api_send(self.data["beauty_card_prepay_wechat"])
+
+    #次卡-支付宝支付
+    def beauty_card_prepay_alipay(self, is_huabei, payment_id):
+        self.params["is_huabei"] = is_huabei
+        self.params["payment_id"] = payment_id
+        return self.api_send(self.data["beauty_card_prepay_alipay"])
+
+    #次卡-订单详情
+    def beauty_card_payment_detail(self, payment_id):
+        self.params["payment_id"] = payment_id
+        return self.api_send(self.data["beauty_card_payment_detail"])
+
+    #次卡-取消订单
+    def beauty_card_payment_delete(self, payment_id):
+        self.params["payment_id"] = payment_id
+        return self.api_send(self.data["beauty_card_payment_delete"])
+
+    #次卡-申请退款
+    def beauty_card_refund_info(self, order_id):
+        self.params["order_id"] = order_id
+        return self.api_send(self.data["beauty_card_refund_info"])
+
+    #次卡-提交退款申请
+    def beauty_card_refund_submit(self, order_id, reason_id, reason_text, reason_type):
+        self.params["order_id"] = order_id
+        self.params["reason_id"] = reason_id
+        self.params["reason_text"] = reason_text
+        self.params["reason_type"] = reason_type
+        return self.api_send(self.data["beauty_card_refund_submit"])
+
     # 新版本我的美券列表
     def product_my_list(self,start_num,tab_id):
         self.params['start_num'] = start_num
@@ -112,19 +182,43 @@ class janus_request(BaseRequest):
 
 
 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"))
-
-    #品类聚合页面商品列表接口返回
-    print(janus_request().tag_service())
-    print("fgx")
-
-    #品类聚合页面标签和专场
-    print(janus_request().polymer())
-    print("fgx")
-
-    print(janus_request().product_my_list(0, 0))
+    # #打印购物车-猜你喜欢列表接口返回
+    # 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")
\ No newline at end of file
+    #
+    # #打印次卡-确认订单接口返回
+    # 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().beauty_card_prepay_wechat("101353630959868"))
+    # # 打印次卡-支付宝支付接口返回
+    # print(janus_request().beauty_card_prepay_alipay(0, "101353630959868"))
+    # #打印次卡 - 订单详情接口返回
+    # print(janus_request().beauty_card_payment_detail("101353630959868"))
+    # #打印次卡 - 取消订单接口返回
+    # print(janus_request().beauty_card_payment_delete("101353630959868"))
+    # #打印次卡-申请退款接口返回
+    # print(janus_request().beauty_card_refund_info("102217820485006"))
+    #打印次卡-提交退款申请接口返回
+    print(janus_request().beauty_card_refund_submit("102813852173916", 3, "个人身体原因", 0))
+
+    # print(janus_request().product_my_list(0, 0))
+

all_backend_api/janus_request.yaml

@@ -58,6 +58,17 @@ sku_info:
   data: {}
   json: {}
 
+#商祥页-美券列表-我的美券点击-744版本及以后-新接口
+product_coupon_my_list:
+  method: get
+  url: /api/janus/product/coupon/my_list
+  params:
+    start_num: ${start_num}
+    tab_id: ${tab_id}
+  data: {}
+  json: {}
+  isLogin: 1
+
 #品类聚合页面商品列表的
 tag_service:
   method: GET
@@ -96,7 +107,132 @@ keyword_tip:
   data: {}
   json: {}
 
+#次卡-确认订单
+beauty_card_order_confirm:
+  method: post
+  url: /api/janus/beauty_card/order/confirm
+  params: {}
+  data:
+    sku_id: ${sku_id}
+    number: ${number}
+    bctraceid: ""
+    use_bc_coupon: ${use_bc_coupon}
+    bc_coupon_id: ${bc_coupon_id}
+  json: {}
+  isLogin: 1
+
+#次卡-确认订单页面-修改手机号
+beauty_card_update_phone:
+  method: post
+  url: /api/janus/beauty_card/update_phone
+  params: {}
+  data:
+    authorize_phone: ${authorize_phone}
+    authorize_phone_type: ${authorize_phone_type}
+    vfc_code: ${vfc_code}
+  json: {}
+  isLogin: 1
+
+#次卡-提交订单
+beauty_card_order_submit:
+  method: post
+  url: /api/janus/beauty_card/order/submit
+  params: {}
+  data:
+    phone: ${phone}
+    sku_id: ${sku_id}
+    number: ${number}
+    is_doctor_see: ${is_doctor_see}
+    gain_coupon_id: ${gain_coupon_id}
+    deduction_price: ${deduction_price}
+  json: {}
+  isLogin: 1
+
+#次卡-支付平台
+beauty_card_payment_method:
+  method: get
+  url: /api/janus/beauty_card/payment_method
+  params:
+    payment_id: ${payment_id}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#次卡-微信支付
+beauty_card_prepay_wechat:
+  method: post
+  url: /api/janus/beauty_card/prepay/wechat
+  params: {}
+  data:
+    payment_id: ${payment_id}
+  json: {}
+  isLogin: 1
+
+#次卡-支付宝支付
+beauty_card_prepay_alipay:
+  method: post
+  url: /api/janus/beauty_card/prepay/alipay
+  params: {}
+  data:
+    is_huabei: ${is_huabei}
+    payment_id: ${payment_id}
+  json: {}
+  isLogin: 1
+
+##次卡-支付宝支付-花呗分期
+#beauty_card_prepay_alipay_huabei:
+#  method: post
+#  url: /api/janus/beauty_card/prepay/alipay
+#  params: {}
+#  data:
+#    huabei_period: ${huabei_period}
+#    is_huabei: ${is_huabei}
+#    payment_id: ${payment_id}
+#  json: {}
+#  isLogin: 1
+
+#次卡-订单详情
+beauty_card_payment_detail:
+  method: get
+  url: /api/janus/beauty_card/payment/detail
+  params:
+    payment_id: ${payment_id}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#次卡-取消订单
+beauty_card_payment_delete:
+  method: post
+  url: /api/janus/beauty_card/payment/delete
+  params: {}
+  data:
+    payment_id: ${payment_id}
+  json: {}
+  isLogin: 1
 
+#次卡-申请退款
+beauty_card_refund_info:
+  method: get
+  url: /api/janus/beauty_card/refund/info
+  params:
+    order_id: ${order_id}
+  data: {}
+  json: {}
+  isLogin: 1
+
+#次卡-提交退款申请
+beauty_card_refund_submit:
+  method: post
+  url: /api/janus/beauty_card/refund/submit
+  params: {}
+  data:
+    order_id: ${order_id}
+    reason_id: ${reason_id}
+    reason_text: ${reason_text}
+    reason_type: ${reason_type}
+  json: {}
+  isLogin: 1
 
 #新版本我的美券
 coupon_my_list:

all_backend_api/orders_request.py

@@ -15,8 +15,11 @@ class orders_request(BaseRequest):
 
         return self.api_send(self.data["my_v2"])
 
-
-
+    #我的订单-各状态订单数量
+    def my_status(self):
+        return self.api_send(self.data["my_status"])
 
 if __name__ == '__main__':
     print(orders_request().my_v2(0,1,"7.44.0"))
+    #打印我的订单-各状态订单数量接口返回
+    print(orders_request().my_status())

all_backend_api/orders_request.yaml

@@ -6,3 +6,12 @@ my_v2:
     status: ${status}
     version: ${version}
   isLogin: 1
+
+#我的订单-各状态订单数量
+my_status:
+  method: get
+  url: /api/orders/my/status
+  params: {}
+  data: {}
+  json: {}
+  isLogin: 1

all_backend_api/pay_request.py

@@ -14,11 +14,11 @@ class pay_request(BaseRequest):
         self.params["version"] = version
         self.params["is_huabei"] = is_huabei
         self.params["huabei_period"] = huabei_period
-        return self.api_send(self.preview["pay_v1"])
+        return self.api_send(self.wechat_pay["alipay_prepay"])
 
-    def jump(self,ee,settlement_id):
+    def jump(self,settlement_id):
         self.params["settlement_id"] = settlement_id
-        return self.api_send(self.preview["create_v1"])
+        return self.api_send(self.wechat_pay["jump"])
 
 
 if __name__ == '__main__':

all_backend_api/pay_request.yaml

@@ -8,4 +8,25 @@ wechat_prepay:
     settlement_id: ${settlement_id}
   isLogin: 1
 
+alipay_prepay:
+  method: post
+  url: /pay/alipay/prepay
+  params:
+    current_city_id: "beijing"
+    version: 7.44.0
+  data:
+    settlement_id: ${settlement_id}
+    version: ${version}
+    is_huabei: ${is_huabei}
+    huabei_period: ${huabei_period}
+  isLogin: 1
 
+jump:
+  method: post
+  url: /pay/jump
+  params:
+    current_city_id: "beijing"
+    version: 7.44.0
+  data:
+    settlement_id: ${settlement_id}
+  isLogin: 1

all_backend_api/settlement_request.py

@@ -37,7 +37,17 @@ class settlement_request(BaseRequest):
         self.params["id"] = id
         return self.api_send(self.preview["pay"])
 
+    def detail(self, id):
+        self.params["id"] = id
+        return self.api_send(self.preview["detail"])
+
+    def delete(self, id, cancel_reason_value):
+        self.params["id"] = id
+        self.params["cancel_reason_value"] = cancel_reason_value
+        return self.api_send(self.preview["delete"])
+
+
 
 if __name__ == '__main__':
     # print(settlement_request().preview_v1("beijing", "599428", 1, 1, 1, "true", 0))
-    print(settlement_request().create_v1(599428, 1, "", 0,1, "", [], 0))
+    print(settlement_request().delete("522139664651","不想买了"))
\ No newline at end of file

all_backend_api/settlement_request.yaml

@@ -54,3 +54,25 @@ pay:
   data: {}
   isLogin: 1
 
+detail:
+  method: get
+  url: /api/settlement/detail
+  params:
+    current_city_id: "beijing"
+    id: ${id}
+    version: 7.44.0
+  data: {}
+  isLogin: 1
+
+delete:
+  method: post
+  url: /api/settlement/delete
+  params:
+    current_city_id: "beijing"
+    version: 7.44.0
+  data:
+    id: ${id}
+    cancel_reason_value: ${cancel_reason_value}
+  json: {}
+  isLogin: 1
+

all_doctor_api/web2_request.py

@@ -40,6 +40,13 @@ class web2_request(BaseRequest):
         self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken
         return self.api_send(self.SERVICE_URL["service_delete"])
 
+    def service_deletelist(self,page):
+        #我的商品-商品回收站
+        self.params["page"] = page
+        return self.api_send(self.SERVICE_URL["service_deletelist"])
+
+
+
 
 if __name__ == '__main__':
     print(web2_request().service_list("1", "10", "-1", "-1"))
@@ -47,3 +54,5 @@ if __name__ == '__main__':
     print(web2_request().servicereview_option("209989", "1", "PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
     print(web2_request().tag_all())
     print(web2_request().service_delete("1","209863","PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
+    print(web2_request().service_deletelist("1"))#商品回收站
+

all_doctor_api/web2_request.yaml

@@ -6,10 +6,7 @@ service_list:
     pagesize: ${pagesize}
     is_online: ${is_online}
     extra_filter_choice: ${extra_filter_choice}
-  data:
-    phone_num: ${phone_num}
-    vfc_code: ${vfc_code}
-    face_token: ${face_token}
+  data: {}
   json: {}
   isLogin: 1
 
@@ -21,10 +18,7 @@ service_review_list:
      page: ${page}
      pagesize: ${pagesize}
      type: ${type}
-   data:
-     phone_num: ${phone_num}
-     vfc_code: ${vfc_code}
-     face_token: ${face_token}
+   data: {}
    json: {}
    isLogin: 1
 
@@ -37,9 +31,6 @@ servicereview_option:
      id: ${id}
      type: ${type}
      csrfmiddlewaretoken: ${csrfmiddlewaretoken}
-     phone_num: ${phone_num}
-     vfc_code: ${vfc_code}
-     face_token: ${face_token}
    json: {}
    isLogin: 1
 
@@ -55,10 +46,23 @@ tag_all:
 service_delete:
   method: POST
   url: /api/web2/service/delete
-  param: {}
+  params: {}
   data:
     is_delete: ${is_delete}
     service_register_id: ${service_register_id}
     csrfmiddlewaretoken: ${csrfmiddlewaretoken}
   json: {}
   isLogin: 1
+
+
+
+
+
+service_deletelist:
+   method: get
+   url: /api/web2/service/delete/list
+   params:
+     page: ${page}
+   data: {}
+   json: {}
+   isLogin: 1

all_doctor_api/web_request.py

@@ -40,6 +40,22 @@ class web_request(BaseRequest):
         self.params["doctor_user_id"] = doctor_user_id
         return self.api_send(self.ACCOUNT_URL["conversation_coupon"])
 
+    def service_all(self):
+        return self.api_send(self.ACCOUNT_URL["service_all"])
+
+    # def file_upload(self, img_type,csrfmiddlewaretoken,id,name,type,lastModifiedDate,size,file):
+    #     self.params["img_type"] = img_type
+    #     self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken
+    #     self.params["id"] = id
+    #     self.params["name"] = name
+    #     self.params["type"] = type
+    #     self.params["lastModifiedDate"] = lastModifiedDate
+    #     self.params["size"] = size
+    #     self.params["file"] = file
+    #     return self.api_send(self.ACCOUNT_URL["file_upload"])
+
+
+
 
 if __name__ == '__main__':
     print(web_request().account_unreadbadgecount())
@@ -52,3 +68,5 @@ if __name__ == '__main__':
     print("发送")
     print(web_request().conversation_diary(602329))
     print(web_request().conversation_coupon(602329))
+    print(web_request().service_all())
+    # print(web_request().file_upload("19","PC8uTySuxipukIMuqNV1OPB376C2ZZ3g","WU_FILE_0","lADPDg7mQdiUTiLNAZDNAZA_400_400.jpg_720x720g.jpg","image/jpeg","Mon Apr 26 2021 11:29:45 GMT+0800 (中国标准时间)","17688","(binary)"))
\ No newline at end of file

all_doctor_api/web_request.yaml

@@ -81,3 +81,29 @@ conversation_coupon:
   data: {}
   json: {}
   isLogin: 1 #需要登录
+
+
+service_all:
+  method: get
+  url: /api/web/service/all
+  params: {}
+  data: {}
+  json: {}
+  isLogin: 1
+
+
+#file_upload:
+#  method: post
+#  url: /api/web/file/upload
+#  param: {}
+#  data:
+#    img_type: ${img_type}
+#    csrfmiddlewaretoken: ${csrfmiddlewaretoken}
+#    id: ${id}
+#    name: ${name}
+#    type: ${type}
+#    lastModifiedDate: ${lastModifiedDate}
+#    size: ${size}
+#    file: ${file}
+#  json: {}
+#  isLogin: 1
\ No newline at end of file

all_om_api/login_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class login_request(BaseRequest):
+    def __init__(self):
+        #om后台-登录
+        self.data = self.api_load(path_setting.OMLOGIN_CONFIG)
+
+    #om后台-登录
+    def om_login(self, username, password, Cookie='session_key=b3owiduporwyatpueme46orsofkfgwjv'):
+        self.params["username"] = username
+        self.params["password"] = password
+
+        return self.api_send(self.data["om_login"])
+
+if __name__ == '__main__':
+    print(login_request().om_login("admin", "123123"))
\ No newline at end of file

all_om_api/login_request.yaml

+#om后台-登录
+om_login:
+  method : POST
+  url : /achelous/account/login
+  params: {}
+  data :
+    username: ${username}
+    password: ${password}
+  json : {}

host.yaml

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

in_common/base_request.py

@@ -73,6 +73,8 @@ class BaseRequest:
             # proxies={"http":"172.30.9.226:8888"}
 
         )
+        print("0000000",r)
+        # return r.json()
         try:
             content_type = r.headers.get("content-type").split(";")[0]
         except:

login_session_function.py

@@ -20,8 +20,10 @@ class LoginFunction:
         for key in hostList:
             if 'backend' == key:
                 return self.get_develop_session()
-            elif 'doctor' == key:
+            if 'doctor' == key:
                 return self.get_doctor_session()
+            elif 'om' == key:
+                return self.get_om_session()
 
     def get_develop_session(self):
         url = self.host["develop_host"]["backend"] + self.params["backend_login"]["url"]
@@ -48,6 +50,17 @@ class LoginFunction:
         )
         return s
 
+    def get_om_session(self):
+        url = self.host["develop_host"]["om"] + self.params["om_login"]["url"]
+        s = requests.session()
+        r = s.request(
+            self.params["om_login"]["method"],
+            url=url,
+            params=self.params["om_login"]["params"],
+            data=self.params["om_login"]["data"],
+            headers={'Connection': 'close'}
+        )
+        return s
 
 
 

login_session_function.yaml

@@ -30,3 +30,10 @@ doctor_login:
     csrfmiddlewaretoken: "PKHywf6cMBZUkc5WfklO71bQNoMztAfv"
 
 
+om_login:
+  method: post
+  url: /achelous/account/login
+  params: {}
+  data:
+    username: "admin"
+    password: "123123"
\ No newline at end of file

path_setting.py

@@ -137,6 +137,15 @@ DELETE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "s
 #医生后台-编辑可标准化商品
 PROPERTIES_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/glmer_data", "tag_properties.yaml")
 
+#医生后台-商品回收站
+DELETELIST_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "service_deletelist.yaml")
+
+#医生后台-上线商品、编辑商品
+SERVICEALL_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "service_all.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")
 
 # 首页灰度v9，精选tab
 FEED_INDEXV9_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "feed_request.yaml")
@@ -150,6 +159,10 @@ ONEIMAGE_RECOMEND_SERVICES_DATA = os.path.join(BASE_DIR, "backend_auto/test_back
 # 测颜值结果页获取小程序二维码
 XCX_GENGMEI_GET_WXACODE_UNLIMITED_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "xcx_request.yaml")
 XCX_GENGMEI_GET_WXACODE_UNLIMITED_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/xcx_data", "gengmei_get_wxacode_unlimited.yaml")
+# 测颜值根据标签召回日记
+FACE_DIARY_CARDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "face_request.yaml")
+FACE_DIARY_CARDS_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/face_data", "diary_cards.yaml")
+
 
 # 测肤结果页 / AI变脸结果页
 GMAI_SKIN_NEWREPORT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "gmai_request.yaml")
@@ -166,6 +179,8 @@ EYELIDS_DIARY_CARDS_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_dat
 
 # AI变脸结果
 GMAI_PLASTIC_ANALYSIS_V3_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "plastic_analysis_v3.yaml")
+# 3D变脸获取参数
+GMAI_PLASTIC_CHECCK_STYLE_CLASSTIFY_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "plastic_cheek_style_classify.yaml")
 # 3D变脸
 GMAI_PLASTIC_ANALYSIS_V2_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "plastic_analysis_v2.yaml")
 
@@ -175,8 +190,8 @@ JANUS_PRODUCT_MY_LIST_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_d
 ORDERS_MY_V2_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "orders_request.yaml")
 # 订单列表
 ORDERS_MY_V2_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/orders_data", "my_v2.yaml")
-
-
+#我的订单-各状态订单数量
+ORDER_MY_STATUS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/orders_data", "my_status.yaml")
 
 LOGIN_PASSWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/accounts_data", "login_passwd.yaml")
 LOGIN_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "accounts_request.yaml")
@@ -277,6 +292,33 @@ GIFT_LIST_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_g
 #商祥页-优惠券列表-领取
 HYBRID_GET_GIFT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hybrid_get_gift_request.yaml")
 GET_GIFT_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_get_gift_data", "get_gift_data.yaml")
+#商祥页-美券列表-我的美券点击-744版本及以后-新接口
+PRODUCT_COUPON_MY_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "product_coupon_my_list.yaml")
+#商祥页-推荐商品列表
+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")
+
+#次卡-确认订单
+BEAUTY_CARD_ORDER_CONFIRM = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_order_confirm.yaml")
+#次卡-确认订单页面-修改手机号接口
+BEAUTY_CARD_UPDATE_PHONE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_update_phone.yaml")
+#次卡-提交订单
+BEAUTY_CARD_ORDER_SUBMIT = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_order_submit.yaml")
+#次卡-支付平台
+BEAUTY_CARD_PAYMENT_METHOD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_payment_method.yaml")
+#次卡-微信支付
+BEAUTY_CARD_PREPAY_WECHAT = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_prepay_wechat.yaml")
+#次卡-支付宝支付
+BEAUTY_CARD_PREPAY_ALIPAY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_prepay_alipay.yaml")
+#次卡-订单详情
+BEAUTY_CARD_PAYMENT_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_payment_detail.yaml")
+#次卡-取消订单
+BEAUTY_CARD_PAYMENT_DELETE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_payment_delete.yaml")
+#次卡-申请退款
+BEAUTY_CARD_REFUND_INFO = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_refund_info.yaml")
+#次卡-提交退款申请
+BEAUTY_CARD_REFUND_SUBMIT = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "beauty_card_refund_submit.yaml")
+
 #捜索结果页-医生/医院tab
 CONTENTV6_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
 CONTENTV6 = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "content_v6.yaml")
@@ -376,8 +418,15 @@ PREVIEW = os.path.join(BASE_DIR, "backend_auto/test_backend_data/settlement_data
 PAY_V1 = os.path.join(BASE_DIR, "backend_auto/test_backend_data/settlement_data", "pay_v1.yaml")
 CREATE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/settlement_data", "create_v1.yaml")
 PAY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/settlement_data", "pay.yaml")
+SETTLEMENTDETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/settlement_data", "settlement_detail.yaml")
 WECHARTPAYDATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/pay_data", "wechat_prepay.yaml")
+ALIPAYDATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/pay_data", "alipay_prepay.yaml")
+JUMPDATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/pay_data", "jump.yaml")
+SETTLEMENTDELETE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/settlement_data", "settlement_delete.yaml")
 
+#OM后台-登录
+OMLOGIN_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_om_api", "login_request.yaml")
+OMLOGIN = os.path.join(BASE_DIR, "backend_auto/test_om_data/om_login_data", "om_login.yaml")
 
 
 if __name__ == '__main__':

test_backend_case/face_case/test_diary_cards.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.face_request import face_request
+
+
+class TestDiaryCards:
+    data = BaseRequest().api_load(path_setting.FACE_DIARY_CARDS_DATA)
+    FaceDiaryCards_case, FaceDiaryCards_data = get_ids(data, "diary_cards")
+
+    @pytest.mark.parametrize("param",FaceDiaryCards_data,ids=FaceDiaryCards_case)
+    def test_diary_cards(self,param):
+        r = face_request().diarys_cards(param["facial_type2tag_names"])
+        if r["error"] == 0:
+            feed = r["data"]
+            assert len(feed) == param["assert_feed_nums"]
+
+            for key in feed:
+                diary_cards = feed[key]
+                assert diary_cards["__source"] == "diary"
+                assert diary_cards["title"] is not None
+                assert diary_cards["desc"] is not None
+                assert diary_cards["diary"] is not None
+
+
+

test_backend_case/gmai_case/test_plastic_cheek_style_classify.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.gmai_request import gmai_request
+
+# 3D变脸
+class TestPlasticChecckStyleClasstify:
+    data = BaseRequest().api_load(path_setting.GMAI_PLASTIC_CHECCK_STYLE_CLASSTIFY_DATA)
+    plasticchecckstyleclasstify_case, plasticchecckstyleclasstify_data = get_ids(data, "plastic_cheek_style_classify")
+
+    @pytest.mark.parametrize("param",plasticchecckstyleclasstify_data,ids=plasticchecckstyleclasstify_case)
+    def test_plastic_cheek_style_classify(self,param):
+        r = gmai_request().plastic_cheek_style_classify(param["version"])
+        if r["error"] == 0:
+            classifies = r["data"]["classifies"]
+            assert len(classifies) > param["assert"]

test_backend_case/hybrid_promotion_case/test_related_service_data.py

+import pytest
+
+from all_backend_api.hybrid_promotion_request import hybrid_promotion_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestTelatedServiceData:
+    data = BaseRequest().api_load(path_setting.RELATED_SERVICE_DATA)
+    related_service_data_case, related_service_data_data = get_ids(data, "related_service_data")
+
+    @pytest.mark.parametrize("param", related_service_data_data, ids=related_service_data_case)
+    def test_related_service_data(self, param):
+        r = hybrid_promotion_request().related_service_data(param["service_id"], param["page"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_order_confirm.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 TestBeautyCardOrderConfirm:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_ORDER_CONFIRM)
+    beauty_card_order_confirm_case, beauty_card_order_confirm_data = get_ids(data, "beauty_card_order_confirm")
+
+    @pytest.mark.parametrize("param", beauty_card_order_confirm_data, ids=beauty_card_order_confirm_case)
+    def test_beauty_card_order_confirm(self, param):
+        r = janus_request().beauty_card_order_confirm(param["sku_id"], param["number"], param["use_bc_coupon"], param["bc_coupon_id"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_order_submit.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 TestBeautyCardOrderSubmit:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_ORDER_SUBMIT)
+    beauty_card_order_submit_case, beauty_card_order_submit_data = get_ids(data, "beauty_card_order_submit")
+
+    @pytest.mark.parametrize("param", beauty_card_order_submit_data, ids=beauty_card_order_submit_case)
+    def test_beauty_card_order_submit(self, param):
+        r = janus_request().beauty_card_order_submit(param["phone"], param["sku_id"], param["number"],
+                                                     param["is_doctor_see"], param["gain_coupon_id"],
+                                                     param["deduction_price"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_payment_delete.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 TestBeautyCardPaymentDelete:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_PAYMENT_DELETE)
+    beauty_card_payment_delete_case, beauty_card_payment_delete_data = get_ids(data, "beauty_card_payment_delete")
+
+    @pytest.mark.parametrize("param", beauty_card_payment_delete_data, ids=beauty_card_payment_delete_case)
+    def test_beauty_card_payment_delete(self, param):
+        payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
+        payment_id = payment["data"]["payment_id"]
+        r = janus_request().beauty_card_payment_delete(payment_id)
+
+        if r["error"] == 0:
+            assert r["data"]["message"] == param["assert_data_message"]
+

test_backend_case/janus_case/test_beauty_card_payment_detail.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 TestBeautyCardPaymentDetail:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_PAYMENT_DETAIL)
+    beauty_card_payment_detail_case, beauty_card_payment_detail_data = get_ids(data, "beauty_card_payment_detail")
+
+    @pytest.mark.parametrize("param", beauty_card_payment_detail_data, ids=beauty_card_payment_detail_case)
+    def test_beauty_card_payment_detail(self, param):
+        payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
+        payment_id = payment["data"]["payment_id"]
+        r = janus_request().beauty_card_payment_detail(payment_id)
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_payment_method.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 TestBeautyCardPaymentMethod:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_PAYMENT_METHOD)
+    beauty_card_payment_method_case, beauty_card_payment_method_data = get_ids(data, "beauty_card_payment_method")
+
+    @pytest.mark.parametrize("param", beauty_card_payment_method_data, ids=beauty_card_payment_method_case)
+    def test_beauty_card_payment_method(self, param):
+        payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
+        payment_id = payment["data"]["payment_id"]
+        r = janus_request().beauty_card_payment_method(payment_id)
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_prepay_alipay.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 TestBeautyCardPrepayAlipay:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_PREPAY_ALIPAY)
+    beauty_card_prepay_alipay_case, beauty_card_prepay_alipay_data = get_ids(data, "beauty_card_prepay_alipay")
+
+    @pytest.mark.parametrize("param", beauty_card_prepay_alipay_data, ids=beauty_card_prepay_alipay_case)
+    def test_beauty_card_prepay_alipay(self, param):
+        payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
+        payment_id = payment["data"]["payment_id"]
+        r = janus_request().beauty_card_prepay_alipay(param["is_huabei"], payment_id)
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_prepay_wechat.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 TestBeautyCardPrepayWechat:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_PREPAY_WECHAT)
+    beauty_card_prepay_wechat_case, beauty_card_prepay_wechat_data = get_ids(data, "beauty_card_prepay_wechat")
+
+    @pytest.mark.parametrize("param", beauty_card_prepay_wechat_data, ids=beauty_card_prepay_wechat_case)
+    def test_beauty_card_prepay_wechat(self, param):
+        payment = janus_request().beauty_card_order_submit("12345678912", "10176", 1, 1, 0, 0)
+        payment_id = payment["data"]["payment_id"]
+        r = janus_request().beauty_card_prepay_wechat(payment_id)
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_refund_info.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 TestBeautyCardRefundInfo:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_REFUND_INFO)
+    beauty_card_refund_info_case, beauty_card_refund_info_data = get_ids(data, "beauty_card_refund_info")
+
+    @pytest.mark.parametrize("param", beauty_card_refund_info_data, ids=beauty_card_refund_info_case)
+    def test_beauty_card_refund_info(self, param):
+        r = janus_request().beauty_card_refund_info(param["order_id"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/janus_case/test_beauty_card_refund_submit.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 TestBeautyCardRefundSubmit:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_REFUND_SUBMIT)
+    beauty_card_refund_submit_case, beauty_card_refund_submit_data = get_ids(data, "beauty_card_refund_submit")
+
+    @pytest.mark.parametrize("param", beauty_card_refund_submit_data, ids=beauty_card_refund_submit_case)
+    def test_beauty_card_refund_submit(self, param):
+        r = janus_request().beauty_card_refund_submit(param["order_id"], param["reason_id"], param["reason_text"],
+                                                      param["reason_type"])
+
+        if r["error"] == 1:
+            assert r["message"] == param["assert_message"]
+

test_backend_case/janus_case/test_beauty_card_update_phone.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 TestBeautyCardUpdatePhone:
+    data = BaseRequest().api_load(path_setting.BEAUTY_CARD_UPDATE_PHONE)
+    beauty_card_update_phone_case, beauty_card_update_phone_data = get_ids(data, "beauty_card_update_phone")
+
+    @pytest.mark.parametrize("param", beauty_card_update_phone_data, ids=beauty_card_update_phone_case)
+    def test_beauty_card_update_phone(self, param):
+        r = janus_request().beauty_card_update_phone(param["authorize_phone"], param["authorize_phone_type"], param["vfc_code"])
+
+        if r["error"] == 1:
+            assert r["message"] == param["assert_message"]
+

test_backend_case/janus_case/test_product_coupon_my_list.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 TestProductCouponMyList:
+    data = BaseRequest().api_load(path_setting.PRODUCT_COUPON_MY_LIST)
+    product_coupon_my_list_case, product_coupon_my_list_data = get_ids(data, "product_coupon_my_list")
+
+    @pytest.mark.parametrize("param", product_coupon_my_list_data, ids=product_coupon_my_list_case)
+    def test_product_coupon_my_list(self, param):
+        r = janus_request().product_coupon_my_list(param["start_num"], param["tab_id"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+

test_backend_case/orders_case/test_my_status.py

+import pytest
+
+from all_backend_api.orders_request import orders_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestMyStatus:
+    data = BaseRequest().api_load(path_setting.ORDER_MY_STATUS)
+    my_status_case, my_status_data = get_ids(data, "my_status")
+
+    @pytest.mark.parametrize("param", my_status_data, ids=my_status_case)
+    def test_my_status(self, param):
+        r = orders_request().my_status()
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]

test_backend_case/pay_case/test_alipay_prepay.py

+import pytest
+
+import path_setting
+from all_backend_api.pay_request import pay_request
+from all_backend_api.settlement_request import settlement_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestAlipayPay:
+    data = BaseRequest().api_load(path_setting.ALIPAYDATA)
+    alipay_case, alipay_data = get_ids(data, "alipay_prepay")
+
+    @pytest.mark.parametrize("param", alipay_data, ids=alipay_case)
+    def test_alipay_prepay(self, param):
+        create_resp = settlement_request().create_v1(param["service_item_id"],param["number"],param["platform_coupon_id"],param["use_point"],
+                                       param["is_doctor_see"],param["doctor_coupon_id"],param["insurance_info"],param["is_create_groupbuy"])
+        settlement_id = create_resp["data"]["id"]
+        r = pay_request().alipay_prepay(settlement_id,param["version"],param["is_huabei"],param["huabei_period"])
+        print(r)
+        assert r["error"] == param["assert"]
+

test_backend_case/pay_case/test_jump.py

+import pytest
+
+import path_setting
+from all_backend_api.pay_request import pay_request
+from all_backend_api.settlement_request import settlement_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestJump:
+    data = BaseRequest().api_load(path_setting.JUMPDATA)
+    jump_case, jump_data = get_ids(data, "jump")
+
+    @pytest.mark.parametrize("param", jump_data, ids=jump_case)
+    def test_jump(self, param):
+        create_resp = settlement_request().create_v1(param["service_item_id"],param["number"],param["platform_coupon_id"],param["use_point"],
+                                       param["is_doctor_see"],param["doctor_coupon_id"],param["insurance_info"],param["is_create_groupbuy"])
+        settlement_id = create_resp["data"]["id"]
+        r = pay_request().jump(settlement_id)
+        print(r)
+        assert r["error"] == param["assert"]
+

test_backend_case/pay_case/test_wechat_prepay.py

@@ -2,6 +2,7 @@ import pytest
 
 import path_setting
 from all_backend_api.pay_request import pay_request
+from all_backend_api.settlement_request import settlement_request
 from ids_list import get_ids
 from in_common.base_request import BaseRequest
 
@@ -12,8 +13,10 @@ class TestWechatPrepay:
 
     @pytest.mark.parametrize("param", wechart_data, ids=wechart_case)
     def test_wechart_prepay(self, param):
-        pass
-        # r = pay_request().wechat_prepay()
-        # print(r)
-        # assert r["error"] == param["assert"]
+        create_resp = settlement_request().create_v1(param["service_item_id"],param["number"],param["platform_coupon_id"],param["use_point"],
+                                       param["is_doctor_see"],param["doctor_coupon_id"],param["insurance_info"],param["is_create_groupbuy"])
+        settlement_id = create_resp["data"]["id"]
+        r = pay_request().wechat_prepay(settlement_id)
+        print(r)
+        assert r["error"] == param["assert"]
 

test_backend_case/settlement_case/test_create_v1.py

@@ -13,7 +13,9 @@ class TestCreateV1:
 
     @pytest.mark.parametrize("param", create_data, ids=create_case)
     def test_create_v1(self, param):
-        r = settlement_request().create_v1(param["service_item_id"],param["number"],param["platform_coupon_id"],param["use_point"],param["is_doctor_see"],param["doctor_coupon_id"],param["insurance_info"],param["is_create_groupbuy"])
+        r = settlement_request().create_v1(param["service_item_id"],param["number"],param["platform_coupon_id"],
+                                           param["use_point"],param["is_doctor_see"],param["doctor_coupon_id"],
+                                           param["insurance_info"],param["is_create_groupbuy"])
         print(r)
         assert r["error"] == param["assert"]
 

test_backend_case/settlement_case/test_settlement_delete.py

+import pytest
+
+import path_setting
+from all_backend_api.orders_request import orders_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+from all_backend_api.settlement_request import settlement_request
+
+
+class TestSettlementDelete:
+    data = BaseRequest().api_load(path_setting.SETTLEMENTDELETE)
+    delete_case, delete_data = get_ids(data, "settlement_delete")
+
+    @pytest.mark.parametrize("param", delete_data, ids=delete_case)
+    def test_settlement_delete(self, param):
+        r = orders_request().my_v2(param["start_num"],param["status"],param["version"])
+        for item in r["data"]["orders"]:
+            item = item
+            break
+        # print("999999999999999",item["settlement_id"])
+        if item["settlement_status"] == "0":
+            id = item["settlement_id"]
+            r = settlement_request().delete(id,param["cancel_reason_value"])
+            assert r["message"] == param["assert"]
+        else:
+            print("无可取消订单")
+
+        # print(r)
+        # if r["error"] == 0:
+        #     assert r["error"] == param["assert"]
+        # else:
+        #     assert r["error"] == param["assert"]
+

test_backend_case/settlement_case/test_settlement_detail.py

+import pytest
+
+import path_setting
+from all_backend_api.settlement_request import settlement_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestSettlementDetail:
+    data = BaseRequest().api_load(path_setting.SETTLEMENTDETAIL)
+    detail_case, detail_data = get_ids(data, "settlement_detail")
+
+    @pytest.mark.parametrize("param", detail_data, ids=detail_case)
+    def test_settlement_detail(self, param):
+        r = settlement_request().detail(param["id"])
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
+        else:
+            assert r["error"] == param["assert"]
+

test_backend_data/face_data/diary_cards.yaml

+diary_cards:
+  -
+    case: "测颜值根据标签推荐日记"
+    facial_type2tag_names: '{"2":["玻尿酸垫下巴","自体脂肪垫下巴"],"3":["半永久纹眉","植眉"]}'
+    assert_feed_nums: 2
\ No newline at end of file

test_backend_data/gmai_data/plastic_cheek_style_classify.yaml

+plastic_cheek_style_classify:
+#获取3D变脸配置
+  -
+    case: "获取3D变脸配置"
+    version: "7.44.0"
+    assert: 0

test_backend_data/hybrid_promotion_data/related_service_data.yaml

+related_service_data:
+  -
+    case: "商祥页-推荐商品列表-接口调用成功case"
+    service_id: "5815040"
+    page: 1
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_order_confirm.yaml

+beauty_card_order_confirm:
+  -
+    case: "次卡-确认订单-接口调用成功case"
+    sku_id: "10176"
+    number: 1
+    use_bc_coupon: 1
+    bc_coupon_id: 0
+    assert_error: 0

test_backend_data/janus_data/beauty_card_order_submit.yaml

+beauty_card_order_submit:
+  -
+    case: "次卡-提交订单-校验接口返回成功case"
+    phone: "12345678912"
+    sku_id: "10176"
+    number: 1
+    is_doctor_see: 1
+    gain_coupon_id: 0
+    deduction_price: 0
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_payment_delete.yaml

+beauty_card_payment_delete:
+  -
+    case: "次卡取消订单-接口调用成功case"
+    assert_data_message: "取消成功"
\ No newline at end of file

test_backend_data/janus_data/beauty_card_payment_detail.yaml

+beauty_card_payment_detail:
+  -
+    case: "次卡订单详情-接口调用成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_payment_method.yaml

+beauty_card_payment_method:
+  -
+    case: "次卡-支付平台接口-校验接口调用成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_prepay_alipay.yaml

+beauty_card_prepay_alipay:
+  -
+    case: "次卡支付宝支付-接口调用成功case"
+    is_huabei: 0
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_prepay_wechat.yaml

+beauty_card_prepay_wechat:
+  -
+    case: "次卡微信支付-接口调用成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_refund_info.yaml

+beauty_card_refund_info:
+  -
+    case: "次卡-取消订单-接口调用成功case"
+    order_id: "102217820485006"
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/beauty_card_refund_submit.yaml

+beauty_card_refund_submit:
+  -
+    case: "次卡-提交退款申请-接口调用成功case"
+    order_id: "102813852173916"
+    reason_id: 3
+    reason_text: "个人身体原因"
+    reason_type: 0
+    assert_message: "订单已经退款"
\ No newline at end of file

test_backend_data/janus_data/beauty_card_update_phone.yaml

+beauty_card_update_phone:
+  -
+    case: "次卡-确认订单页面-修改手机号-校验接口返回成功case"
+    authorize_phone: "+8612345678912"
+    authorize_phone_type: 1
+    vfc_code: "1234"
+    assert_message: "验证码校验不通过"
\ No newline at end of file

test_backend_data/janus_data/product_coupon_my_list.yaml

+product_coupon_my_list:
+  -
+    case: "我的美券列表（新）-校验接口返回成功case"
+    start_num: 0
+    tab_id: 0
+    assert_error: 0
\ No newline at end of file

test_backend_data/orders_data/my_status.yaml

+my_status:
+  -
+    case: "我的订单-各状态订单数量-接口调用成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/pay_data/alipay_prepay.yaml

+alipay_prepay:
+  -
+    case: "普通美购下单流程--支付宝支付方式"
+    version: v1
+    is_huabei: 0
+    huabei_period: 0
+    service_item_id: 473317
+    number: 1
+    platform_coupon_id: ""
+    use_point: 0
+    is_doctor_see: 1
+    doctor_coupon_id: ""
+    insurance_info: "[]"
+    is_create_groupbuy: 0
+    assert: 0

test_backend_data/pay_data/jump.yaml

+jump:
+  -
+    case: "普通美购下单流程--跳转第三方"
+    service_item_id: 473317
+    number: 1
+    platform_coupon_id: ""
+    use_point: 0
+    is_doctor_see: 1
+    doctor_coupon_id: ""
+    insurance_info: "[]"
+    is_create_groupbuy: 0
+    assert: 0
\ No newline at end of file

test_backend_data/pay_data/wechat_prepay.yaml

 wechart_pay:
   -
     case: "普通美购订单支付流程--微信支付"
+    service_item_id: 473317
+    number: 1
+    platform_coupon_id: ""
+    use_point: 0
+    is_doctor_see: 1
+    doctor_coupon_id: ""
+    insurance_info: "[]"
+    is_create_groupbuy: 0
     assert: 0

test_backend_data/settlement_data/settlement_delete.yaml

+settlement_delete:
+  -
+    case: "普通美购订单流程--取消订单成功"
+    start_num: 0
+    status: 0
+    version: 7.44.0
+    cancel_reason_value: 2
+    assert: "取消成功"
\ No newline at end of file

test_backend_data/settlement_data/settlement_detail.yaml

+settlement_detail:
+  -
+    case: "普通美购订单流程--查看订单详情页订单存在"
+    id: 522139664651
+    assert: 0
+  -
+    case: "普通美购订单流程--查看订单详情页订单不存在"
+    id: 522139664650
+    assert: 1
\ No newline at end of file

test_doctor_case/web2_case/test_service_deletelist.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 TestServiceDeletelist:
+    service_deletelist = BaseRequest().api_load(path_setting.DELETELIST_DATA)
+    ServiceDeletelist_case, ServiceDeletelist_data = get_ids(service_deletelist, "service_deletelist")
+
+    @pytest.mark.parametrize("params" ,ServiceDeletelist_data ,ids=ServiceDeletelist_case)
+    def test_ServiceDeletelist(self ,params):
+
+        r = web2_request().service_deletelist(params['page'])
+        print("======" ,r)
+
+        # if r["error"] == 0:
+        #     assert r["error"] == params["assert"]
+

test_doctor_case/web_case/test_service_all.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 TestServiceAll:
+
+    service_all = BaseRequest().api_load(path_setting.SERVICEALL_DATA)
+    ServiceAll_case, ServiceAll_data = get_ids(service_all, "service_all")
+
+    @pytest.mark.parametrize("param",ServiceAll_data,ids=ServiceAll_case)
+    def test_ServiceAll(self,param):
+
+        r = web_request().service_all()
+        print("=====",r)
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
\ No newline at end of file

test_doctor_data/web2_data/service_deletelist.yaml

+service_deletelist:
+#我的商品-商品回收站
+  -
+    case:  "我的商品-商品回收站"
+    page: "1"
+    assert: 0
\ No newline at end of file

test_doctor_data/web_data/service_all.yaml

+service_all:
+
+  -
+    case: "编辑商品、上线商品"
+    assert: 0
\ No newline at end of file

test_om_case/om_login_case/test_om_login.py

+import pytest
+
+import path_setting
+from all_om_api.login_request import login_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+#om后台-登录
+class TestOmLogin:
+    data = BaseRequest().api_load(path_setting.OMLOGIN)
+    om_login_case, om_login_data = get_ids(data, "om_login")
+
+    @pytest.mark.parametrize("param",om_login_data,ids=om_login_case)
+    def test_om_login(self,param):
+        r = login_request().om_login(param["username"], param["password"])
+        if r["code"] == 0:
+            print("om后台成功登陆")
+            assert r["msg"] == param["assert"]
+        if r["code"] != 0:
+            print("om后台登陆出错")
+            assert r["msg"] == param["assert"]
\ No newline at end of file

test_om_data/om_login_data/om_login.yaml

+om_login:
+  #om后台-登录-输入正确的用户名和正确的密码
+  -
+    case : "om后台-登录-输入正确的用户名和密码"
+    username : "admin"
+    password : "123123"
+    assert: success!
+
+  #om后台-登录-输入正确的用户名和错误的密码
+  -
+    case : "om后台-登录-输入正确的用户名和错误的密码"
+    username : "admin"
+    password : "1231234"
+    assert: Login failed!
+
+  #om后台-登录-输入正确的用户名和不输入密码
+  -
+    case : "om后台-登录-输入正确的用户名和不输入密码"
+    username : "admin"
+    password : ""
+    assert: Login failed!
+
+  #om后台-登录-输入正确的用户名和无效密码
+  -
+    case : "om后台-登录-输入正确的用户名和无效密码"
+    username : "admin"
+    password : "哈哈"
+    assert: Login failed!
+
+  #om后台-登录-输入错误的用户名和正确的密码
+  -
+    case : "om后台-登录-输入错误的用户名和正确的密码"
+    username : "admin1"
+    password : "123123"
+    assert: Login failed!
+
+  #om后台-登录-不输入用户名和输入正确的密码
+  -
+    case : "om后台-登录-不输入用户名和输入正确的密码"
+    username : ""
+    password : "123123"
+    assert: Login failed!
+
+  #om后台-登录-输入无效用户名和正确的密码
+  -
+    case : "om后台-登录-输入无效用户名和正确的密码"
+    username : "哈哈"
+    password : "123123"
+    assert: Login failed!
+
+  #om后台-登录-输入错误的用户名和输入错误的密码
+  -
+    case : "om后台-登录-输入错误的用户名和输入错误的密码"
+    username : "admin1"
+    password : "1231234"
+    assert: Login failed!
+
+  #om后台-登录-不输入用户名和密码
+  -
+    case : "om后台-登录-不输入用户名和密码"
+    username : ""
+    password : ""
+    assert: Login failed!
+
+
+
+