|
|
@@ -316,7 +316,7 @@ class StatSaleClass extends BaseClass
|
|
|
$totalOrderNum++;
|
|
|
}
|
|
|
|
|
|
- $condition = ['mainId' => $mainId, 'payTime' => ['between', [$currentStartTime, $currentEndTime]],];
|
|
|
+ $condition = ['mainId' => $mainId, 'addTime' => ['between', [$currentStartTime, $currentEndTime]],];
|
|
|
|
|
|
$salary = 0;
|
|
|
$salaryList = SalaryClass::getAllByCondition($condition, null, '*', null, true);
|
|
|
@@ -326,6 +326,7 @@ class StatSaleClass extends BaseClass
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $condition = ['mainId' => $mainId, 'payTime' => ['between', [$currentStartTime, $currentEndTime]],];
|
|
|
$expendList = ExpendClass::getAllByCondition($condition, null, '*', null, true);
|
|
|
$expendTypeMap = dict::getDict('expendTypeMap');
|
|
|
$expendAmount = [];
|