From 15717de1d5ee7319dd7a75e056f551dd49eba932 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 15 Jul 2024 10:18:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(statistics):=20=E6=A0=B9=E6=8D=AE=E5=BA=97?=
 =?UTF-8?q?=E9=93=BAID=E7=BB=9F=E8=AE=A1=E5=9C=B0=E6=96=B9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/statistics/controller/IndexController.php     | 15 +++++++++------
 app/statistics/logic/ProductLogic.php             |  8 ++++++--
 .../store_order/StoreOrderController.php          |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php
index 171cb05f..c4594180 100644
--- a/app/statistics/controller/IndexController.php
+++ b/app/statistics/controller/IndexController.php
@@ -78,15 +78,18 @@ class IndexController extends BaseLikeController
         return $this->success('ok', ['merchatCountList' => $data, 'merchantTotalCount' => count($data)]);
     }
 
+    /**
+     * 地方商品数量统计
+     */
     public function product_count_sotre_count()
     {
         $data = [
-            ['street_name' => '喻寺镇', 'product_count' => 1],
-            ['street_name' => '立石镇', 'product_count' => 1],
-            ['street_name' => '百和镇', 'product_count' => 1],
-            ['street_name' => '得胜镇', 'product_count' => 1],
-            ['street_name' => '玄滩镇', 'product_count' => 1],
-            ['street_name' => '云锦镇', 'product_count' => 1],
+            ['street_name' => '喻寺镇', 'product_count' => StoreBranchProduct::where('store_id',1)->count()],
+            ['street_name' => '立石镇', 'product_count' => StoreBranchProduct::where('store_id',2)->count()],
+            ['street_name' => '百和镇', 'product_count' => StoreBranchProduct::where('store_id',3)->count()],
+            ['street_name' => '得胜镇', 'product_count' => StoreBranchProduct::where('store_id',5)->count()],
+            ['street_name' => '玄滩镇', 'product_count' => StoreBranchProduct::where('store_id',6)->count()],
+            ['street_name' => '云锦镇', 'product_count' => StoreBranchProduct::where('store_id',7)->count()],
         ];
         $townProductCount = StoreProduct::count();
         $product_count = StoreBranchProduct::group('product_id')->order('total_sales desc')->limit(20)->field('image,product_id,store_name,sum(sales) as total_sales')->select();
diff --git a/app/statistics/logic/ProductLogic.php b/app/statistics/logic/ProductLogic.php
index 06be8df2..e8f04ba3 100644
--- a/app/statistics/logic/ProductLogic.php
+++ b/app/statistics/logic/ProductLogic.php
@@ -4,6 +4,7 @@ namespace app\statistics\logic;
 
 use app\common\logic\BaseLogic;
 use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\system_store\SystemStore;
 
 class ProductLogic extends BaseLogic
 {
@@ -24,6 +25,9 @@ class ProductLogic extends BaseLogic
         } else {
             $weeklyNewProductTotalGrowthRate =bcdiv(($todayNewProductCount - $yestertodayNewProductCount),$yestertodayNewProductCount) * 100;
         }
+        $todayMerchantCount=SystemStore::where($where)->whereDay('create_time',$time)->count();
+        $where['is_show']=1;
+        $yestertodayMerchantCount=SystemStore::where($where)->count();
         $data = [
             "totalProductCounInfo" => [
                 "todayProductCount" => $todayProductCount,
@@ -36,8 +40,8 @@ class ProductLogic extends BaseLogic
                 "weeklyNewProductTotalGrowthRate" => $weeklyNewProductTotalGrowthRate
             ],
             "merchantCountInfo" => [
-                "todayMerchantCount" => 1,
-                "yestertodayMerchantCount" => 1,
+                "todayMerchantCount" => $todayMerchantCount,
+                "yestertodayMerchantCount" => $yestertodayMerchantCount,
                 "weeklyMerchantGrowthRate" => 0
             ]
         ];
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index 6f1de710..5cf8e956 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -416,6 +416,7 @@ class StoreOrderController extends BaseAdminController
             'price' => $params['price'],
             'recharge_type' => 'INDUSTRYMEMBERS',
             'user_ship'=>$params['user_ship']??0,
+            'type'=>1,
         ];
         $order = UserRecharge::create($data);
         $order['pay_price'] = $order['price'];