|
@@ -43,14 +43,13 @@ class MAmountCalc(MerchantCalc):
|
|
|
else:
|
|
|
_start_time = mchid_times[_mchid]
|
|
|
|
|
|
- send_amounts, lack_amounts = calc_morder_lack(_data, pos_map, start_time - day_stamp, end_time - day_stamp)
|
|
|
+ send_amounts, lack_amounts = calc_morder_lack(_data, pos_map, _start_time - day_stamp, end_time - day_stamp)
|
|
|
if _mchid not in mamounts:
|
|
|
mamounts[_mchid] = {'send_amounts': send_amounts, 'lack_amounts': lack_amounts}
|
|
|
else:
|
|
|
mamounts[_mchid]['send_amounts'] += send_amounts
|
|
|
mamounts[_mchid]['lack_amounts'] += lack_amounts
|
|
|
|
|
|
-
|
|
|
result = dict()
|
|
|
for _mchid, _val in mamounts.items():
|
|
|
_send_amounts = round(_val['send_amounts'], 2)
|