From 1f193747bcc50f869bc80a8aa1608ce8d840fa27 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Fri, 18 Sep 2020 11:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/NotifyController.php                | 4 ++--
 app/Crontab/AutoCancelOrder.php                       | 2 +-
 app/JsonRpc/OrdersService.php                         | 2 +-
 app/Service/v3/Implementations/OrderOnlineService.php | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Controller/v3/NotifyController.php b/app/Controller/v3/NotifyController.php
index 16d0bc3..fb6cc66 100644
--- a/app/Controller/v3/NotifyController.php
+++ b/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();
 
                 // 订单不存在
diff --git a/app/Crontab/AutoCancelOrder.php b/app/Crontab/AutoCancelOrder.php
index dda86f7..24edc16 100644
--- a/app/Crontab/AutoCancelOrder.php
+++ b/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
 {
diff --git a/app/JsonRpc/OrdersService.php b/app/JsonRpc/OrdersService.php
index 51b746a..e12d9d5 100644
--- a/app/JsonRpc/OrdersService.php
+++ b/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)) {
diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php
index 177459a..bf6c5f6 100644
--- a/app/Service/v3/Implementations/OrderOnlineService.php
+++ b/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();