From 1dd46946f59842f87af2b30cd1a88fb0c3edbe3c Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 21 Mar 2024 09:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/order/StoreOrderDao.php  |  2 +-
 app/controller/api/server/StoreOrder.php      | 10 +++-------
 app/controller/api/store/order/StoreOrder.php |  2 +-
 app/controller/merchant/Common.php            |  2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php
index 650ccc59..fabe6266 100644
--- a/app/common/dao/store/order/StoreOrderDao.php
+++ b/app/common/dao/store/order/StoreOrderDao.php
@@ -495,7 +495,7 @@ class StoreOrderDao extends BaseDao
         return ($this->getModel()::getDB())->whereIn('reconciliation_id', $reconciliation_id)->update(['reconciliation_id' => 0]);
     }
 
-    public function dayOrderNum($day, $merId = null, $saleType = 1)
+    public function dayOrderNum($day, $merId = null, $saleType = 0)
     {
         return StoreOrder::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
             $query->where('mer_id', $merId);
diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index f825e737..e4e5ef41 100644
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -35,19 +35,15 @@ class StoreOrder extends BaseController
 
     public function orderStatistics($merId, StoreOrderRepository $repository)
     {
-        $repository->saleType = $this->request->param('sale_type', 1);
         $order = $repository->OrderTitleNumber($merId, null);
         $where = ['is_system_del' => 0, 'mer_id' => $merId];
-        if ($repository->saleType > 0) {
-            $where['sale_type'] = $repository->saleType;
-        }
         $order['refund'] = app()->make(StoreRefundOrderRepository::class)->getWhereCount($where);
         /** @var Common $common */
         $common = app()->make(Common::class);
         $data = [];
-        $data['today'] = $common->mainGroup('today', $merId, $repository->saleType);
-        $data['yesterday'] = $common->mainGroup('yesterday', $merId, $repository->saleType);
-        $data['month'] = $common->mainGroup('month', $merId, $repository->saleType);
+        $data['today'] = $common->mainGroup('today', $merId);
+        $data['yesterday'] = $common->mainGroup('yesterday', $merId);
+        $data['month'] = $common->mainGroup('month', $merId);
         return app('json')->success(compact('order', 'data'));
     }
 
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 80f59309..f2256745 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -125,7 +125,7 @@ class StoreOrder extends BaseController
             return app('json')->status('public', '下单成功', ['order_id' => $groupOrder->group_order_id]);
         }
         try {
-            $this->repository = $this->request->post('withdrawal_pwd');
+            $this->repository->transPwd = $this->request->post('withdrawal_pwd');
             return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());
         } catch (\Exception $e) {
             return app('json')->status('error', $e->getMessage(), ['order_id' => $groupOrder->group_order_id]);
diff --git a/app/controller/merchant/Common.php b/app/controller/merchant/Common.php
index 2649048c..417bf245 100644
--- a/app/controller/merchant/Common.php
+++ b/app/controller/merchant/Common.php
@@ -87,7 +87,7 @@ class Common extends BaseController
      * @author xaboy
      * @day 2020/6/25
      */
-    public function mainGroup($date, $merId, $saleType = 1)
+    public function mainGroup($date, $merId, $saleType = 0)
     {
         /** @var UserVisitRepository $userVisitRepository */
         $userVisitRepository = app()->make(UserVisitRepository::class);