优化

dgp/tests/get_order_hourly_new.py

@@ -0,0 +1,45 @@
+
+"""
+
+@date ck
+@desc 每小时获取各平台的的订单数据
+
+"""
+from util import platform_config_util
+from util import date_util
+from util import db_order_util_new
+from util import platform_order_api_util_new
+import time
+import sys
+
+def start_order_job(st,et):
+    start = time.time()
+
+    account_list_yuewen = platform_config_util.get_yuewen_account_list()
+    account_list_zhangzhongyun = platform_config_util.get_zhangzhongyun_account_list()
+    account_list_huasheng = platform_config_util.get_huasheng_account_list()
+    account_list_youshuge = platform_config_util.get_youshuge_account_list()
+    account_list_zhangdu = platform_config_util.get_zhangdu_account_list()
+
+    db_order_util_new.batch_save_order(platform_order_api_util_new.get_yuewen_order(st,et, account_list_yuewen))
+    db_order_util_new.batch_save_order(platform_order_api_util_new.get_zhangzhongyun_order(st, et, account_list_zhangzhongyun))
+    db_order_util_new.batch_save_order(platform_order_api_util_new.get_huasheng_order(st,et, account_list_huasheng))
+    db_order_util_new.batch_save_order(platform_order_api_util_new.get_youshuge_order(st,et, account_list_youshuge))
+    db_order_util_new.batch_save_order(platform_order_api_util_new.get_zhangdu_order(st,et, account_list_zhangdu))
+
+
+    print('订单同步执行时间（秒）：', int(time.time() - start))
+
+
+if __name__ == '__main__':
+    print(date_util.getCurrentFormatTimeStr())
+
+    st = date_util.get_n_day(n=0, is_timestamp=1)
+    et = date_util.getPreviousHourAndCurrentHourSecondTime()[1]
+
+
+    if sys.argv.__len__()>1:
+        st = date_util.get_n_day(n=-1, is_timestamp=1)
+        et = date_util.get_n_day(n=0, is_timestamp=1)
+
+    start_order_job(st, et)

dgp/tests/util/db_order_util.py

@@ -32,7 +32,7 @@ def batch_save_order(data):
     if data is None or len(data) == 0:
         print('数据为空，不执行数据库操作！')
     else:
-        sql = 'INSERT IGNORE INTO quchen_text.`order` (amount,channel,channel_id,date,from_novel,order_id,order_time,platform,reg_time,stage,user_id) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
+        sql = 'replace INTO quchen_text.`order` (amount,channel,channel_id,date,from_novel,order_id,order_time,platform,reg_time,stage,user_id) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
         connect = MySQLConnection()
         try:
             num = connect.batch(sql, data)

dgp/tests/util/db_order_util_new.py

@@ -0,0 +1,34 @@
+
+from util.MySQLConnection import MySQLConnection
+
+
+# 数据导入表采用replace替换主键orderid的方法
+def batch_save_order(data):
+    if data is None or len(data) == 0:
+        print('数据为空，不执行数据库操作！')
+    else:
+        sql = 'replace INTO quchen_text.`ods_order` (amount,channel,channel_id,date,from_novel,order_id,order_time,platform,reg_time,stage,user_id) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
+        connect = MySQLConnection()
+        try:
+            num = connect.batch(sql, data)
+            # 提交
+            connect.commit()
+            print('订单数据最终入库【{num}】条'.format(num=num))
+        except Exception as e:
+            print('订单数据入库失败：', e)
+        finally:
+            connect.close()
+
+
+# 获取各平台的订单数量
+def get_platform_order_count(date):
+    sql = 'SELECT platform, COUNT(1) AS num FROM quchen_text.`order` WHERE date = %s GROUP BY platform'
+    connect = MySQLConnection()
+    platform_order_count = []
+    try:
+        platform_order_count = connect.query(sql, date)
+    except Exception as e:
+        print('各平台的订单数据查询失败：', e)
+    finally:
+        connect.close()
+    return platform_order_count

dgp/tests/util/platform_order_api_util_new.py

@@ -0,0 +1,609 @@
+
+import datetime
+import hashlib
+import math
+import time
+from concurrent.futures import ProcessPoolExecutor
+from urllib import parse
+
+import requests
+
+from util import date_util
+from util import platform_config_util
+from util import robust_util
+
+
+# md5加密，使用utf-8编码
+def md5(s):
+    md5 = hashlib.md5()
+    md5.update(s.encode("utf-8"))
+    return md5.hexdigest()
+
+
+## sha1加密，使用utf-8编码
+def sha1(s):
+    sha1 = hashlib.sha1()
+    sha1.update(s.encode("utf-8"))
+    return sha1.hexdigest()
+
+
+# 阅文
+@robust_util.catch_exception
+def get_yuewen_order(st, et, account_list):
+    start_exec_seconds = date_util.getCurrentSecondTime()
+    total_order_list = ()
+    #account_list = platform_config_util.get_yuewen_account_list()
+
+    executor = ProcessPoolExecutor(max_workers=5)
+
+    futures = []
+    for account in account_list:
+        future = executor.submit(get_yuewen_order_task, st, et, account)
+        futures.append(future)
+
+    executor.shutdown(True)
+
+    for future in futures:
+        order_list = future.result()
+        if len(order_list) > 0:
+            total_order_list = order_list + total_order_list
+
+    print('阅文订单数量：', len(total_order_list), '执行时长（秒）：', date_util.getCurrentSecondTime() - start_exec_seconds)
+    return total_order_list
+
+
+def get_yuewen_order_task(st, et, account):
+    order_list = ()
+
+    email = account[0]
+    appsecert = account[1]
+
+    url = 'https://open.yuewen.com/cpapi/wxRecharge/querychargelog'
+    version = 1
+    order_status = 2  # 已支付
+    page_count = 100  # 每页100条数据
+    start_time = st
+
+    for i in range((et - st) // 86400 + 1):
+        page = 1
+        last_min_id = ''
+        last_max_id = ''
+        total_count = ''
+        last_page = ''
+
+        while True:
+            if start_time == et:
+                break
+
+            end_time = min(start_time + 86400, et)
+            timestamp = int(time.time())
+
+            params = {
+                'email': email,
+                'version': version,
+                'timestamp': timestamp,
+                'start_time': start_time,
+                'end_time': end_time,
+                'page': page,
+                'order_status': order_status
+            }
+
+            if page > 1:
+                params['last_min_id'] = last_min_id
+                params['last_max_id'] = last_max_id
+                params['total_count'] = total_count
+                params['last_page'] = last_page
+
+            sorted_data = sorted(params.items())
+            str_params = ''
+            for k, v in sorted_data:
+                str_params = str_params + str(k) + str(v)
+
+            sign = md5(appsecert + str_params).upper()
+
+            # 放入签名
+            params['sign'] = sign
+            response_result_json = requests.get(url=url, params=params).json()
+
+            code = response_result_json['code']
+            ## 此接口有调用频率限制，相同查询条件每分钟仅能请求一次
+            if code != 0:
+                print('阅文查询充值接口异常：', response_result_json, '参数', params)
+                break
+
+
+            response_data = response_result_json['data']
+            total_count = response_data['total_count']
+
+            if total_count == 0:
+                continue
+
+            last_min_id = response_data['min_id']
+            last_max_id = response_data['max_id']
+            last_page = response_data['page']
+            order_item_list = response_data['list']
+
+            for order_item in order_item_list:
+                order_time = order_item['order_time']
+                order_id = order_item['order_id']
+                order = {}
+                order['platform'] = '阅文'
+                order['channel'] = order_item['app_name']
+                order['from_novel'] = order_item['book_name']
+                order['user_id'] = order_item['openid']
+                order['stage'] = ''
+                order['channel_id'] = 0
+                order['order_time'] = order_time
+                order['amount'] = order_item['amount']
+                order['reg_time'] = order_item['reg_time']
+                order['order_id'] = order_id
+                order['date'] = order_time[:10]
+
+                order = sorted(order.items(), key=lambda item: item[0])
+                order = dict(order)
+                order = tuple(order.values())
+                order_list = order_list + ((order),)
+
+
+            if int(page) >= math.ceil(total_count / int(page_count)):
+                break
+
+            page = page + 1
+
+        start_time = start_time + 86400  # 天数加1
+    return order_list
+
+
+# 掌读
+@robust_util.catch_exception
+def get_zhangdu_order(st, et, account_list):
+
+    start_exec_seconds = date_util.getCurrentSecondTime()
+    total_order_list = ()
+    #account_list = platform_config_util.get_zhangdu_account_list()
+
+    executor = ProcessPoolExecutor(max_workers=5)
+
+    futures = []
+    for account in account_list:
+        future = executor.submit(get_zhangdu_order_task, st, et, account)
+        futures.append(future)
+    executor.shutdown(True)
+
+    for future in futures:
+        order_list = future.result()
+        if len(order_list) > 0:
+            total_order_list = order_list + total_order_list
+
+    print('掌读订单数量：', len(total_order_list), '执行时长（秒）：', date_util.getCurrentSecondTime() - start_exec_seconds)
+    return total_order_list
+
+
+def get_zhangdu_order_task(st, et, account):
+    order_list = ()
+    url = 'https://api.zhangdu520.com/channel/getorder'
+
+    uid = account[0]
+    appsecert = account[1]
+    channel = account[2]
+    stage=account[3]
+    timestamp = int(time.time())
+    sign = md5(str(uid) + '&' + appsecert + '&' + str(timestamp))
+    starttime = st
+    timespace = 90 * 3600 * 24
+    endtime = min(et, st + timespace)
+
+    for x in range((et - st) // timespace + 1):  # 分时段
+        if x > 0:
+            print('掌读跨天数查询:', x)
+
+        page = 1
+        while True:
+            params = {
+                'uid': uid,
+                'timestamp': timestamp,
+                'sign': sign,
+                'starttime': starttime,
+                'endtime': endtime,
+                'page': page
+            }
+            response_result_json = requests.get(url=url, params=params).json()
+            if 'data' not in response_result_json.keys():
+                print('掌读账号【{key}】, 查询时间【{start_time} - {end_time}】，本次请求数据异常，响应报文【{result}】'
+                      .format(key=uid, start_time=date_util.getSecondsToDatetime(starttime),
+                                  end_time=date_util.getSecondsToDatetime(endtime), result=response_result_json))
+                break
+
+            result_data = response_result_json['data']
+            page_count = result_data['pageCount']
+            if page_count == 0:
+                break
+
+            order_item_list = result_data['list']
+            for order_item in order_item_list:
+                if order_item['status'] != '1':#1为已支付
+                    continue
+                order = {}
+                order['amount'] = order_item['amount']
+                order['channel_id'] = uid
+                order['order_id'] = str(order_item['orderno'])
+                order['order_time'] = date_util.stamp_to_str(int(order_item['ctime']))
+                order['user_id'] = order_item['openid']
+                order['platform'] = '掌读'
+                order['channel'] = channel
+                order['reg_time'] = date_util.stamp_to_str(int(order_item['regtime']))
+                order['from_novel'] = order_item.get('book_entry','')
+                order['stage'] = stage
+                order_time=date_util.stamp_to_str(int(order_item['ctime']))
+                order['date'] = order_time[:10]
+
+                x = sorted(order.items(), key=lambda item: item[0])
+                x = dict(x)
+                x = tuple(x.values())
+                order_list = order_list + ((x),)
+
+            if page == page_count: #是最后一页
+                break
+
+            page = page + 1
+
+
+        starttime = starttime + timespace
+        endtime = min(et, starttime + timespace)
+
+    return order_list
+
+
+# 花生
+@robust_util.catch_exception
+def get_huasheng_order(st, et, account_list):
+    start_exec_seconds = date_util.getCurrentSecondTime()
+    total_order_list = ()
+    #account_list = platform_config_util.get_huasheng_account_list()
+
+    executor = ProcessPoolExecutor(max_workers=5)
+
+    futures = []
+    for account in account_list:
+        url = 'https://vip.rlcps.cn/api/getMerchants'
+        apiKey = str(account[0])
+        apiSecurity = account[1]
+        timestamp = str(int(time.time()))
+        sign = md5(apiKey + timestamp + apiSecurity).upper()
+        params = {
+            'apiKey': apiKey,
+            'apiSecurity': apiSecurity,
+            'timestamp': timestamp,
+            'sign': sign
+        }
+        response_result_json = requests.post(url, params).json()
+
+        if 'data' not in response_result_json.keys():
+            print('花生账号【{apiKey}】本次请求数据异常，响应报文【{result}】'.format(apiKey=apiKey, result=response_result_json))
+            continue
+
+        for merchant in response_result_json['data']:
+            future = executor.submit(get_huasheng_order_task, st, et, account, merchant)
+            futures.append(future)
+
+    executor.shutdown(True)
+
+    for future in futures:
+        order_list = future.result()
+        if len(order_list) > 0:
+            total_order_list = order_list + total_order_list
+
+    print('花生订单数量：', len(total_order_list), '执行时长（秒）：', date_util.getCurrentSecondTime() - start_exec_seconds)
+    return total_order_list
+
+
+def get_huasheng_order_task(st, et, account, merchant):
+    order_list = ()
+
+    apiKey = str(account[0])
+    apiSecurity = account[1]
+    stage = account[2]
+    timestamp = str(int(time.time()))
+
+    order_url = 'https://vip.rlcps.cn/api/orderList'
+    merchant_id = merchant['merchant_id']
+    merchant_name = merchant['merchant_name']
+    start_time = st
+    limit = 500
+
+    for i in range((et - st) // 86400 + 1):
+        page = 1
+
+        while True:
+            date = time.strftime("%Y-%m-%d", time.localtime(start_time))
+            sign = md5(apiKey + date + str(merchant_id) + timestamp + apiSecurity).upper()
+            order_params = {
+                'apiKey': apiKey,
+                'apiSecurity': apiSecurity,
+                'timestamp': timestamp,
+                'date': date,
+                'merchant_id': merchant_id,
+                'sign': sign,
+                'page': page,
+                'limit': limit
+            }
+            response_result_json = requests.post(order_url, order_params).json()
+
+            if 'data' not in response_result_json.keys():
+                print('花生账号【{key}】, 查询时间【{date}】, 渠道【{merchant_id}:{merchant_name}】本次请求数据异常，响应报文【{result}】'
+                      .format(key=apiKey, date=date, merchant_id=merchant_id, merchant_name=merchant_name,
+                              result=response_result_json))
+                break
+
+            if len(response_result_json['data']) == 0:
+                break
+
+            total_count = response_result_json['count']
+            order_item_list = response_result_json['data']
+
+            for order_item in order_item_list:
+                if order_item['order_status'] == 1:  # 1为已支付
+                    order = {}
+                    order['user_id'] = order_item['openid']
+                    order['order_id'] = order_item['trans_id']
+                    order['order_time'] = order_item['pay_at']
+                    order['reg_time'] = order_item['join_at']
+                    order['channel'] = merchant_name
+                    order['channel_id'] = merchant_id
+                    order['platform'] = '花生'
+                    order['stage'] = stage
+                    order['from_novel'] = order_item['book_name']
+                    order['amount'] = order_item['amount']
+                    order["date"] = order_item['pay_at'][:10]
+                    order = sorted(order.items(), key=lambda item: item[0])
+                    order = dict(order)
+                    order = tuple(order.values())
+                    order_list = order_list + ((order),)
+
+            if int(page) >= math.ceil(total_count / int(limit)):
+                break
+
+
+            page = page + 1
+
+        start_time = start_time + 86400  # 天数加1
+
+    return order_list
+
+
+# 掌中云
+@robust_util.catch_exception
+def get_zhangzhongyun_order(st, et, account_list):
+    start_exec_seconds = date_util.getCurrentSecondTime()
+    total_order_list = ()
+
+    executor = ProcessPoolExecutor(max_workers=5)
+
+    futures = []
+    for account in account_list:
+        url = 'https://inovel.818tu.com/partners/channel/channels/list?'
+        key = account[0]
+        secert = account[1]
+        sign = md5(secert + 'key=' + key)
+        params = 'key=' + key + '&sign=' + sign
+        response_result_json = requests.get(url + params).json()  # 获取子渠道列表
+
+        if 'data' not in response_result_json.keys():
+            print('掌中云账号【{key}】本次请求数据异常，响应报文【{result}】'.format(key=key, result=response_result_json))
+            continue
+
+        items = response_result_json['data']['items']
+        for channel in items:
+            # 获取channel_id 后逐个拉取历史orders
+            future = executor.submit(get_zhangzhongyun_order_task, st, et, account, channel)
+            futures.append(future)
+
+    executor.shutdown(True)
+
+    for future in futures:
+        order_list = future.result()
+        if len(order_list) > 0:
+            total_order_list = order_list + total_order_list
+
+    print('掌中云订单数量：', len(total_order_list), '执行时长（秒）：', date_util.getCurrentSecondTime() - start_exec_seconds)
+    return total_order_list
+
+
+def get_zhangzhongyun_order_task(st, et, account, channel):
+    # 掌中云的时间格式比较特殊,转换下
+    get_time=datetime.datetime.strptime(date_util.stamp_to_str(st),"%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%dT%H:%M:%S+08:00")
+    limit_time=datetime.datetime.strptime(date_util.stamp_to_str(et),"%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%dT%H:%M:%S+08:00")
+    order_list = ()
+    key = account[0]
+    secert = account[1]
+    stage = account[2]
+
+    order_url = 'https://openapi.818tu.com/partners/channel/orders/list?'
+    channel_id = channel['id']
+    channel_name = channel['nickname']
+    status = str(1)
+    page = str(1)
+    per_page = str(1000)
+    gte = parse.urlencode({'created_at[gte]': get_time})  # gte就是ge 大于等于开始时间
+    lt = parse.urlencode({'created_at[lt]': limit_time})  # 小于 结束时间
+
+    while True:
+        sign = md5(secert + 'channel_id=' + str(
+            channel_id) + '&created_at[gte]=' + get_time + '&created_at[lt]=' + limit_time + '&key=' + key + '&page=' + str(
+            page) + '&per_page=' + per_page + '&status=' + status)
+        params = 'channel_id=' + str(channel_id) + '&' + gte + '&' + lt + '&page=' + str(
+            page) + '&per_page=' + per_page + '&status=' + status + '&key=' + key + '&sign=' + sign
+        response_result_json={}
+        while True:
+            r = requests.get(order_url + params)
+            if r.status_code==200:
+                response_result_json = r.json()
+                break
+            else:
+                time.sleep(1)
+                print("掌中云接口调用sleep 1s...")
+
+
+        if 'data' not in response_result_json.keys():
+            print('掌中云账号【{key}】，查询时间【{start_time} - {end_time}】，渠道【{channel_id}:{channel_name}】本次请求数据异常，响应报文【{result}】'
+                  .format(key=key, start_time=date_util.getSecondsToDatetime(get_time),
+                                  end_time=date_util.getSecondsToDatetime(limit_time),channel_id=channel_id, channel_name=channel_name, result=response_result_json))
+            break
+
+        total_count = response_result_json['data']['count']  # 总数量
+        order_item_list = response_result_json['data']['items']  # 订单列表
+
+        for order_item in order_item_list:
+            order = {}
+            order['user_id'] = str(order_item['member']['openid'])
+            order['channel'] = channel_name
+            order['reg_time'] = datetime.datetime.strptime(order_item['member']['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
+            order['channel_id'] = channel_id
+            order['amount'] = round(order_item['price'] / 100, 2)
+            order['order_id'] = str(order_item['id'])
+            order['order_time'] = datetime.datetime.strptime(order_item['created_at'],"%Y-%m-%dT%H:%M:%S+08:00").strftime("%Y-%m-%d %H:%M:%S")
+            order['platform'] = '掌中云'
+            order['stage'] = stage
+            order['date'] = order["order_time"][:10]
+
+            if str(order_item['from_novel_id']) != 'None':
+                order['from_novel'] = order_item['from_novel']['title']
+            else:
+                order['from_novel'] = 'None'
+
+            x = sorted(order.items(), key=lambda item: item[0])
+            x = dict(x)
+            x = tuple(x.values())
+            order_list = order_list + ((x),)
+
+        if int(page) >= math.ceil(total_count / int(per_page)):
+            break
+        page = int(page) + 1
+
+    return order_list
+
+
+# 悠书阁
+@robust_util.catch_exception
+def get_youshuge_order(st, et, account_list):
+    start_exec_seconds = date_util.getCurrentSecondTime()
+    total_order_list = ()
+
+
+    executor = ProcessPoolExecutor(max_workers=5)
+
+    futures = []
+    for account in account_list:
+        future = executor.submit(get_youshuge_order_task, st, et, account)
+        futures.append(future)
+
+    executor.shutdown(True)
+
+    for future in futures:
+        order_list = future.result()
+        if len(order_list) > 0:
+            total_order_list = order_list + total_order_list
+
+    print('悠书阁订单数量：', len(total_order_list), '执行时长（秒）：', date_util.getCurrentSecondTime() - start_exec_seconds)
+    return total_order_list
+
+
+def get_youshuge_order_task(st, et, account):
+    # 悠书阁的查询end_date时间必须要大于start_date
+    start_date, end_date = platform_config_util.get_youshuge_order_query_time(st, et)
+
+    order_list = ()
+
+    host_name = account[0]
+    channel_id = int(account[1])
+    secert_key = account[2]
+    channel = account[3]
+    stage = account[4]
+
+    url = 'https://novel.youshuge.com/v2/open/orders'
+    page = 1
+    timestamp = int(time.time())
+
+    while True:
+        sign = md5('channel_id=' + str(channel_id) + '&end_date=' + end_date + '&host_name=' + host_name + '&page='
+                   + str(page) + '&pay_status=1' + '&start_date=' + start_date + '&time=' + str(timestamp) + '&key=' + secert_key).upper()
+        params = {
+            'sign': sign,
+            'host_name': host_name,
+            'time': timestamp,
+            'channel_id': channel_id,
+            'page': page,
+            'pay_status': 1,
+            'start_date': start_date,
+            'end_date': end_date
+        }
+        respone = requests.post(url, params)
+        if respone.status_code == 400:
+            print('悠书阁订单查询接口respone', respone)
+
+        response_result_json = respone.json()
+        if 'data' not in response_result_json.keys():
+            print('悠书阁账号【{key}】，查询时间【{start_time} - {end_time}】，渠道【{channel_id}:{channel_name}】本次请求数据异常，响应报文【{result}】'
+                  .format(key=host_name, start_time=start_date, end_time=end_date, channel_id=channel_id, result=response_result_json))
+            break
+
+        order_item_list = response_result_json['data']
+        if len(order_item_list) == 0:
+            break
+
+        for order_item in order_item_list:
+            order = {}
+            order['order_id'] = order_item['order_num']
+            order['amount'] = round(int(order_item['price']) / 100, 2)
+            order['order_time'] = order_item['create_time']
+            order['channel'] = channel
+            order['from_novel'] = order_item['book_name']
+            order['stage'] = stage
+            order['user_id'] = order_item['openid']
+            order['channel_id'] = channel_id
+            order['platform'] = '悠书阁'
+            order['reg_time'] = order_item['reg_time']
+            order['date']=order['order_time'][:10]
+            order = sorted(order.items(), key=lambda item: item[0])
+            order = dict(order)
+            order = tuple(order.values())
+            order_list = order_list + ((order),)
+
+        total_count = order_item_list[0]['count']
+
+        if page == total_count:
+            break
+
+        page = page + 1
+
+
+    return order_list
+
+
+def build_ysg_order_data(channel, channel_id, result_json, stage):
+    order_list = ()
+    if 'data' in result_json.keys():
+        data = result_json['data']
+        if len(data) > 0:
+            for x in data:
+                y = {}
+                dtime = datetime.datetime.strptime(x['create_time'][0:10], "%Y-%m-%d")
+                y['date'] = ((int(
+                    time.mktime(dtime.timetuple())) + 8 * 3600) // 86400) * 86400 - 8 * 3600
+                y['order_id'] = x['order_num']
+                y['amount'] = round(int(x['price']) / 100, 2)
+                y['order_time'] = x['create_time']
+                y['channel'] = channel
+                y['from_novel'] = x['book_name']
+                y['stage'] = stage
+                y['user_id'] = x['openid']
+                y['channel_id'] = channel_id
+                y['platform'] = '悠书阁'
+                y['reg_time'] = x['reg_time']
+
+                y = sorted(y.items(), key=lambda item: item[0])
+                y = dict(y)
+                y = tuple(y.values())
+                order_list = order_list + ((y),)
+    return order_list
+