sc-common-interface 2.2.3__tar.gz → 2.2.5__tar.gz

{sc-common-interface-2.2.3 → sc-common-interface-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc-common-interface
-Version: 2.2.3
+Version: 2.2.5
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc-common-interface-2.2.3 → sc-common-interface-2.2.5}/sc_common_interface/PostCommonInterface.py

@@ -177,6 +177,9 @@ def search_oa_product(data):
     env = data["env"]
     headers = data["headers"]
     url = "%s/openApi/proxy/v1/products?page=1&per_page=4" %env
+    if "query" in data:
+        query = data["query"]
+        url = "%s/openApi/proxy/v1/products?page=1&per_page=4&query=%s" % (env,query)
     response = requests.get(url, headers=headers).json()
     return response
 
@@ -350,9 +353,6 @@ def get_page_post(data):
     :return:响应
     """
     #时间戳转换
-
-
-
     env = data["env"]
     headers = data["headers"]
     platform = "FACEBOOK"
@@ -792,35 +792,35 @@ def merge_customer(data):
     user_id = data["user_id"]
     page_id = data["page_id"]
     platform = data["platform"]
+    customer_id  = jsonpath(response,"$..customer_id")[0]
 
-    response = search_customer(data)
-    items = response["data"]["items"]
-    # 创建会员
-    customer_id = ""
-    url = "%s/uc/customers/merge" % env
-    body = {"email": "", "mobile_phone": phone, "mobile_phone_country_calling_code": "86",
-            "name": name, "page_scoped_id": user_id, "locale_code": None, "country_code": "cn",
-            "id": None, "party_channel_id": page_id, "platform": platform, "is_member": True}
-    if items != []:
-        id = jsonpath(response, "$..id")[0]
-        customer_id = id
+    if customer_id==None:
+        response = search_customer(data)
+        items = response["data"]["items"]
+        # 创建会员
+        url = "%s/uc/customers/merge" % env
         body = {"email": "", "mobile_phone": phone, "mobile_phone_country_calling_code": "86",
                 "name": name, "page_scoped_id": user_id, "locale_code": None, "country_code": "cn",
-                "id": id, "party_channel_id": page_id, "platform": platform, "is_member": True}
-    response = requests.put(url, headers=headers, json=body)
-
-    # print("创建会员请求体",body)
-    if response.raise_for_status():
-        customer_id = response.json()["data"]["id"]
-    elif response.json()["code"]=="UC0409":
-        email = "%d@qq.com"%int(time.time())
-        body = {"email": email, "mobile_phone": "", "mobile_phone_country_calling_code": "86",
-                "name": name, "page_scoped_id": user_id, "locale_code": None, "country_code": "cn",
-                "id": "", "party_channel_id": page_id, "platform": platform, "is_member": False}
+                "id": None, "party_channel_id": page_id, "platform": platform, "is_member": True}
+        if items != []:
+            id = jsonpath(response, "$..id")[0]
+            customer_id = id
+            body = {"email": "", "mobile_phone": phone, "mobile_phone_country_calling_code": "86",
+                    "name": name, "page_scoped_id": user_id, "locale_code": None, "country_code": "cn",
+                    "id": id, "party_channel_id": page_id, "platform": platform, "is_member": True}
         response = requests.put(url, headers=headers, json=body)
-    else:
-        customer_id = response.json()["data"]["id"]
-
+        print("合并会员返回",response.json())
+        # print("创建会员请求体",body)
+        if response.raise_for_status():
+            customer_id = response.json()["data"]["id"]
+        elif response.json()["code"]=="UC0409":
+            email = "%d@qq.com"%int(time.time())
+            body = {"email": email, "mobile_phone": "", "mobile_phone_country_calling_code": "86",
+                    "name": name, "page_scoped_id": user_id, "locale_code": None, "country_code": "cn",
+                    "id": "", "party_channel_id": page_id, "platform": platform, "is_member": False}
+            response = requests.put(url, headers=headers, json=body)
+        else:
+            customer_id = response.json()["data"]["id"]
     return response,customer_id
 
 
@@ -851,8 +851,8 @@ def manual_order(data):
     # 先查询号码或邮箱是否被占有
     #创建会员
     response,customer_id = merge_customer(data)
-    print("会员ID",customer_id)
-    print("创建会员返回，",response.text)
+    # print("会员ID",customer_id)
+    # print("创建会员返回，",response.text)
     #给会员新增物流地址
     url = "%s/uc/customers/%s" % (env,customer_id)
     postcode = "76653"
@@ -1436,11 +1436,13 @@ def set_delivery(data):
     response = requests.put(url, headers=headers, json=body).json()
     return response
 
-
-
-
-
-
+def get_mc_order_link(url):
+    response = requests.get(url)
+    print(response.headers)
+    location = response.headers.get("Location")
+    # print(location)
+    key = location.split("/")[-1].split("?")[0]
+    return key
 
 
 
@@ -1448,13 +1450,4 @@ def set_delivery(data):
 
 
 if __name__=="__main__":
-    import  re
-    url = "https://message-center-order.shoplinestg.com/orders/f79e29a466139ccf97cd2d759f5d4a5c?merchant_id=6229a7baea70642a8b65ebda&locale=zh-cn"
-    match = re.search(r"/orders/([^/?]+)", url)
-    if match:
-        order_id = match.group(1)
-        print(order_id)
-    else:
-        print("未找到订单 ID")
-
-    
+  pass

{sc-common-interface-2.2.3 → sc-common-interface-2.2.5}/sc_common_interface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc-common-interface
-Version: 2.2.3
+Version: 2.2.5
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc-common-interface-2.2.3 → sc-common-interface-2.2.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='sc-common-interface',
-    version='2.2.3',
+    version='2.2.5',
     description='SC贴文销售公用的接口',
     author='river',
     packages=find_packages(),