林琦海 5 жил өмнө
parent
commit
1ba9d567e7

+ 13 - 8
app-ghs/controllers/MainController.php

@@ -3,6 +3,7 @@
 namespace ghs\controllers;
 
 use biz\shop\classes\ShopClass;
+use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\product\classes\ProductClass;
 use bizHd\stat\classes\StatIncomeClass;
 use bizHd\stat\classes\StatOrderClass;
@@ -115,15 +116,19 @@ class MainController extends BaseController
         //采购相关信息
         //今日采购数
         //今日采购金额
+        $todayPurchaseStat = PurchaseOrderClass::statOrderInfo($this->shopId,"today");
 
         //昨日采购数
         //昨日采购金额
+        $yesterdayPurchaseStat = PurchaseOrderClass::statOrderInfo($this->shopId,"yesterday");
 
         //7日采购数
         //7日采购金额
+        $sevendayPurchaseStat = PurchaseOrderClass::statOrderInfo($this->shopId,"seven");
 
         //30日采购数
         //30日采购金额
+        $thirtydayPurchaseStat = PurchaseOrderClass::statOrderInfo($this->shopId,"thirty");
 
         $more = [
             'today' => [
@@ -131,32 +136,32 @@ class MainController extends BaseController
                 'expend' => 0,
                 'saleNum' => $saleNum,
                 'saleAmount' => $saleAmount,
-                'purchaseNum' => 2,
-                'purchaseAmount' => 3,
+                'purchaseNum' => $todayPurchaseStat['totalNum'],
+                'purchaseAmount' => $todayPurchaseStat['totalAmount'],
             ],
             'yesterday' => [
                 'income' => 0,
                 'expend' => 0,
                 'saleNum' => $ySaleNum,
                 'saleAmount' => $ySaleAmount,
-                'purchaseNum' => 2,
-                'purchaseAmount' => 3,
+                'purchaseNum' => $yesterdayPurchaseStat['totalNum'],
+                'purchaseAmount' => $yesterdayPurchaseStat['totalAmount'],
             ],
             'latestSeven' => [
                 'income' => 0,
                 'expend' => 0,
                 'saleNum' => $sevenSaleNum,
                 'saleAmount' => $sevenSaleAmount,
-                'purchaseNum' => 2,
-                'purchaseAmount' => 3,
+                'purchaseNum' => $sevendayPurchaseStat['totalNum'],
+                'purchaseAmount' => $sevendayPurchaseStat['totalAmount'],
             ],
             'latestThirty' => [
                 'income' => 0,
                 'expend' => 0,
                 'saleNum' => $thirtySaleNum,
                 'saleAmount' => $thirtySaleAmount,
-                'purchaseNum' => 2,
-                'purchaseAmount' => 3,
+                'purchaseNum' => $thirtydayPurchaseStat['totalNum'],
+                'purchaseAmount' => $thirtydayPurchaseStat['totalAmount'],
             ],
         ];
         util::success(['base' => $base, 'more' => $more]);

+ 37 - 1
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -9,6 +9,7 @@ use bizGhs\item\classes\ItemClass;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\stock\services\StockRecordService;
 use bizGhs\product\classes\ProductClass;
+use common\components\dateUtil;
 use common\components\orderSn;
 use common\components\util;
 use common\services\xhItemService;
@@ -296,8 +297,43 @@ class PurchaseOrderClass extends BaseClass
 
 
     //采购数,采购金额统计(根据时间,今日,昨天,7天,30天)
-    public static function statOrderInfo($shopId,$start,$end)
+    public static function statOrderInfo($shopId,$statType)
     {
+        $start = '';
+        $end = '';
+        switch ($statType){
+            case "today":
+                $start = date('Y-m-d');
+                $end = $start;
+                break;
+            case "yesterday" :
+                $start = date('Y-m-d',strtotime("-1 day"));
+                $end = $start;
+                break;
+            case "seven":
+                $start = date('Y-m-d',strtotime("-6 day"));
+                $end = date('Y-m-d');
+                break;
+            case "thirty":
+                $start = date('Y-m-d',strtotime("-29 day"));
+                $end = date('Y-m-d');
+                break;
+            default:
+
+        }
+        $where = [];
+        $where['shopId'] = $shopId;
+        $where['addTime'] = ['between', [$start, $end]];
+        $res = self::getAllByCondition($where, null, "id,orderPrice");
+        $totalAmount = 0;
+        $totalNum = count($res);
+        foreach ($res as $v){
+            $totalAmount = bcadd($totalAmount,$v['orderPrice'],2);
+        }
+        return [
+            'totalAmount'=>$totalAmount,
+            'totalNum'=>$totalNum,
+        ];
 
     }
 

+ 2 - 2
biz-hd/stat/classes/StatOrderClass.php

@@ -78,7 +78,7 @@ class StatOrderClass extends BaseClass
     public static function getRiseNumWeek($shopId)
     {
         $end = date('Ymd');
-        $start = date('Ymd',strtotime("-7 days"));
+        $start = date('Ymd',strtotime("-6 days"));
         return self::getRiseNumByTime($shopId,$start,$end);
     }
 
@@ -86,7 +86,7 @@ class StatOrderClass extends BaseClass
     public static function getRiseNumThirty($shopId)
     {
         $end = date('Ymd');
-        $start = date('Ymd',strtotime("-30 days"));
+        $start = date('Ymd',strtotime("-29 days"));
         return self::getRiseNumByTime($shopId,$start,$end);
     }