作者 dengyuting

fix

@@ -28,6 +28,7 @@ request: @@ -28,6 +28,7 @@ request:
28 buyer: '客户名称${get_stringcode(5)}' 28 buyer: '客户名称${get_stringcode(5)}'
29 orderDist: '订单区域${get_stringcode(5)}' 29 orderDist: '订单区域${get_stringcode(5)}'
30 commissionProportion: $commissionProportion 30 commissionProportion: $commissionProportion
  31 + saleDate: '2020-10-10 00:00:00'
31 product: 32 product:
32 - productName: $productName 33 - productName: $productName
33 orderNum: $orderNum1 34 orderNum: $orderNum1
@@ -27,7 +27,7 @@ def convert_to_int(value): @@ -27,7 +27,7 @@ def convert_to_int(value):
27 27
28 28
29 def get_nowtime(): 29 def get_nowtime():
30 - return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time())) 30 + return time.strftime("%Y%m%d%H%M%S", time.localtime(time.time()))
31 31
32 32
33 def get_today(): 33 def get_today():
@@ -35,7 +35,6 @@ def get_today(): @@ -35,7 +35,6 @@ def get_today():
35 str_time = now_today.strftime("%Y-%m-%d") 35 str_time = now_today.strftime("%Y-%m-%d")
36 return str_time 36 return str_time
37 37
38 -  
39 def get_tomorrow(): 38 def get_tomorrow():
40 tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d") 39 tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
41 return tomorrow 40 return tomorrow
@@ -7,14 +7,6 @@ import psycopg2 @@ -7,14 +7,6 @@ import psycopg2
7 from datetime import date, timedelta 7 from datetime import date, timedelta
8 import datetime,time 8 import datetime,time
9 9
10 -def get_today():  
11 - now_today = datetime.datetime.now()  
12 - str_time = now_today.strftime("%Y-%m-%d")  
13 - return str_time  
14 -  
15 -def get_tomorrow():  
16 - tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")  
17 - return tomorrow  
18 def getMonth(): 10 def getMonth():
19 year = str(datetime.date.today().year) 11 year = str(datetime.date.today().year)
20 d = datetime.date.today() 12 d = datetime.date.today()