退款通知

app/Controller/v3/NotifyController.php

@@ -322,8 +322,8 @@ class NotifyController extends BaseController
 
                 // 查询订单
                 $orderMain = OrderMain::query()
-                    ->whereIn('state', [OrderState::PAID, OrderState::DELIVERY, OrderState::COMPLETED, OrderState::EVALUATED, OrderState::REFUNDING])
-                    ->where(['global_order_id' => $reqInfo['out_trade_no'], 'pay_type' => Payment::WECHAT, 'refund_time' => 0])
+                    ->whereNotIn('state', [OrderState::UNPAID])
+                    ->where(['global_order_id' => $reqInfo['out_trade_no'], 'pay_type' => Payment::WECHAT])
                     ->first();
 
                 // 订单不存在

app/Crontab/AutoCancelOrder.php

@@ -7,7 +7,7 @@ use Hyperf\Crontab\Annotation\Crontab;
 use Hyperf\Di\Annotation\Inject;
 
 /**
- * @Crontab(name="autocancelorder", rule="*\/5 * * * * *", callback="execute", memo="自定取消15分钟过期订单")
+ * @Crontab(name="autocancelorder", rule="*\/1 * * * *", callback="execute", memo="自定取消15分钟过期订单")
  */
 class AutoCancelOrder
 {

app/JsonRpc/OrdersService.php

@@ -154,7 +154,7 @@ class OrdersService implements OrdersServiceInterface
             // 主订单
             $orderMain = OrderMain::query()
                 ->where(['global_order_id' => $global_order_id, 'user_id' => $user_id])
-                ->whereIn('state', OrderState::CAN_REFUND_DIRECT)
+                ->whereIn('state', array_merge(OrderState::CAN_REFUND_DIRECT, [OrderState::REFUNDED]))
                 ->first();
 
             if (is_null($orderMain)) {

app/Service/v3/Implementations/OrderOnlineService.php

@@ -651,7 +651,6 @@ class OrderOnlineService implements OrderOnlineServiceInterface
         try {
 
             $orderMains = OrderMain::query()
-                ->select(['global_order_id', 'user_id'])
                 ->where(['state' => OrderState::UNPAID])
                 ->where('created_at', '<', time()-900)
                 ->get();