|
|
@@ -14,6 +14,7 @@ use bizHd\goods\classes\PlantCgClass;
|
|
|
use bizHd\order\classes\OrderClass as HdOrderClass;
|
|
|
use bizGhs\order\classes\OrderClass;
|
|
|
use bizHd\purchase\classes\PurchaseClass;
|
|
|
+use common\components\arrayUtil;
|
|
|
use common\components\dateUtil;
|
|
|
use common\components\dict;
|
|
|
use Yii;
|
|
|
@@ -79,6 +80,8 @@ class StatSaleClass extends BaseClass
|
|
|
|
|
|
$arr = [];
|
|
|
$ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
|
|
|
+ $totalAmount = 0;
|
|
|
+ $totalNum = 0;
|
|
|
if (!empty($ghsOrderList)) {
|
|
|
foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
|
|
|
$actPrice = $ghsOrder['actPrice'] ?? 0;
|
|
|
@@ -86,6 +89,8 @@ class StatSaleClass extends BaseClass
|
|
|
$customName = $customList[$customId]['name'] ?? '';
|
|
|
$py = $customList[$customId]['py'] ?? '';
|
|
|
if ($actPrice > 0) {
|
|
|
+ $totalNum++;
|
|
|
+ $totalAmount = bcadd($totalAmount, $actPrice, 2);
|
|
|
if (isset($arr[$customId])) {
|
|
|
$arr[$customId]['num']++;
|
|
|
$arr[$customId]['amount'] = bcadd($arr[$customId]['amount'], $actPrice, 2);
|
|
|
@@ -94,8 +99,9 @@ class StatSaleClass extends BaseClass
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ $arr = arrayUtil::arraySort($arr, 'amount');
|
|
|
}
|
|
|
- return $arr;
|
|
|
+ return ['list' => $arr, 'totalAmount' => $totalAmount, 'totalNum' => $totalNum];
|
|
|
}
|
|
|
|
|
|
public static function profile($mainId)
|