sc-common-interface 2.2.2__tar.gz → 2.2.4__tar.gz

{sc-common-interface-2.2.2 → sc-common-interface-2.2.4}/PKG-INFO

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

{sc-common-interface-2.2.2 → sc-common-interface-2.2.4}/sc_common_interface/PostCommonInterface.py

@@ -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"
@@ -1351,7 +1351,7 @@ def end_post(data):
     response = requests.put(url,headers=headers).json()
     return response
 
-def get_payment(data):
+def get_oa_payment(data):
     env = data["env"]
     headers = data["headers"]
     type_value = data["type"]
@@ -1369,7 +1369,7 @@ def get_payment(data):
             payment_ids.append(payment_id)
     return payment_ids,response
 
-def get_delivery(data):
+def get_oa_delivery(data):
     env = data["env"]
     headers = data["headers"]
     type_value = data["type"]
@@ -1399,7 +1399,7 @@ def set_payment(data):
     if "payment_id" in data:
         payment_id = data["payment_id"]
     else:
-        payment_ids,__ = get_payment(data)
+        payment_ids,__ = get_oa_payment(data)
         payment_id = payment_ids[0]
     body = {
 
@@ -1425,7 +1425,7 @@ def set_delivery(data):
     if "delivery_id" in data:
         delivery_id = data["delivery_id"]
     else:
-        delivery_ids, __ = get_payment(data)
+        delivery_ids, __ = get_oa_delivery(data)
         delivery_id = delivery_ids[0]
     body = {
       "delivery_option_id": delivery_id,
@@ -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,6 +1450,6 @@ def set_delivery(data):
 
 
 if __name__=="__main__":
-    pass
+    data = {'env': 'https://front-admin-preview.shoplineapp.com', 'headers': {'Content-Type': 'application/json', 'authorization': 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJhMjQ0ZTUwMmMyYzIwY2E5MWVhZDg0NWQ2YTk4YzVlNCIsImRhdGEiOnsibWVyY2hhbnRfaWQiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAiLCJhcHBsaWNhdGlvbl9pZCI6IjVmNTlmMTI4MzcyZWIzMDAwNmRjNDcwMSJ9LCJpc3MiOiJodHRwczovL2RldmVsb3BlcnMtcHJldmlldy5zaG9wbGluZWFwcC5jb20iLCJhdWQiOltdLCJzdWIiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAifQ.8m_bKPfZJxan6M6hv_4byPROt_UtvHqnyWAT9Ox1CO0', 'lang': 'en'}, 'platform': 'INSTAGRAM', 'patternModel': 'INCLUDE_MATCH', 'sales_id': 423810, 'since': '1685030400', 'user_id': '4255666934537806', 'key': '5e3bba98882fc0fb22a0607238bc5b8f', 'keyword': '无规格商品关键字'}
+    response = manual_order(data)
 
-    

{sc-common-interface-2.2.2 → sc-common-interface-2.2.4}/sc_common_interface.egg-info/PKG-INFO

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

{sc-common-interface-2.2.2 → sc-common-interface-2.2.4}/setup.py

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