pixelarraythirdparty 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

pixelarraythirdparty/__init__.py

@@ -10,7 +10,7 @@ PixelArray 第三方微服务客户端
 - user: 用户管理模块
 """
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 __author__ = "Lu qi"
 __email__ = "qi.lu@pixelarrayai.com"
 

pixelarraythirdparty/order/order.py

@@ -4,17 +4,13 @@ from pixelarraythirdparty.client import Client
 class OrderManager(Client):
     def create_order(
         self,
-        product_name: str,
         product_id: str,
-        amount: float,
-        body: str,
-        remark: str,
-        payment_channel: str,
+        body: str = None,
+        remark: str = None,
+        payment_channel: str = "WECHAT",
     ):
         data = {
-            "product_name": product_name,
             "product_id": product_id,
-            "amount": amount,
             "body": body,
             "remark": remark,
             "payment_channel": payment_channel,
@@ -29,58 +25,42 @@ class OrderManager(Client):
         page: int = 1,
         page_size: int = 10,
         payment_status: str = None,
-        order_no: str = None,
+        out_trade_no: str = None,
     ):
         params = {
             "page": page,
             "page_size": page_size,
             "payment_status": payment_status,
-            "order_no": order_no,
+            "out_trade_no": out_trade_no,
         }
         data, success = self._request("GET", "/api/orders/list", params=params)
         if not success:
             return {}, False
         return data, True
 
-    def get_order_detail(self, order_no: str):
-        data, success = self._request("GET", f"/api/orders/{order_no}")
+    def get_order_detail(self, out_trade_no: str):
+        data, success = self._request("GET", f"/api/orders/{out_trade_no}")
         if not success:
             return {}, False
         return data, True
 
-    def update_order(
+    def update_order_status(
         self,
-        order_no: str,
+        out_trade_no: str,
         payment_status: str,
-        wx_order_no: str,
-        transaction_id: str,
-        openid: str,
-        trade_type: str,
-        bank_type: str,
-        fee_type: str,
-        is_subscribe: str,
-        time_end: str,
-        remark: str,
     ):
         data = {
             "payment_status": payment_status,
-            "wx_order_no": wx_order_no,
-            "transaction_id": transaction_id,
-            "openid": openid,
-            "trade_type": trade_type,
-            "bank_type": bank_type,
-            "fee_type": fee_type,
-            "is_subscribe": is_subscribe,
-            "time_end": time_end,
-            "remark": remark,
         }
-        data, success = self._request("PUT", f"/api/orders/{order_no}", json=data)
+        data, success = self._request(
+            "PUT", f"/api/orders/{out_trade_no}/status", json=data
+        )
         if not success:
             return {}, False
         return data, True
 
-    def delete_order(self, order_no: str):
-        data, success = self._request("DELETE", f"/api/orders/{order_no}")
+    def delete_order(self, out_trade_no: str):
+        data, success = self._request("DELETE", f"/api/orders/{out_trade_no}")
         if not success:
             return {}, False
         return data, True
@@ -90,3 +70,41 @@ class OrderManager(Client):
         if not success:
             return {}, False
         return data, True
+
+    def generate_qr_code(
+        self,
+        out_trade_no: str,
+        payment_channel: str = "WECHAT",
+    ):
+        if payment_channel == "WECHAT":
+            url = "/api/orders/wx_pay/generate_qr_code"
+        elif payment_channel == "ALIPAY":
+            url = "/api/orders/ali_pay/generate_qr_code"
+        else:
+            raise ValueError("Invalid payment channel")
+        data, success = self._request(
+            "POST",
+            url,
+            json={
+                "out_trade_no": out_trade_no,
+            },
+        )
+        if not success:
+            return {}, False
+        return data, True
+
+    def refund_order(self, out_trade_no: str, payment_channel: str = "WECHAT"):
+        if payment_channel == "WECHAT":
+            url = "/api/orders/wx_pay/refund"
+        elif payment_channel == "ALIPAY":
+            url = "/api/orders/ali_pay/refund"
+        else:
+            raise ValueError("Invalid payment channel")
+        data, success = self._request(
+            "POST",
+            url,
+            json={"out_trade_no": out_trade_no},
+        )
+        if not success:
+            return {}, False
+        return data, True

{pixelarraythirdparty-1.0.2.dist-info → pixelarraythirdparty-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraythirdparty
-Version: 1.0.2
+Version: 1.0.3
 Summary: PixelArray 第三方微服务客户端
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT

{pixelarraythirdparty-1.0.2.dist-info → pixelarraythirdparty-1.0.3.dist-info}/RECORD

@@ -1,16 +1,15 @@
-pixelarraythirdparty/__init__.py,sha256=WVQdADzRD3tqhJvfxOm3qUInd9L0KRW-u5u37u6xq2c,458
+pixelarraythirdparty/__init__.py,sha256=TYuj96ZwZ4VXhB9Xn4KoEWpoJVsChUjzoWSRZONmC-U,458
 pixelarraythirdparty/client.py,sha256=dJlIrMlr1M4AGHvaLw191uaPnQbQ12_BGx8DTDTPkZQ,802
 pixelarraythirdparty/celery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/celery/celery.py,sha256=Oaa7pBztL-FM0X5NSCjjfZP80AUsnnme5Z3RxXIJsZg,1178
 pixelarraythirdparty/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pixelarraythirdparty/order/order.py,sha256=51KcwBGfXS9Ico_0jlwcLUqcAgc9xgRutozqtlWwyHY,2616
-pixelarraythirdparty/order/pay.py,sha256=Fq7HKeYS_jk9CWdPldXE5OzuHl66SHHQW4sYlG6yODM,1251
+pixelarraythirdparty/order/order.py,sha256=kmJNAvfiXxhjOhRbD3JTl1saE8aetMZ0TFR9NjPsaIM,3208
 pixelarraythirdparty/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/product/product.py,sha256=eHU0VKal1QpJs6F4_VxLoBYeeqQ19elEogH2Qpw7IDo,3029
 pixelarraythirdparty/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/user/user.py,sha256=tbcFsrNEdWz4op7V_zJ5o8neBuI4ogl4dgHS-uSIAX0,2155
-pixelarraythirdparty-1.0.2.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
-pixelarraythirdparty-1.0.2.dist-info/METADATA,sha256=DQSV5A4aLGQ4FVKmol3IgYsZYKLLgyb2zXC4YnhLJPY,993
-pixelarraythirdparty-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pixelarraythirdparty-1.0.2.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
-pixelarraythirdparty-1.0.2.dist-info/RECORD,,
+pixelarraythirdparty-1.0.3.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
+pixelarraythirdparty-1.0.3.dist-info/METADATA,sha256=_BcKEA0W8joCfUZcvDqyKBkBXKGyWUwIDVI16boT7s4,993
+pixelarraythirdparty-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pixelarraythirdparty-1.0.3.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
+pixelarraythirdparty-1.0.3.dist-info/RECORD,,

pixelarraythirdparty/order/pay.py

@@ -1,44 +0,0 @@
-from pixelarraythirdparty.client import Client
-
-
-class WeChatPayManager(Client):
-    def generate_qr_code(
-        self,
-        out_trade_no: str,
-        total_fee: int,
-        body: str,
-        product_name: str,
-        product_id: str,
-    ):
-        data, success = self._request(
-            "POST",
-            "/api/wx_pay/generate_qr_code",
-            json={
-                "out_trade_no": out_trade_no,
-                "total_fee": total_fee,
-                "body": body,
-                "product_name": product_name,
-                "product_id": product_id,
-            },
-        )
-        if not success:
-            return {}, False
-        return data, True
-
-    def query_order(self, out_trade_no: str):
-        data, success = self._request(
-            "POST", "/api/wx_pay/query_order", json={"out_trade_no": out_trade_no}
-        )
-        if not success:
-            return {}, False
-        return data, True
-
-    def refund(self, out_trade_no: str, total_fee: int):
-        data, success = self._request(
-            "POST",
-            "/api/wx_pay/refund",
-            json={"out_trade_no": out_trade_no, "total_fee": total_fee},
-        )
-        if not success:
-            return {}, False
-        return data, True