From 3381e942e2d9c2fdcf52111c493a0b51de65d02d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 18 Jul 2024 17:14:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(statistics):=20=E4=BF=AE=E6=94=B9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/statistics/controller/IndexController.php | 21 +++++++++++++-----
 app/statistics/logic/OrderLogic.php           |  9 +++++---
 config/thinkorm.php                           | 22 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php
index 03b749e0..5e1cf713 100644
--- a/app/statistics/controller/IndexController.php
+++ b/app/statistics/controller/IndexController.php
@@ -92,7 +92,11 @@ class IndexController extends BaseLikeController
             return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息
         }
         $res['date']=$dates_two;
-        $res['dayPayPrice']=Db::name('demo_order_money')->where($where)->sum('money');
+        $money=Db::name('demo_order_money')->where($where)->sum('money');
+        $where['paid']=1;
+        // $pay_price=Db::connect('demo')->name('store_order')->where($where)->whereDay('create_time')->sum('pay_price');
+        $price=Db::connect('demo')->name('user_recharge')->where($where)->sum('price');
+        $res['dayPayPrice']=bcadd($money,$price,2);
         return $this->success('ok', $res);
     }
 
@@ -131,7 +135,7 @@ class IndexController extends BaseLikeController
         // if (ProductLogic::hasError()) {
         //     return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
         // }
-        $res = UserRecharge::where($where)->whereTime('create_time', $time)->select()->each(function ($item) {
+        $res = Db::connect('demo')->name('user_recharge')->where($where)->whereTime('create_time', $time)->select()->each(function ($item) {
             if ($item['uid']) {
                 $item['nickname'] = User::where('id', $item['uid'])->value('nickname');
             } else {
@@ -147,14 +151,19 @@ class IndexController extends BaseLikeController
     {
         $time = $this->request->get('date');
         $store_id = $this->request->get('store_id', 0);
-        $where = [];
+        $where = ['paid','=',1];
         if ($store_id) {
             $where['store_id'] = $store_id;
         }
-        $res = OrderLogic::sales($where, $time);
-        if (ProductLogic::hasError()) {
-            return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
+        // $res = OrderLogic::sales($where, $time);
+        // if (ProductLogic::hasError()) {
+        //     return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
+        // }
+        $select = Db::connect('demo')->name('store_order')->where($where);
+        if ($time) {
+            $select->whereDay('create_time', $time);
         }
+        $res = $select->limit(20)->order('id desc')->field('id,order_id,pay_price,create_time')->select()->toArray();
         return $this->success('ok', $res);
     }
     /**
diff --git a/app/statistics/logic/OrderLogic.php b/app/statistics/logic/OrderLogic.php
index 226020c0..127bb1e0 100644
--- a/app/statistics/logic/OrderLogic.php
+++ b/app/statistics/logic/OrderLogic.php
@@ -5,6 +5,7 @@ namespace app\statistics\logic;
 use app\common\logic\BaseLogic;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\user_recharge\UserRecharge;
+use think\facade\Db;
 
 class OrderLogic extends BaseLogic
 {
@@ -58,9 +59,11 @@ class OrderLogic extends BaseLogic
     }
     public static function dayPayPrice($where, $time)
     {
-        $todayAmount = UserRecharge::where($where)
-            ->whereDay('create_time', $time)
-            ->sum('price');
+        // $todayAmount = UserRecharge::where($where)
+        //     ->whereDay('create_time', $time)
+        //     ->sum('price');
+        $todayAmount=Db::connect('demo')->name('user_recharge')->where($where)->sum('price');
+
         $pay_price = StoreOrder::where($where)
             ->whereDay('create_time', $time)
             ->sum('pay_price');
diff --git a/config/thinkorm.php b/config/thinkorm.php
index 9be215f7..87668ed7 100644
--- a/config/thinkorm.php
+++ b/config/thinkorm.php
@@ -17,7 +17,7 @@ return [
             // 数据库连接端口
             'hostport' =>  getenv('DB_PORT'),
             // 数据库编码默认采用utf8
-            'charset' => 'utf8',
+            'charset'     => 'utf8mb4',
             // 数据库表前缀
             'prefix' => 'la_',
             // 断线重连
@@ -27,5 +27,25 @@ return [
             // 自定义分页类
             'bootstrap' =>  ''
         ],
+        'demo'    =>    [
+            // 数据库类型
+            'type'        => 'mysql',
+            // 服务器地址
+            'hostname'    => getenv('DB_HOST_TWO'),
+            // 数据库名
+            'database' => getenv('DB_DATABASE_TWO'),
+            // 数据库用户名
+            'username' =>  getenv('DB_USERNAME_TWO'),
+            // 数据库密码
+            'password' =>  getenv('DB_PASSWORD_TWO'),
+            // 数据库连接端口
+            'hostport' =>  getenv('DB_PORT'),
+            // 数据库连接参数
+            'params'      => [],
+            // 数据库编码默认采用utf8
+            'charset'     => 'utf8mb4',
+            // 数据库表前缀
+            'prefix'      => 'la_',
+        ],
     ],
 ];