sc-common-interface 2.3.2__tar.gz → 2.3.4__tar.gz

{sc-common-interface-2.3.2 → sc-common-interface-2.3.4}/PKG-INFO

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

{sc-common-interface-2.3.2 → sc-common-interface-2.3.4}/sc_common_interface/LiveCommonInterface.py

@@ -88,16 +88,22 @@ def send__live_comment(data):
     keyword = "接口测试普通留言"
     if "keyword" in data:
         keyword = data['keyword']
-    body = {}
-    if platform == "FACEBOOK":
-        body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
+    body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
             "from": {"id": user_id, "name": name},
             "post": {"status_type": "added_video", "is_published": True, "updated_time": "2022-11-18T09:57:26+0000",
                      "permalink_url": "https://www.facebook.com/permalink.php?story_fbid=pfbid02jLK3e6YdFSXp2DmD7j7vtStLXoBzTi8rxKrp6jFhVMUTTEgz6qvZA8soR9Uwydd8l&id=107977035056574",
                      "promotion_status": "inactive", "id": post_id}, "message": keyword, "item": "comment",
             "verb": "add", "post_id": post_id, "comment_id": comment_id,
             "created_time": stamp, "parent_id": post_id}}]}]}
-    elif platform == "INSTAGRAM":
+    # if platform == "FACEBOOK":
+    #     body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
+    #         "from": {"id": user_id, "name": name},
+    #         "post": {"status_type": "added_video", "is_published": True, "updated_time": "2022-11-18T09:57:26+0000",
+    #                  "permalink_url": "https://www.facebook.com/permalink.php?story_fbid=pfbid02jLK3e6YdFSXp2DmD7j7vtStLXoBzTi8rxKrp6jFhVMUTTEgz6qvZA8soR9Uwydd8l&id=107977035056574",
+    #                  "promotion_status": "inactive", "id": post_id}, "message": keyword, "item": "comment",
+    #         "verb": "add", "post_id": post_id, "comment_id": comment_id,
+    #         "created_time": stamp, "parent_id": post_id}}]}]}
+    if platform == "INSTAGRAM":
         body = {"entry": [{"id": page_id, "time": stamp, "changes": [{"value": {"from": {"id": user_id,
                  "username": name},
                   "media": {"id": post_id,
@@ -139,12 +145,18 @@ def send_mc_message(data):
         i = platform_list.index(platform)
         page_id = info["data"]["relatedPostList"][i]["page_id"]
         platform = info["data"]["relatedPostList"][i]["platform"]
-    body = {}
-    if platform.upper()=="FACEBOOK":
-        body = {"entry":[{"id":"%s"%page_id,"messaging":[{"message":
-        {"mid":"m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg"%stamp,"text":"%s"%message},
-        "recipient":{"id":"%s"%page_id},"sender":{"id":"%s"%user_id},"timestamp":stamp}],"time":stamp}],"object":"page"}
-    elif platform.upper()=="INSTAGRAM":
+    body = {"entry": [{"id": "%s" % page_id, "messaging": [{"message":
+      {
+       "mid": "m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg" % stamp,
+        "text": "%s" % message},
+         "recipient": {"id": "%s" % page_id},
+         "sender": {"id": "%s" % user_id}, "timestamp": stamp}],
+         "time": stamp}], "object": "page"}
+    # if platform.upper()=="FACEBOOK":
+    #     body = {"entry":[{"id":"%s"%page_id,"messaging":[{"message":
+    #     {"mid":"m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg"%stamp,"text":"%s"%message},
+    #     "recipient":{"id":"%s"%page_id},"sender":{"id":"%s"%user_id},"timestamp":stamp}],"time":stamp}],"object":"page"}
+    if platform.upper()=="INSTAGRAM":
         body={"object":"instagram","entry":[{"time":stamp,"id":"%s"%page_id,"messaging":[{"sender":{"id":"%s"%user_id},"recipient":{"id":"%s"%page_id},
        "timestamp":stamp,"message":{"mid":"aWdfZAG1faXRlbToxOklHTWVzc2FnZAUlEOjE3ODQxNDUwMzgwODgwNTMzOjM0MDI4MjM2Njg0MTcxMDMwMTI0NDI3NjAyNDExMzcwMDc2NTA5MDozMTgzODU0Mzg3NTY4MDYwMTE3ODUxOTE2MD%d"%stamp,"text":"%s"%message}}]}]}
     url = "%s/facebook/webhook" % env
@@ -347,7 +359,7 @@ def get_broadcast_list(data):
         for i,value in enumerate(name_list):
             if value==name:
                 broadcast_id =broadcast_id_list[i]
-    return broadcast_id,name
+    return broadcast_id,reponse
 
 def get_broadcast_detail(data):
     env = data["env"]

{sc-common-interface-2.3.2 → sc-common-interface-2.3.4}/sc_common_interface/PostCommonInterface.py

@@ -480,15 +480,64 @@ def search_post_product(data):
     headers = data["headers"]
     url = "%s/api/posts/common/product/key/spu/list?page=1&searchType=ALL&pageSize=10"%env
     response = requests.get(url, headers=headers).json()
-    productSpuKeyVos = response["data"]["productSpuKeyVos"][0]
-    skuKeys = productSpuKeyVos["skuKeys"]
-    spuId = productSpuKeyVos["spuId"]
-    return skuKeys,spuId,response
+    items = response["data"]["openApiProductDetails"]
+    # productSpuKeyVos = response["data"]["productSpuKeyVos"][0]
+    # skuKeys = productSpuKeyVos["skuKeys"]
+    # spuId = productSpuKeyVos["spuId"]
+    # return skuKeys,spuId,response
+    type = "spu"
+    quantity = 100
+    if "type" in data:
+        type = data["type"]
+    if "quantity" in data:
+        quantity = data["quantity"]
+    if "query" in data:
+        query = data["query"]
+    variant_options_list = jsonpath(items, "$..variations")
+    product_info = ""
+    spu_id = ""
+    sku_id = ""
+    sku_id_quantity = []
+
+    for a, b in enumerate(variant_options_list):
+        if type == "spu" and b == [] and quantity != 0:
+            quantitys = items[a]["totalOrderableQuantity"]
+            unlimited_quantity = items[a]["unlimitedQuantity"]
+            if quantitys != 0 or unlimited_quantity == True:
+                product_info = items[a]
+                spu_id = items[a]["id"]
+                break
+        elif type == "sku" and b != [] and quantity != 0:
+            quantitys = items[a]["totalOrderableQuantity"]
+            unlimited_quantity = items[a]["unlimitedQuantity"]
+            if quantitys != 0 or unlimited_quantity == True:
+                product_info = items[a]
+                spu_id = items[a]["id"]
+                sku_id = jsonpath(items[a]["variations"], "$..id")
+                sku_id_quantity = jsonpath(items[a]["variations"], "$..totalOrderableQuantity")
+                break
+        elif type == "spu" and b == [] and quantity == 0:
+            quantitys = items[a]["totalOrderableQuantity"]
+            unlimited_quantity = items[a]["unlimitedQuantity"]
+            if quantitys != 0 or unlimited_quantity == True:
+                product_info = items[a]
+                spu_id = items[a]["id"]
+                break
+        elif type == "sku" and b != [] and quantity == 0:
+            quantitys = items[a]["totalOrderableQuantity"]
+            unlimited_quantity = items[a]["unlimited_quantity"]
+            if quantitys != 0 or unlimited_quantity == True:
+                product_info = items[a]
+                spu_id = items[a]["id"]
+                sku_id = jsonpath(items[a]["variations"], "$..id")
+                sku_id_quantity = jsonpath(items[a]["variations"], "$..totalOrderableQuantity")
+                break
+    return spu_id, sku_id, sku_id_quantity, product_info
 
 
 def model_one_add_product(data):
     """
-    贴文销售模式1-模式3添加商品，只添加第一个商品到贴文
+    贴文销售模式1-模式3添加商品，只添加第一个有库存商品到贴文
     :param data:
     :return:
     """
@@ -496,25 +545,27 @@ def model_one_add_product(data):
     headers = data["headers"]
     sales_id = data["sales_id"]
     url = "%s/api/posts/post/sales/%s/products"%(env,sales_id)
-    skuKeys, spuId, response = search_post_product(data)
+    spu_id, sku_id, sku_id_quantity, product_info = search_post_product(data)
+    # print("sku_id",sku_id)
     skuList = []
     body = {}
-    if skuKeys != None:
-        for index, sku in enumerate(skuKeys):
-            skuId = sku["skuId"]
-            spuId = sku["spuId"]
+    if len(sku_id) >1:
+        for index, sku in enumerate(sku_id):
+            # skuId = sku["skuId"]
+            # spuId = sku["spuId"]
             sku_data = {}
-            sku_data["skuId"] = skuId
+            sku_data["skuId"] = sku
             sku_data["missCommonKey"] = False
             sku_data["keyList"] = ["模式1关键字%d" % index]
             skuList.append(sku_data)
     # print(skuList)
-    if skuList == []:
+    if len(sku_id)<=1:
         body = {
-            "spuList": [{"spuId": spuId, "missCommonKey": "false", "customNumbers": [], "keyList": ["无规格商品关键字"]}]}
+            "spuList": [{"spuId": spu_id, "missCommonKey": "false", "customNumbers": [], "keyList": ["无规格商品关键字"]}]}
     else:
         body = {
-            "spuList": [{"spuId": spuId, "missCommonKey": "false", "customNumbers": [], "skuList": skuList}]}
+            "spuList": [{"spuId": spu_id, "missCommonKey": "false", "customNumbers": [], "skuList": skuList}]}
+    # print(body)
     response = requests.post(url, headers=headers, json=body).json()
     return response
 
@@ -528,25 +579,25 @@ def model_four_add_product(data):
     headers = data["headers"]
     sales_id = data["sales_id"]
     url = "%s/api/posts/post/sales/%s/products"%(env,sales_id)
-    skuKeys, spuId, response = search_post_product(data)
+    spu_id, sku_id, sku_id_quantity, product_info = search_post_product(data)
     skuList = []
-    if skuKeys != None:
-        for index, sku in enumerate(skuKeys):
-            skuId = sku["skuId"]
-            spuId = sku["spuId"]
+    if len(sku_id) >1:
+        for index, sku in enumerate(sku_id):
+            # skuId = sku["skuId"]
+            # spuId = sku["spuId"]
             sku_data = {}
-            sku_data["skuId"] = skuId
+            sku_data["skuId"] = sku
             sku_data["missCommonKey"] = False
             skuList.append(sku_data)
     # print(skuList)
     customNumbers = "模式4接口关键字下单"
     body = {}
-    if skuList == []:
+    if len(sku_id) <= 1:
         body = {"spuList": [
-            {"spuId": spuId, "missCommonKey": "true", "customNumbers": [customNumbers], "customNumber": customNumbers}]}
+            {"spuId": spu_id, "missCommonKey": "true", "customNumbers": [customNumbers], "customNumber": customNumbers}]}
     else:
         body = {"spuList": [
-            {"spuId": spuId, "missCommonKey": "false", "customNumbers": [customNumbers], "customNumber": customNumbers,
+            {"spuId": spu_id, "missCommonKey": "false", "customNumbers": [customNumbers], "customNumber": customNumbers,
              "skuList": skuList}]}
     response = requests.post(url, headers=headers, json=body).json()
     return response
@@ -1467,11 +1518,4 @@ def get_mc_order_link(url):
 
 if __name__=="__main__":
     pass
-    # headers = {"content-type": "application/json",
-    #            "authorization": "Bearer 11eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiIzN2Y2MjY2M2IyMTI1MjIzMWZlMTc4MTE2ODhkNDliYSIsImRhdGEiOnsibWVyY2hhbnRfaWQiOiI2MjI5YTdiYWVhNzA2NDJhOGI2NWViZGEiLCJhcHBsaWNhdGlvbl9pZCI6IjYwZWVjNWViZjhkYzkyMDAwNjUyZTAwNiJ9LCJpc3MiOiJodHRwczovL2RldmVsb3BlcnMteXkuc2hvcGxpbmVzdGcuY29tIiwiYXVkIjpbXSwic3ViIjoiNjIyOWE3YmFlYTcwNjQyYThiNjVlYmRhIn0.FwtntG1dAYWNUcEZf6WSehXQveEw_rvTSGPEM3xV9FA"}
-    # data = {"env": "https://front-service.shoplinestg.com", "headers": headers, "platform": "FB_GROUP",
-    #         "sales_id": "84031", "page_id": "110842575060695",
-    #         "relationUrl": "https://www.facebook.com/groups/416632743936652/posts/823646243235298/"}
-    # res = relate_post(data)
-    # print(res)
 

{sc-common-interface-2.3.2 → sc-common-interface-2.3.4}/sc_common_interface.egg-info/PKG-INFO

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

{sc-common-interface-2.3.2 → sc-common-interface-2.3.4}/setup.py

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