1

dgp/tests/get_order_hourly.py

@@ -1,43 +1,21 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """
-__title__ = '每小时获取各平台的的订单数据'
-
-@Time    : 2020/10/11 15:00
-@Author  : Kenny-PC
-@Software: PyCharm
-
-# code is far away from bugs with the god animal protecting
-    I love animals. They taste delicious.
-              ┏┓      ┏┓
-            ┏┛┻━━━┛┻┓
-            ┃      ☃      ┃
-            ┃  ┳┛  ┗┳  ┃
-            ┃      ┻      ┃
-            ┗━┓      ┏━┛
-                ┃      ┗━━━┓
-                ┃  神兽保佑    ┣┓
-                ┃　永无BUG！   ┏┛
-                ┗┓┓┏━┳┓┏┛
-                  ┃┫┫  ┃┫┫
-                  ┗┻┛  ┗┻┛
+
+@date ck
+@desc 每小时获取各平台的的订单数据
+
 """
 from util import platform_config_util
 from util import date_util
 from util import db_order_util
 from util import platform_order_api_util
+import time
+import datetime
 
 
 def start_order_job():
-    start_exec_seconds = date_util.getCurrentSecondTime()
-    st_unix, et_unix = date_util.getPreviousHourAndCurrentHourSecondTime(start_exec_seconds)
-
-    # st_unix = 1602313200  # 2020/10/10 15:0:0
-    # et_unix = 1602316800  # 2020/10/10 16:0:0
-    print('查询开始时间：', st_unix, date_util.getSecondsToDatetime(st_unix))
-    print('查询结束时间：', et_unix, date_util.getSecondsToDatetime(et_unix))
-
+    start = time.time()
+    myday= '2020-11-27'
 
     account_list_yuewen = platform_config_util.get_yuewen_account_list()
     account_list_zhangzhongyun = platform_config_util.get_zhangzhongyun_account_list()
@@ -45,15 +23,15 @@ def start_order_job():
     account_list_youshuge = platform_config_util.get_youshuge_account_list()
     account_list_zhangdu = platform_config_util.get_zhangdu_account_list()
 
-    db_order_util.batch_save_order(platform_order_api_util.get_zhangzhongyun_order(st_unix, et_unix,account_list_zhangzhongyun))
-    db_order_util.batch_save_order(platform_order_api_util.get_yuewen_order(st_unix, et_unix,account_list_yuewen))
-    db_order_util.batch_save_order(platform_order_api_util.get_huasheng_order(st_unix, et_unix,account_list_huasheng))
-    db_order_util.batch_save_order(platform_order_api_util.get_youshuge_order(st_unix, et_unix,account_list_youshuge))
-    db_order_util.batch_save_order(platform_order_api_util.get_zhangdu_order(st_unix, et_unix,account_list_zhangdu))
-
+    db_order_util.batch_save_order(platform_order_api_util.get_zhangzhongyun_order(myday, account_list_zhangzhongyun))
+    exit()
+    db_order_util.batch_save_order(platform_order_api_util.get_yuewen_order(myday, account_list_yuewen))
+    db_order_util.batch_save_order(platform_order_api_util.get_huasheng_order(myday, account_list_huasheng))
+    db_order_util.batch_save_order(platform_order_api_util.get_youshuge_order(myday, account_list_youshuge))
+    db_order_util.batch_save_order(platform_order_api_util.get_zhangdu_order(myday, account_list_zhangdu))
 
 
-    print('订单同步执行时间（秒）：', date_util.getCurrentSecondTime() - start_exec_seconds)
+    print('订单同步执行时间（秒）：', int(time.time() - start))
 
 
 if __name__ == '__main__':

dgp/tests/util/date_util.py

@@ -178,6 +178,22 @@ def getAnyDateTime(day, hour=0, min=0, sec=0):
         0]
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 def getSecondsToDatetime(seconds=getCurrentSecondTime(), datetime_format="%Y-%m-%d %H:%M:%S"):
     """
     description:      秒/时间戳转日期字符串
@@ -307,39 +323,42 @@ def getSelfDateStr(times=time.time(),date_format='%Y%m%d'):
     return timestamps
 
 
-def test():
-    print(getCurrentMilliSecondTime())
-    print(getCurrentSecondTime())
-    print(getCurrentFormatTimeStr())
-    print(getCurrentTimeTupleByFormatStr())
-    print("=======")
-    print(getCurrentTimeStr())
-    print(getCurrentTimeStrByTuple(time.localtime()))
-    print(getTimeByTuple(time.localtime()))
-    print("=======")
-    print(getNowDateTime())
-    print(getNowTime())
-    print(getNowDateTime())
-    print(getTodayDate())
-    print(getTimeDate(time.time() - 86400))
-    print("=======")
-    print(getAnyDateTime(2))
-    print(getAnyDateSecondTime(2))
-    print("=======")
-    print(getTodayStartTime())
-    print(getCurrentWeekTime())
-    print('昨天')
-    print(getYesterdayStartTime(), time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(getYesterdayStartTime())))
-    print(getYesterdayEndTime(), time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(getYesterdayEndTime())))
-    print('今天')
-    print(getTodayStartTime(), time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(getTodayStartTime())))
-    print(getTodayEndTime(), time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(getTodayEndTime())))
-    print('明天')
-    print(getTomorrowStartTime(), time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(getTomorrowStartTime())))
-    print(getTomorrowEndTime(), time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(getTomorrowEndTime())))
-    return '测试完毕！'
+def getTodayStart(myday,flag=0):
+    if flag:
+        return datetime.datetime.strptime(myday+" 00:00:00",'%Y-%m-%d %H:%M:%S')
+    else:
+        return myday+" 00:00:00"
+
+
+def getTodayEnd(myday,flag=0):
+    if flag:
+        return datetime.datetime.strptime(myday+" 23:59:59",'%Y-%m-%d %H:%M:%S')
+    else:
+        return myday+" 23:59:59"
+
+
+def get_n_day(n=0, is_timestamp=0, is_datetime=0):
+    """默认返回字符串 2020-01-01
+         """
+
+    str = (datetime.datetime.now() + datetime.timedelta(days=n)).strftime("%Y-%m-%d")
+    date1 = datetime.datetime.strptime(str, "%Y-%m-%d")
+    stamp = int(time.mktime(time.strptime(str, "%Y-%m-%d")))
+    if is_timestamp:
+        return stamp
+    elif is_datetime:
+        return date1
+    else:
+        return str
+
+
+def stamp_to_str(stamp):
+    a = time.localtime(stamp)
+    return time.strftime("%Y-%m-%d %H:%M:%S", a)
 
 
 if __name__ == '__main__':
-    print(test())
+    # print(test())
 
+    # print(getTodayEnd('2020-01-01'))
+    print(stamp_to_str(get_n_day(is_timestamp=1)))

dgp/tests/util/platform_config_util.py

@@ -26,7 +26,7 @@ __title__ = '平台配置操作工具类'
 
 import os
 import time
-
+from util.date_util import *
 import pandas as pd
 
 
@@ -106,7 +106,7 @@ def get_account_list(platform, account_file_name):
     file_path = parent_dir_path + "/tests/conf/account/" + account_file_name
     # print('配置文件：', file_path)
 
-    data = pd.read_csv(file_path, header=None, keep_default_na=False, encoding='utf8')
+    data = pd.read_csv(file_path, header=None, keep_default_na=False, encoding='utf8',converters={0:str})
     account = []
     for i in data.index:
         account.append(list(data.values[i]))
@@ -117,13 +117,14 @@ def get_account_list(platform, account_file_name):
     return account_list
 
 
-def get_zhangzhongyun_query_time(st_unix, et_unix):
+def get_zhangzhongyun_query_time(myday):
     """
+    @parm   myday  '2020-01-01'
     description:  掌中云的时间格式比较特殊，需要转换下
     return:       2020-09-25T00:00:00+08:00,2020-09-26T00:00:00+08:00 -> (start_time,end_time)
     """
-    start_time = time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(st_unix)) + '+08:00'
-    end_time = time.strftime("%Y-%m-%dT%H:%M:%S", time.localtime(et_unix)) + '+08:00'
+    start_time = datetime.datetime.strftime(getTodayStart(myday,1),"%Y-%m-%dT%H:%M:%S+08:00",)
+    end_time = datetime.datetime.strftime(getTodayEnd(myday,1),"%Y-%m-%dT%H:%M:%S+08:00")
     return start_time, end_time
 
 
@@ -138,3 +139,8 @@ def get_youshuge_order_query_time(st_unix, et_unix):
         # 如果是同一天，则结束时间加一天
         end_time = time.strftime("%Y-%m-%d", time.localtime(et_unix + 86400))
     return start_time, end_time
+
+
+if __name__ == '__main__':
+    a,b=get_zhangzhongyun_query_time('2020-01-01')
+    print(a,b)