Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ConsoleController.php

@@ -3,6 +3,7 @@
 namespace ghs\controllers;
 
 use biz\sj\services\MerchantAssetService;
+use biz\stat\services\StatOutService;
 use bizHd\stat\services\StatIncomeMonthService;
 use bizHd\stat\services\StatIncomeService;
 use bizHd\stat\services\StatOrderService;
@@ -36,7 +37,10 @@ class ConsoleController extends BaseController
         //今天收入
         $incomeData = StatIncomeService::getTodayNum($this->sjId);
         $todayIncome = isset($incomeData['amount']) ? $incomeData['amount'] : 0;
-        $todayData = ['visit' => $todayVisit, 'fans' => $todayFansNum, 'user' => $todayUserNum, 'income' => $todayIncome, 'order' => $todayOrder, 'expend' => 399];
+        //2021.4.14 linqh 今日支出
+        $outData = StatOutService::getTodayNum($this->sjId);
+        $todayOut = $outData['amount']??0;
+        $todayData = ['visit' => $todayVisit, 'fans' => $todayFansNum, 'user' => $todayUserNum, 'income' => $todayIncome, 'order' => $todayOrder, 'expend' => $todayOut];
 
         $mainMenu = [
             ['name' => '开单', 'img' => 'https://img.huaml.com/retail/admin/tab-icon-6.png', 'page' => '/pageA/merchant/getList'],
@@ -64,4 +68,4 @@ class ConsoleController extends BaseController
         util::success(['dict' => $dict, 'shop' => $shop]);
     }
 
-}
+}

app-ghs/controllers/PurchaseOrderController.php

@@ -1,6 +1,8 @@
 <?php
 namespace ghs\controllers;
 
+use biz\stat\classes\StatOutClass;
+use biz\stat\classes\StatOutMonthClass;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\order\classes\PurchaseOrderItemClass;
 use bizGhs\order\models\PurchaseOrder;
@@ -50,6 +52,11 @@ class PurchaseOrderController extends BaseController
         $post['itemInfo'] = $ghsItemInfo;
         $order = PurchaseOrderClass::addOrder($post);
         if($order){
+            //记录支出
+            //当天
+            StatOutClass::updateOrInsert($this->sjId,$this->sjId,$order['orderPrice']);
+            //当月
+            StatOutMonthClass::updateOrInsert($this->sjId,$this->sjId,$order['orderPrice']);
             util::success($order);
         }else{
             util::fail();

biz/stat/classes/StatOutClass.php

@@ -26,10 +26,25 @@ class StatOutClass extends BaseClass
             $id = $model['id'];
             //累加金额 amount
             $newAmount = bcadd($amount,$model['amount'],2);
-            self::updateById($id,['amount'=>$newAmount]);
+            $totalAmount = bcadd($amount,$model['totalAmount'],2);
+            self::updateById($id,['amount'=>$newAmount,'totalAmount'=>$totalAmount]);
         }else{
             //insert
             $data = $where;
+            $data['amount'] = $amount;
+            //totalAmount = 前一天的 totalAmount
+            $totalAmount = 0;
+            $lastDate = date('Ymd',strtotime("-1 day"));
+            $lastWhere = [
+                'merchantId'=>$sjId,
+                'shopId'=>$shopId,
+                'time'=>$lastDate,
+            ];
+            $lastModel = self::getByCondition($lastWhere);
+            if($lastModel){
+                $totalAmount = $lastModel['totalAmount'];
+            }
+            $data['totalAmount'] = bcadd($amount,$totalAmount,2);
             $data['createTime'] = date('Y-m-d H:i:s');
             self::add($data);
         }

biz/stat/classes/StatOutMonthClass.php

@@ -30,10 +30,25 @@ class StatOutMonthClass extends BaseClass
             $id = $model['id'];
             //累加金额 amount
             $newAmount = bcadd($amount,$model['amount'],2);
-            self::updateById($id,['amount'=>$newAmount]);
+            $totalAmount = bcadd($amount,$model['totalAmount'],2);
+            self::updateById($id,['amount'=>$newAmount,'totalAmount'=>$totalAmount]);
         }else{
             //insert
             $data = $where;
+            $data['amount'] = $amount;
+            //totalAmount = 前一天的 totalAmount
+            $totalAmount = 0;
+            $lastTime =  date('Ym',strtotime("-1 month"));
+            $lastWhere = [
+                'merchantId'=>$sjId,
+                'shopId'=>$shopId,
+                'time'=>$lastTime,
+            ];
+            $lastModel = self::getByCondition($lastWhere);
+            if($lastModel){
+                $totalAmount = $lastModel['totalAmount'];
+            }
+            $data['totalAmount'] = bcadd($amount,$totalAmount,2);
             $data['createTime'] = date('Y-m-d H:i:s');
             self::add($data);
         }

biz/stat/services/StatOutService.php

@@ -7,7 +7,16 @@
 namespace biz\stat\services;
 
 use biz\base\services\BaseService;
+use biz\stat\classes\StatOutClass;
+
 class StatOutService extends BaseService
 {
     public static $baseFile = '\biz\stat\classes\StatOutClass';
+
+    //取今天的数据 linqh 2021.4.14
+    public static function getTodayNum($merchantId)
+    {
+        $today = date("Ymd");
+        return StatOutClass::getByCondition(['merchantId' => $merchantId, 'time' => $today]);
+    }
 }