shish 3 жил өмнө
parent
commit
7730eb6fa7

+ 1 - 8
app-ghs/controllers/StatKhCgController.php

@@ -2,11 +2,7 @@
 
 namespace ghs\controllers;
 
-use biz\stat\classes\StatKhCgClass;
-use bizGhs\custom\classes\CustomClass;
 use bizGhs\stat\classes\StatSaleClass;
-use common\components\arrayUtil;
-use common\components\dateUtil;
 use Yii;
 use common\components\util;
 
@@ -16,14 +12,11 @@ class StatKhCgController extends BaseController
     //客户采购列表 ssh 20211017
     public function actionProfile()
     {
-
         ini_set('memory_limit', '2045M');
         set_time_limit(0);
-
         $mainId = $this->mainId;
         $respond = StatSaleClass::statCustomCg($mainId);
-        $cg = arrayUtil::arraySort($respond, 'num');
-        util::success(['list' => $cg]);
+        util::success($respond);
     }
 
 }

+ 7 - 1
biz-ghs/stat/classes/StatSaleClass.php

@@ -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)