商户后台首页统计更改

app/common/dao/merchant/order/OrderMerchantDao.php

@@ -22,6 +22,39 @@ class OrderMerchantDao extends BaseDao
         return OrderMerchant::class;
     }
 
+    public function dayOrderNum($day, $merId = null)
+    {
+        return OrderMerchant::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
+            $query->where('mer_id', $merId);
+        })->when($day, function ($query, $day) {
+            getModelTime($query, $day, 'pay_time');
+        })->count();
+    }
+
+    public function dayOrderPrice($day, $merId = null)
+    {
+        return getModelTime(OrderMerchant::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
+            $query->where('mer_id', $merId);
+        }), $day, 'pay_time')->sum('money');
+    }
+
+    public function dayOrderAvailable($day, $merId = null)
+    {
+        return getModelTime(OrderMerchant::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
+            $query->where('mer_id', $merId);
+        }), $day, 'pay_time')->sum('available');
+    }
+
+    public function dayOrderUserNum($day, $merId = null)
+    {
+        return OrderMerchant::getDB()->where('paid', 1)->when($merId, function ($query, $merId) {
+            $query->where('mer_id', $merId);
+        })->when($day, function ($query, $day) {
+            getModelTime($query, $day, 'pay_time');
+        })->group('uid')->count();
+    }
+
+
     public function test()
     {
         return OrderMerchant::getDB()->select();

app/common/repositories/merchant/MerchantRepository.php

@@ -817,13 +817,17 @@ class MerchantRepository extends BaseRepository
      * @param $mer_id 商户号
      * @return int
      */
-    public function get_lock_num($mer_id){
-        $lockUser=Db::name("user")
+    public function get_lock_num($day, $mer_id){
+        $lockUser = Db::name("user")
             ->where(["mer_id"=>$mer_id])
-            ->count();
-        $lockunion_users=Db::name("union_users")
+            ->when($day, function ($query, $day) {
+                getModelTime($query, $day, 'create_time');
+            })->count();
+        $lockunion_users = Db::name("union_users")
             ->where(["lock_mer_id"=>$mer_id])
-            ->count();
+            ->when($day, function ($query, $day) {
+                getModelTime($query, $day, 'lock_time');
+            })->count();
         $daylock=$lockUser+$lockunion_users;
         return $daylock?$daylock:0;
     }

app/controller/merchant/Common.php

@@ -15,6 +15,7 @@ use app\common\repositories\merchant\MerchantRepository;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreOrderProductRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserRelationRepository;
 use app\common\repositories\user\UserVisitRepository;
@@ -107,6 +108,7 @@ class Common extends BaseController
      */
     public function main($merId = null)
     {
+        $all = $this->mainGroup('', $merId ?? $this->merId);
         $today = $this->mainGroup('today', $merId ?? $this->merId);
         $yesterday = $this->mainGroup('yesterday', $merId ?? $this->merId);
         $lastWeek = $this->mainGroup(date('Y-m-d', strtotime('- 7day')), $merId ?? $this->merId);
@@ -122,10 +124,11 @@ class Common extends BaseController
                 $lastWeekRate[$k] = bcdiv(bcsub($today[$k], $item, 2), $item, 2);
         }
         $day = date('Y-m-d');
-        return $merId ? compact('today', 'yesterday', 'lastWeekRate', 'day') : app('json')->success(compact('today', 'yesterday', 'lastWeekRate', 'day'));
+        return $merId ? compact('all', 'today', 'yesterday', 'lastWeekRate', 'day') : app('json')->success(compact( 'all', 'today', 'yesterday', 'lastWeekRate', 'day'));
     }
 
     /**
+     * 商户后台顶部统计
      * @param $date
      * @param $merId
      * @return array
@@ -136,15 +139,30 @@ class Common extends BaseController
     {
         $userVisitRepository = app()->make(UserVisitRepository::class);
         $repository = app()->make(StoreOrderRepository::class);
+        $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
         $relationRepository = app()->make(UserRelationRepository::class);
         $merchRepository = app()->make(MerchantRepository::class);
+
         $orderNum = $repository->dayOrderNum($date, $merId);
         $payPrice = $repository->dayOrderPrice($date, $merId);
         $payUser = $repository->dayOrderUserNum($date, $merId);
+
+        $orderNumNew = $orderMerchantRepository->dayOrderNum($date, $merId);
+        $payPriceNew = $orderMerchantRepository->dayOrderPrice($date, $merId);
+        $payUserNew = $orderMerchantRepository->dayOrderUserNum($date, $merId);
+        $fenrunNum = $orderMerchantRepository->dayOrderAvailable($date, $merId);
+
+        $jingdouNum = Db::name('user_sign_jingdou')->when($merId, function ($query, $merId) {
+            $query->where('mer_id', $merId);
+        })->when($date, function ($query, $day) {
+            getModelTime($query, $day, 'addtime');
+        })->sum('number');
+
         $visitNum = $userVisitRepository->dateVisitUserNum($date, $merId);
         $likeStore = $relationRepository->dayLikeStore($date, $merId);
-        $lockUserNum = $merchRepository->get_lock_num($merId);
-        return compact('orderNum', 'payPrice', 'payUser', 'visitNum', 'likeStore','lockUserNum');
+        $lockUserNum = $merchRepository->get_lock_num($date, $merId);
+
+        return compact('orderNum', 'payPrice', 'payUser', 'orderNumNew', 'payPriceNew', 'payUserNew', 'fenrunNum', 'jingdouNum', 'visitNum', 'likeStore','lockUserNum');
     }
 
     /**