回传日志增加小程序id 筛选

modules/Callback/Http/Controllers/CallbackLogController.php

@@ -27,6 +27,7 @@ class CallbackLogController extends CatchController
         $userRanseStartAtEndTime = $request->input('user_ranse_start_at_end_time');
         $orderCreatedAtBeginTime = $request->input('order_created_at_begin_time');
         $orderCreatedAtEndTime = $request->input('order_created_at_end_time');
+        $miniprogramId = $request->input('miniprogram_id');
         $isExport = $request->input('is_export', false);
 
         $sql = DB::table('callback_report_charge_record')
@@ -44,7 +45,10 @@ class CallbackLogController extends CatchController
                 return $query->where('user_ranse_start_at', '<=', $userRanseStartAtEndTime);
             })->when($orderCreatedAtBeginTime, function ($query, $orderCreatedAtBeginTime){
                 return $query->where('order_created_at', '>=', $orderCreatedAtBeginTime);
-            })->when($orderCreatedAtEndTime, function ($query, $orderCreatedAtEndTime) {
+            })->when($miniprogramId, function ($query, $miniprogramId){
+                return $query->where('miniprogram_id', $miniprogramId);
+            })
+            ->when($orderCreatedAtEndTime, function ($query, $orderCreatedAtEndTime) {
                 return $query->where('order_created_at', '<=', $orderCreatedAtEndTime);
             })->orderBy('created_at', 'desc');
         if($isExport) {