From c3e6bdf5d00497c36b28829c89d28d7c264b1ec9 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Mon, 17 Jun 2024 14:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=A8=E5=BA=97=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E5=92=8C=E9=97=A8=E5=BA=97=E6=94=B6=E6=AC=BE=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/store/StoreController.php | 1 +
 app/store/logic/WorkbenchLogic.php           | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php
index a620c3d2..9c8c22fb 100644
--- a/app/api/controller/store/StoreController.php
+++ b/app/api/controller/store/StoreController.php
@@ -55,6 +55,7 @@ class StoreController extends BaseApiController
             'staff_id'=>0,
             'order_id'=>getNewOrderId('CZ'),
             'price'=>0.01,
+            'recharge_type'=>'wechat_mini'
         ];
         $order = UserRecharge::create($data);
 
diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index bb7e5718..8f349359 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -28,6 +28,7 @@ use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_visit\StoreVisit;
 use app\common\model\system_store\SystemStore;
+use app\common\model\user_recharge\UserRecharge;
 use app\common\service\ConfigService;
 use app\common\service\FileService;
 
@@ -60,6 +61,11 @@ class WorkbenchLogic extends BaseLogic
         $data['verify_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, ['shipping_type' => 2]);
         //门店收益金额
         $data['income_amount'] = $orderLogic->storeOrderSumByDate($params['store_id'], $startTime, $endTime, [], 'profit');
+        //门店收款金额
+        $data['receipt_amount'] = UserRecharge::where([
+                'store_id'=>$params['store_id'],
+                'paid'=>YesNoEnum::YES
+        ])->sum('price');
         //门店成交用户数
         $data['user_number'] = StoreOrder::where('store_id', $params['store_id'])
             ->where('paid', 1)
@@ -82,7 +88,8 @@ class WorkbenchLogic extends BaseLogic
                 $i++;
             }
             $field = 'from_unixtime(pay_time,"%m-%d") as pay_time,sum(pay_price) as pay_price';
-        } else {
+        }
+        else {
             $group = 'MONTH(pay_time)';
             $i = 0;
             $month = 0;