shish vor 5 Jahren
Ursprung
Commit
ccbf5c7d44

+ 4 - 3
app-ghs/controllers/StatController.php

@@ -17,9 +17,9 @@ use common\components\util;
 class StatController extends BaseController
 {
 
+    //利润表 shish 20210829
     public function actionProfit()
     {
-
         $get = Yii::$app->request->get();
         $where = [];
         $where['shopId'] = $this->shopId;
@@ -36,6 +36,7 @@ class StatController extends BaseController
 
         //开单
         $sale = StatSaleClass::getSum($where);
+
         //调拨出库
         $stockOut = StatStockOutClass::getSum($where);
         //盘盈
@@ -52,7 +53,7 @@ class StatController extends BaseController
         //退款
         $refund = StatRefundClass::getSum($where);
 
-        $profit = ($sale * 100 + $stockOut * 100 + $pdAdd * 100 - $cg * 100 - $wast * 100 - $stockIn * 100 - $pdSub * 100 - $refund * 100) / 100;
+        $balance = ($sale * 100 + $stockOut * 100 + $pdAdd * 100 - $cg * 100 - $wast * 100 - $stockIn * 100 - $pdSub * 100 - $refund * 100) / 100;
 
         $out = [
             'income' => [
@@ -67,7 +68,7 @@ class StatController extends BaseController
                 ['name' => '盘亏', 'amount' => $pdSub],
                 ['name' => '退款', 'amount' => $refund],
             ],
-            'profit' => $profit,
+            'balance' => $balance,
         ];
 
         util::success($out);

+ 1 - 1
biz/stat/classes/StatCgClass.php

@@ -14,7 +14,7 @@ class StatCgClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatCg::find()->where($where)->sum('amount');
+        $amount = self::sum($where,'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 1 - 1
biz/stat/classes/StatPdAddClass.php

@@ -13,7 +13,7 @@ class StatPdAddClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatPdAdd::find()->where($where)->sum('amount');
+        $amount = self::sum($where,'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 1 - 1
biz/stat/classes/StatPdSubClass.php

@@ -13,7 +13,7 @@ class StatPdSubClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatPdSub::find()->where($where)->sum('amount');
+        $amount = self::sum($where,'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 1 - 1
biz/stat/classes/StatRefundClass.php

@@ -13,7 +13,7 @@ class StatRefundClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatRefund::find()->where($where)->sum('amount');
+        $amount = self::sum($where, 'amount');
         return empty($amount) ? 0 : $amount;
     }
 

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

@@ -13,7 +13,7 @@ class StatSaleClass extends BaseClass
     //获取销售总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatSale::find()->where($where)->sum('amount');
+        $amount = self::sum($where, 'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 1 - 1
biz/stat/classes/StatStockInClass.php

@@ -13,7 +13,7 @@ class StatStockInClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatStockIn::find()->where($where)->sum('amount');
+        $amount = self::sum($where,'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 1 - 1
biz/stat/classes/StatStockOutClass.php

@@ -13,7 +13,7 @@ class StatStockOutClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatStockOut::find()->where($where)->sum('amount');
+        $amount = self::sum($where, 'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 1 - 1
biz/stat/classes/StatWastClass.php

@@ -13,7 +13,7 @@ class StatWastClass extends BaseClass
     //获取总和 shish 20210829
     public static function getSum($where)
     {
-        $amount = StatWast::find()->where($where)->sum('amount');
+        $amount = self::sum($where,'amount');
         return empty($amount) ? 0 : $amount;
     }
 

+ 7 - 0
common/base/classes/BaseClass.php

@@ -177,4 +177,11 @@ class BaseClass
         return $model->getLockById($id);
     }
 
+    //求和
+    public static function sum($condition, $field)
+    {
+        $model = Yii::createObject(['class' => static::$baseFile]);
+        return $model->sum($condition, $field);
+    }
+
 }

+ 6 - 0
common/base/models/Base.php

@@ -351,4 +351,10 @@ class Base extends ActiveRecord
         return self::findBySql('select * from ' . static::tableName() . ' where id = :id for update', ['id' => $id])->one();
     }
 
+    //求和
+    public function sum($condition, $field)
+    {
+        return $this->conditionQuery($condition)->sum($field);
+    }
+
 }