a、彩民下单未支付，订单截止前5分钟取消并退款(当前是10分钟)

b、未出票的订单，订单截止后30分钟取消并退款(当前是订单截止前10分钟)

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)

app/Http/Controllers/Api/Seller/OrderController.php

@@ -348,6 +348,7 @@ class OrderController extends BaseController
         $order = Order::with([
             'materials:id,order_id,path',
             'receiver:id,nickname,name,avatar',
+            'drafter:id,nickname,name,avatar',
             'lotteryType:id,type,name',
             'customer:id,nickname,name,avatar,remark',
             'cooperate:id,name,seller_phone',

app/Model/Order.php

@@ -74,6 +74,10 @@ class Order extends BaseModel
     {
         return $this->belongsTo(Seller::class, 'receive_user_id', 'id');
     }
+    public function drafter()
+    {
+        return $this->belongsTo(Seller::class, 'draft_user_id', 'id');
+    }
 
     public function cooperate()
     {