Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
This commit is contained in:
Binary file not shown.
@@ -312,7 +312,7 @@ def return_operate(ppu,mm):
|
||||
if ppu==None:
|
||||
return 0
|
||||
else:
|
||||
return int(10000*(mm-ppu)/ppu,2)
|
||||
return int(10000*(mm-ppu)/ppu)
|
||||
|
||||
'''
|
||||
def before_month_lastday(ti):
|
||||
|
||||
Binary file not shown.
@@ -894,10 +894,12 @@ def save_to_mongo(ct,rl,lk,timd,timm):
|
||||
|
||||
def return_operate(ppu,mm):
|
||||
|
||||
print(ppu,mm)
|
||||
|
||||
if ppu==None:
|
||||
return 0
|
||||
else:
|
||||
return int(10000*(mm-ppu)/ppu,2)
|
||||
return int(10000*(mm-ppu)/ppu)
|
||||
'''
|
||||
def month_lastday(ti):
|
||||
from dateutil.parser import parse
|
||||
|
||||
@@ -16,9 +16,9 @@ def get_weekend(tt):
|
||||
|
||||
weekend = get_weekend('20180415')
|
||||
|
||||
ct='上海'
|
||||
rl='黄浦'
|
||||
lk='伯爵居'#上海闵行闵浦新苑一村普陀曹杨一村上海
|
||||
ct='北京'
|
||||
rl='东城'
|
||||
lk='左安漪园'#上海闵行闵浦新苑一村普陀曹杨一村上海北京东城左安漪园
|
||||
#黄浦伯爵居静安泰安里长宁新泾北苑
|
||||
timm=20180430
|
||||
timd=20160603
|
||||
|
||||
Reference in New Issue
Block a user