sc-common-interface 2.8.5__tar.gz → 2.8.7__tar.gz

{sc_common_interface-2.8.5 → sc_common_interface-2.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc_common_interface
-Version: 2.8.5
+Version: 2.8.7
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc_common_interface-2.8.5 → sc_common_interface-2.8.7}/sc_common_interface/LiveCommonInterface.py

@@ -2176,18 +2176,32 @@ def handler_bidding(data):
 
 
 def check_14_day(data):
-    response = get_live_info(data)
-    start_time_timestamp = response["data"]["sales"]["start_time_timestamp"]
-    # 将毫秒转换为秒
-    start_time_timestamp = start_time_timestamp / 1000
-    # 计算 14 天的秒数
-    fourteen_days_seconds = 13 * 24 * 60 * 60
-    # 获取当前时间戳（秒）
-    current_time_seconds = time.time()
     flag = False
-    if (current_time_seconds - start_time_timestamp) >= fourteen_days_seconds:
-        flag =True
-    return flag
+    try:
+        response = get_live_info(data)
+        code = response["code"]
+        if code!="SUCCESS":
+            flag =True
+            return flag
+        else:
+            start_time_timestamp = response["data"]["sales"]["start_time_timestamp"]
+            # 将毫秒转换为秒
+            start_time_timestamp = start_time_timestamp / 1000
+            # 计算 14 天的秒数
+            fourteen_days_seconds = 13 * 24 * 60 * 60
+            # 获取当前时间戳（秒）
+            current_time_seconds = time.time()
+
+            if (current_time_seconds - start_time_timestamp) >= fourteen_days_seconds:
+                flag = True
+            return flag
+    except Exception:
+        flag = True
+        return flag
+
+
+
+
 
 def get_fb_sales_id(data):
     """"查询返回指定直播间的salse_id
@@ -2225,7 +2239,7 @@ def get_receipt_sales_id(data):
     sales_id = data["sales_id"]
     flag = check_14_day(data)
     if flag:
-        #先从列表查出一个最新结束的直播间，还是不返回要求再创建直播和链接直播
+        #先从列表查出一个最新结束的直播间，还是不返回要再创建直播和链接直播
         sales_id = get_fb_sales_id(data)
         data["sales_id"] = sales_id
         flag2 = check_14_day(data)
@@ -2252,12 +2266,28 @@ def delete_keyword_product_set(data):
     headers = data["headers"]
     product_id = data["product_id"]
     url = "%s/admin/api/bff-web/keyword/product_set"%env
+    if isinstance(product_id, str):
+        product_id = [product_id]
     body = {
     "ids": product_id
         }
     response = requests.delete(url,headers=headers,json=body).json()
     return response
 
+def delete_keyword_product(data):
+    "删除关键字组件里的组合商品"
+    "product_id为：[]"
+    env = data["env"]
+    headers = data["headers"]
+    product_id = data["product_id"]
+    url = "%s/api/posts/common/product/key/spu"%env
+    if isinstance(product_id,str):
+        product_id = [product_id]
+    body = {
+    "ids": product_id
+        }
+    response = requests.delete(url,headers=headers,json=body).json()
+    return response
 
 def get_keyword_product_set(data):
     "查询关键字组件里的组合商品"
@@ -2412,18 +2442,25 @@ def add_product_to_live(data):
     return response
 
 
+def get_merchant_currency(data):
+    env = data["env"]
+    headers = data["headers"]
 
 
 
 
 
 
+if __name__=="__main__":
+    from PostCommonInterface import *
 
+    data = {'env': 'https://front-admin-preview.shoplineapp.com', 'headers': {'Content-Type': 'application/json',
+                                                                              'authorization': 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJkZmQxYjNiMDc0M2JmYWU4YTFkODk4NzczNjgyZWVkZCIsImRhdGEiOnsibWVyY2hhbnRfaWQiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAiLCJhcHBsaWNhdGlvbl9pZCI6IjVlYjkwMzVhYjA5ZDEyNjU4NTFmOTU2ZiJ9LCJpc3MiOiJodHRwczovL2RldmVsb3BlcnMtcHJldmlldy5zaG9wbGluZWFwcC5jb20iLCJhdWQiOltdLCJzdWIiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAifQ.Y90xLfYVAp9yByHo7Vc7A3hHrp6hX9X9Lg4mg_WiE_I',
+                                                                              'lang': 'en'}, 'sales_id': '552980'
+           }
+    __, response = get_comment_user(data)
+    print(response)
 
-if __name__=="__main__":
-    data = {'env': 'https://front-admin-preview.shoplineapp.com', 'headers': {'Content-Type': 'application/json', 'authorization': 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJkZmQxYjNiMDc0M2JmYWU4YTFkODk4NzczNjgyZWVkZCIsImRhdGEiOnsibWVyY2hhbnRfaWQiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAiLCJhcHBsaWNhdGlvbl9pZCI6IjVlYjkwMzVhYjA5ZDEyNjU4NTFmOTU2ZiJ9LCJpc3MiOiJodHRwczovL2RldmVsb3BlcnMtcHJldmlldy5zaG9wbGluZWFwcC5jb20iLCJhdWQiOltdLCJzdWIiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAifQ.Y90xLfYVAp9yByHo7Vc7A3hHrp6hX9X9Lg4mg_WiE_I', 'lang': 'en'}, 'platform': 'FB_GROUP', 'sales_id': '95828', 'keyword': ['test关键字组件直播间新增的关键字1739955629'], 'product_id': '65bba57da79d260023ac30ff'}
-    res = add_product_to_live(data)
-    print(res)
 
 
 

{sc_common_interface-2.8.5 → sc_common_interface-2.8.7}/sc_common_interface/PostCommonInterface.py

@@ -877,12 +877,13 @@ def get_comment_user(data):
     env = data["env"]
     headers = data["headers"]
     sales_id = data["sales_id"]
-    params = {"pageNo":1,"pageSize":10,"salesId":sales_id}
+    params = {"pageNo":1,"pageSize":25,"salesId":sales_id}
     if "query" in data:
         query = data["query"]
         params["query"] = query
     url = "%s/api/posts/post/comments"%env
     response = requests.get(url, headers=headers,params=params).json()
+    print(response)
     post_user_id = jsonpath(response, "$..id")[0]
     return post_user_id,response
 
@@ -916,7 +917,7 @@ def post_edit_cart(data):
 def search_customer(data):
     env = data["env"]
     headers = data["headers"]
-    phone = data["query"]
+    phone = data["phone"]
     url = "%s/openApi/proxy/v1/customers/search?query=%s&per_page=50&search_fields[]=mobile_phone" \
           "&search_fields[]=phones" % (env, phone)
     response = requests.get(url, headers=headers).json()
@@ -925,7 +926,7 @@ def search_customer(data):
 def merge_customer(data):
     env = data["env"]
     headers = data["headers"]
-    phone = data["query"]
+    phone = data["phone"]
     __, response = get_comment_user(data)
     # print("留言面板查询返回",response)
     name = data["name"]
@@ -974,8 +975,7 @@ def manual_order(data):
     env = data["env"]
     headers = data["headers"]
     phone = "18776343453"
-    if "query" in data:
-        phone = data["query"]
+    phone = data.get("phone",phone)
     __, response = get_comment_user(data)
     name = jsonpath(response, "$..name")[0]
     user_id = jsonpath(response, "$..psid")[0]
@@ -983,7 +983,7 @@ def manual_order(data):
     data["name"] = name
     data["user_id"] = user_id
     data["page_id"] = page_id
-    data["query"] = phone
+    data["phone"] = phone
     platform = "facebook"
     if "platform" in data:
         platform = data["platform"].upper()
@@ -1044,7 +1044,7 @@ def manual_order(data):
             "source_data": {"type": "fb", "source_id": page_id}, "customer_phone_country_code": "86",
             "postcode": postcode}
     res = requests.post(url,headers=headers,json=body)
-    # print("创建订单返回",res.text)
+    print("创建订单返回",res.text)
     #获取订单ID
     orderNumber = ""
     if res.status_code==200:
@@ -1721,6 +1721,8 @@ def edit_message(data):
 
 
 if __name__=="__main__":
-    pass
+    data = {'env': 'https://front-admin-preview.shoplineapp.com', 'headers': {'Content-Type': 'application/json', 'authorization': 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJkZmQxYjNiMDc0M2JmYWU4YTFkODk4NzczNjgyZWVkZCIsImRhdGEiOnsibWVyY2hhbnRfaWQiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAiLCJhcHBsaWNhdGlvbl9pZCI6IjVlYjkwMzVhYjA5ZDEyNjU4NTFmOTU2ZiJ9LCJpc3MiOiJodHRwczovL2RldmVsb3BlcnMtcHJldmlldy5zaG9wbGluZWFwcC5jb20iLCJhdWQiOltdLCJzdWIiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAifQ.Y90xLfYVAp9yByHo7Vc7A3hHrp6hX9X9Lg4mg_WiE_I', 'lang': 'en'}, 'sales_id': 553386, 'platform': 'FACEBOOK', 'prize_type': 'product', 'key': '5e3bba98882fc0fb22a0607238bc5b8f', 'type': 'activity'}
+    orderNumber, customer_id, res = manual_order(data)
+    print(orderNumber)
 
    

{sc_common_interface-2.8.5 → sc_common_interface-2.8.7}/sc_common_interface.egg-info/PKG-INFO

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

{sc_common_interface-2.8.5 → sc_common_interface-2.8.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='sc_common_interface',
-    version='2.8.5',
+    version='2.8.7',
     description='SC贴文销售公用的接口',
     author='river',
     packages=find_packages(),