Merge branch 'main' of https://git.opencomputing.cn/yumoqing/kboss

b/baiduc/baidu_confirm_auto_renew_order.dspy

@@ -720,11 +720,11 @@ async def baidu_confirm_auto_renew_order(ns={}):
     
     # 读取baidu_orders表格 确定状态是renew的订单ID
     renew_results = []
-    return {'1': 2}
+    # return {'1': 2}
     db = DBPools()
     async with db.sqlorContext('kboss') as sor:
-        renew_sql = """"SELECT bo.*, bs.user_id FROM baidu_orders AS bo LEFT JOIN baidu_users AS bs ON bo.accountid = bs.baidu_id WHERE bo.ordertype = 'RENEW' AND bo.status = 'NEED_CONFIRM' AND bo.del_flg = '0';"""
-        return {'1': renew_sql}
+        renew_sql = """ SELECT bo.*, bs.user_id FROM baidu_orders AS bo LEFT JOIN baidu_users AS bs ON bo.accountid = bs.baidu_id WHERE bo.ordertype = 'RENEW' AND bo.status = 'NEED_CONFIRM' AND bo.del_flg = '0'; """
+        # return {'1': renew_sql}
         renew_results = await sor.sqlExe(renew_sql, {})
         
     renew_status_count = 0

b/baiduc/baidu_order_cancel.dspy

@@ -0,0 +1,25 @@
+async def baidu_order_cancel(ns={}):
+    baidu_id = ns['baidu_id']
+    order_id = ns['order_id']
+    paydata = {'queryAccountId': baidu_id, 'orderIds': [order_id]}
+    ns_format = '&'.join(['%s=%s' % (k, v) for k, v in ns.items()])
+    url = 'https://billing.baidubce.com/v1/order/cancel?%s' % ns_format
+    method = 'POST'
+    header = {
+        "Host": "billing.baidubce.com"
+    }
+    header = await get_auth_header(method=method, url=url, header=header)
+    async with aiohttp_client.request(
+            method=method,
+            url=url,
+            headers=header,
+            json=paydata) as res:
+        res = await res.json()
+        print(res)
+    return {
+        'status': True,
+        'msg': 'order cancel success, %s' % str(res)
+    }
+
+ret = await baidu_order_cancel(params_kw)
+return ret