|
|
@@ -1143,7 +1143,7 @@ class CronCollectDataView(View):
|
|
|
if order_start_time <= start_time_stamp: # 订单月初之前开始
|
|
|
settlement_days = (end_time - start_time).days # 当月结算天数=月初-月底
|
|
|
uid_bucket_statistics = UidBucketStatistics.objects.filter(time__gte=start_time_stamp,
|
|
|
- time__lt=end_time_stamp,
|
|
|
+ time__lte=end_time_stamp,
|
|
|
uid=item['uid'])
|
|
|
elif order_start_time >= end_time_stamp: # 订单在统计时间之后开始
|
|
|
settlement_days = 1
|
|
|
@@ -1153,7 +1153,7 @@ class CronCollectDataView(View):
|
|
|
else: # 订单月初和统计时间之间开始
|
|
|
settlement_days = round((end_time_stamp - order_start_time) / 86400)
|
|
|
uid_bucket_statistics = UidBucketStatistics.objects.filter(time__gte=order_start_time,
|
|
|
- time__lt=end_time_stamp,
|
|
|
+ time__lte=end_time_stamp,
|
|
|
uid=item['uid'])
|
|
|
remaining_usage_time = round((item['end_time'] - end_time_stamp) / 86400) # 剩余使用时间
|
|
|
else: # 订单结束时间小于统计时间
|
