From d6075a5e8b90ac5920168acb4b908e10f408f265 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 25 Jun 2024 16:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E6=9F=A5=E8=AF=A2=E4=B8=BA=E5=BD=93=E6=97=A5=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E6=94=AF=E4=BB=98=E7=9A=84=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php | 4 +++-
 app/store/logic/WorkbenchLogic.php     | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index e7cd9786..8c4d4704 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -12,6 +12,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\service\pay\PayService;
 use app\common\service\PushService;
 use app\common\service\wechat\WechatTemplate;
+use app\statistics\logic\OrderLogic;
 use Exception;
 use support\Cache;
 use think\facade\Db;
@@ -28,7 +29,8 @@ class IndexController extends BaseApiController
     public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config'];
 
     public function index()
-    {
+    {   $all_where['paid'] = 1;
+        d(OrderLogic::dayPayPrice($all_where,date('Y-m-d',time())));
         $uid=9;
       $a=  PushService::push('wechat_mmp_'.$uid, $uid, ['type'=>'INDUSTRYMEMBERS','msg'=>'支付超时,订单已被取消,请重新提交订单','data'=>['id'=>5]]);
 
diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index 20fa8a02..0ddb5fd0 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -35,6 +35,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\model\user_recharge\UserRecharge;
 use app\common\service\ConfigService;
 use app\common\service\FileService;
+use app\statistics\logic\OrderLogic;
 
 
 /**
@@ -82,7 +83,9 @@ class WorkbenchLogic extends BaseLogic
         //门店收益金额
         $data['income_amount'] = StoreFinanceFlow::where($storeFinanceWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('number');
         //门店收款金额
-        $data['receipt_amount'] = UserRecharge::where($userRechargeWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('price');
+        $all_where['paid'] = 1;
+        $data['receipt_amount'] =   OrderLogic::dayPayPrice($all_where,date('Y-m-d',time()));
+//        $data['receipt_amount'] = UserRecharge::where($userRechargeWhere)->whereBetweenTime('create_time', $startTime, $endTime)->sum('price');
         //保证金金额
         $data['deposit_amount'] = StoreFinanceFlow::where($storeFinanceWhereTwo)->whereBetweenTime('create_time', $startTime, $endTime)->sum('number');
         //门店成交用户数