diff --git a/app/Console/Commands/Order/CancelRefund.php b/app/Console/Commands/Order/CancelRefund.php
index 59aec62f..3e8dc012 100755
--- a/app/Console/Commands/Order/CancelRefund.php
+++ b/app/Console/Commands/Order/CancelRefund.php
@@ -39,9 +39,24 @@ class CancelRefund extends Command
     public function handle()
     {
         Log::info('CancelRefund取消订单并退款');
-        $closeDate = date('Y-m-d H:i:s', time() - 10 * 60);
+        $closeDate = date('Y-m-d H:i:s', time() - 5 * 60);
         Order::where('pay_state', PayState::SUCCESS)
-            ->whereIn('lottery_state', [LottState::PENDING,LottState::DRAFT])
+            ->where('lottery_state', LottState::PENDING)
+            ->where('odds_close_time', '<', $closeDate)
+            ->where(function($query) {
+                $query->where('pid', 0)
+                    ->orWhereRaw('id=pid') // 合买
+                    ->orWhereRaw('id!=pid and type=4'); // 跟单
+            })
+            ->chunkById(200, function($orders) {
+
+                foreach ($orders as $order) {
+                    $this->cancelAndRefund($order);
+                }
+            });
+        $closeDate = date('Y-m-d H:i:s', time() + 30 * 60);
+        Order::where('pay_state', PayState::SUCCESS)
+            ->where('lottery_state', LottState::DRAFT)
             ->where('odds_close_time', '<', $closeDate)
             ->where(function($query) {
                 $query->where('pid', 0)