Browse Source

控制台

gorden 4 months ago
parent
commit
d762f5bd22

+ 12 - 4
app/admin/controller/order/WholeController.php

@@ -87,9 +87,17 @@ class WholeController extends Curd
             $todayTimeUnix = strtotime(date('Y-m-d') . ' 00:00:00');
             $groupIds = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
                 ->where('join_pay_order_id', '<>', '')
-                ->where('pay_category', '<>', 'RETURN')
-                ->where('pay_category', '<>', 'RECHARGE')
-                ->where('pay_category', '<>', 'CLEAR')
+                ->whereIn('pay_category',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','MEALS'])
+                ->where('pay_status', 'SUCCESS')
+                ->pluck('join_pay_order_id')
+                ->toArray();
+            $where['order_groupby'] = ['in', $groupIds];
+        } else if ($type == 'todaySalesOrderAmount') {
+            $todayTimeUnix = strtotime(date('Y-m-d') . ' 00:00:00');
+            $groupIds = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
+                ->where('join_pay_order_id', '<>', '')
+                ->whereIn('pay_prepayid',['WXPAY','ALIPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
+                ->where('pay_status', 'SUCCESS')
                 ->pluck('join_pay_order_id')
                 ->toArray();
             $where['order_groupby'] = ['in', $groupIds];
@@ -478,7 +486,7 @@ class WholeController extends Curd
                 if (!empty($item['member']['join_member_role_id'])) {
                     $item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
                 }
-                
+
                 $item['member_info']['member_info_nickname'] = MemberService::getNickname(!empty($item['member_info']) ? $item['member_info']['member_info_nickname'] : '', (!empty($item['member']) ? $item['member']['member_mobile'] : ''));
                 $item['member_info']['member_info_headimg'] = MemberService::getAvatarUrl(!empty($item['member_info']) && !empty($item['member_info']['member_info_headimg']) ? $item['member_info']['member_info_headimg'] : '');
             }

+ 10 - 9
app/admin/service/statistics/OrderService.php

@@ -15,23 +15,16 @@ class OrderService
         $todayTimeUnix = strtotime(date('Y-m-d'));
         // 今日订单
         $data['todayOrder'] = Order::where('order_addtimes', '>', $todayTimeUnix)->where('order_category', '<>', 'RECHARGE')->count();
-        // 今日收入
-//        $couponDetails = Db::select("select * from app_coupon_detail where coupon_detail_deadline_datetime != '' AND CAST(UNIX_TIMESTAMP(coupon_detail_deadline_datetime) as SIGNED) < " . time());
-
+        // 今日营业额
         $data['todayRevenue'] = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
+            ->whereIn('pay_category',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','MEALS'])
             ->where('join_pay_order_id', '<>', '')
             ->where('pay_status', 'SUCCESS')
-            ->where('pay_category', '<>', 'RETURN')
-            ->where('pay_category', '<>', 'REFUND')
-            ->where('pay_category', '<>', 'ROLE_REFUND')
-            ->where('pay_category', '<>', 'RECHARGE')
-            ->where('pay_category', '<>', 'CLEAR')
             ->sum('pay_amount');
         $refundAmount = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
             ->where('pay_status', 'SUCCESS')
             ->whereIn('pay_category', ['REFUND', 'ROLE_REFUND'])
             ->sum('pay_amount');
-//        $data['todayRevenue'] = $data['todayRevenue'] - $refundAmount;
         $data['todayRevenue'] = round($data['todayRevenue'], 2);
         // 今日充值额
         $data['todayRecharge'] = Order::where('order_status_payment', 'SUCCESS')
@@ -42,6 +35,14 @@ class OrderService
         // 今日退单
         $data['todayRefund'] = $refundAmount;
 
+        // 今日销售额
+        $data['todaySales'] = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
+            ->whereIn('pay_prepayid',['WXPAY','ALIPAY','OFFLINE_WXPAY','OFFLINE_ALIPAY','MONEY'])
+            ->where('join_pay_order_id', '<>', '')
+            ->where('pay_status', 'SUCCESS')
+            ->sum('pay_amount');
+
+        $data['todaySales'] = round($data['todaySales'], 2);
 
         // 柱状图
         // 产品订单