优化同意订单页面和推送订单到playx的功能

app/admin/controller/Dashboard.php

@@ -66,7 +66,7 @@ class Dashboard extends Backend
         $pendingPhysicalToShip = MallOrder::where('type', MallOrder::TYPE_PHYSICAL)
             ->where('status', MallOrder::STATUS_PENDING)
             ->count();
-        $grantFailedRetryableCount = MallOrder::whereIn('type', [MallOrder::TYPE_BONUS, MallOrder::TYPE_WITHDRAW])
+        $grantFailedRetryableCount = MallOrder::where('type', MallOrder::TYPE_BONUS)
             ->where('grant_status', MallOrder::GRANT_FAILED_RETRYABLE)
             ->count();
 

app/admin/controller/mall/Order.php

@@ -202,7 +202,7 @@ class Order extends Backend
         $id = $data['id'] ?? 0;
         $rejectReason = $data['reject_reason'] ?? '';
 
-        if (!$id || $rejectReason === '') {
+        if (!$id) {
             return $this->error(__('Missing required fields'));
         }
 
@@ -214,6 +214,10 @@ class Order extends Backend
             return $this->error(__('Order status must be PENDING'));
         }
 
+        if ($order->type === MallOrder::TYPE_PHYSICAL && $rejectReason === '') {
+            return $this->error(__('Missing required fields'));
+        }
+
         Db::startTrans();
         try {
             $asset = MallUserAsset::where('playx_user_id', $order->user_id ?? '')->find();
@@ -229,7 +233,11 @@ class Order extends Backend
 
             $order->status = MallOrder::STATUS_REJECTED;
             $order->reject_reason = $rejectReason;
-            $order->grant_status = MallOrder::GRANT_FAILED_FINAL;
+            if ($order->type === MallOrder::TYPE_BONUS) {
+                $order->grant_status = MallOrder::GRANT_FAILED_FINAL;
+            } else {
+                $order->grant_status = MallOrder::GRANT_NOT_APPLICABLE;
+            }
             $order->update_time = time();
             $order->save();
 
@@ -243,7 +251,7 @@ class Order extends Backend
     }
 
     /**
-     * 手动重试（仅红利/提现，且必须 FAILED_RETRYABLE）
+     * 手动重试（仅红利推送失败可重试）
      */
     public function retry(Request $request): Response
     {
@@ -265,8 +273,8 @@ class Order extends Backend
         if (!$order) {
             return $this->error(__('Record not found'));
         }
-        if (!in_array($order->type, [MallOrder::TYPE_BONUS, MallOrder::TYPE_WITHDRAW], true)) {
-            return $this->error(__('Only BONUS/WITHDRAW can retry'));
+        if ($order->type !== MallOrder::TYPE_BONUS) {
+            return $this->error(__('Only BONUS can retry'));
         }
         if ($order->grant_status !== MallOrder::GRANT_FAILED_RETRYABLE) {
             return $this->error(__('Only FAILED_RETRYABLE can retry'));

app/api/controller/v1/Playx.php

@@ -1016,6 +1016,7 @@ class Playx extends Api
                 'receiver_name'    => $snapshot['receiver_name'],
                 'receiver_phone'   => $snapshot['receiver_phone'],
                 'receiver_address' => $snapshot['receiver_address'],
+                'grant_status'     => MallOrder::GRANT_NOT_APPLICABLE,
                 'create_time'      => time(),
                 'update_time'      => time(),
             ]);
@@ -1082,7 +1083,7 @@ class Playx extends Api
                 'amount'                  => $amount,
                 'multiplier'              => $multiplier,
                 'external_transaction_id' => $orderNo,
-                'grant_status'            => MallOrder::GRANT_NOT_SENT,
+                'grant_status'            => MallOrder::GRANT_NOT_APPLICABLE,
                 'create_time'             => time(),
                 'update_time'             => time(),
             ]);
@@ -1093,11 +1094,6 @@ class Playx extends Api
             return $this->error($e->getMessage());
         }
 
-        $baseUrl = config('playx.api.base_url', '');
-        if ($baseUrl !== '') {
-            $this->callPlayxBalanceCredit($order, $playxUserId);
-        }
-
         return $this->success(__('Withdraw submitted, please wait about 10 minutes'), [
             'order_id' => $order->id,
             'status'   => 'PENDING',
@@ -1143,39 +1139,4 @@ class Playx extends Api
         }
     }
 
-    private function callPlayxBalanceCredit(MallOrder $order, string $userId): void
-    {
-        $baseUrl = rtrim(config('playx.api.base_url', ''), '/');
-        $url = config('playx.api.balance_credit_url', '/api/v1/balance/credit');
-        if ($baseUrl === '') {
-            return;
-        }
-
-        try {
-            $client = new \GuzzleHttp\Client(['timeout' => 15]);
-            $res = $client->post($baseUrl . $url, [
-                'json' => [
-                    'request_id'            => 'mall_withdraw_' . uniqid(),
-                    'externalTransactionId' => $order->external_transaction_id,
-                    'user_id'               => $userId,
-                    'amount'                => $order->amount,
-                    'multiplier'            => $order->multiplier,
-                ],
-            ]);
-            $data = json_decode(strval($res->getBody()), true);
-            if ($res->getStatusCode() === 200 && ($data['status'] ?? '') === 'accepted') {
-                $order->playx_transaction_id = $data['playx_transaction_id'] ?? '';
-                $order->grant_status = MallOrder::GRANT_ACCEPTED;
-                $order->save();
-            } else {
-                $order->grant_status = MallOrder::GRANT_FAILED_RETRYABLE;
-                $order->fail_reason = $data['message'] ?? 'unknown';
-                $order->save();
-            }
-        } catch (\Throwable $e) {
-            $order->grant_status = MallOrder::GRANT_FAILED_RETRYABLE;
-            $order->fail_reason = $e->getMessage();
-            $order->save();
-        }
-    }
 }

app/common/model/MallOrder.php

@@ -51,6 +51,9 @@ class MallOrder extends Model
     public const GRANT_FAILED_RETRYABLE = 'FAILED_RETRYABLE';
     public const GRANT_FAILED_FINAL = 'FAILED_FINAL';
 
+    /** 非红利订单不参与 PlayX/Angpow 推送，固定为该占位值 */
+    public const GRANT_NOT_APPLICABLE = '---';
+
     protected array $type = [
         'create_time' => 'integer',
         'update_time' => 'integer',

app/process/PlayxJobs.php

@@ -47,7 +47,8 @@ class PlayxJobs
         $path = strval(config('playx.api.transaction_status_url', '/api/v1/transaction/status'));
         $url = rtrim($baseUrl, '/') . $path;
 
-        $list = MallOrder::where('grant_status', MallOrder::GRANT_ACCEPTED)
+        $list = MallOrder::where('type', MallOrder::TYPE_BONUS)
+            ->where('grant_status', MallOrder::GRANT_ACCEPTED)
             ->where('status', MallOrder::STATUS_PENDING)
             ->order('id', 'desc')
             ->limit(50)
@@ -99,12 +100,11 @@ class PlayxJobs
         }
 
         $bonusPath = strval(config('playx.api.bonus_grant_url', '/api/v1/bonus/grant'));
-        $withdrawPath = strval(config('playx.api.balance_credit_url', '/api/v1/balance/credit'));
         $bonusUrl = rtrim($baseUrl, '/') . $bonusPath;
-        $withdrawUrl = rtrim($baseUrl, '/') . $withdrawPath;
 
         $maxRetry = 3;
-        $list = MallOrder::whereIn('grant_status', [
+        $list = MallOrder::where('type', MallOrder::TYPE_BONUS)
+            ->whereIn('grant_status', [
                 MallOrder::GRANT_NOT_SENT,
                 MallOrder::GRANT_FAILED_RETRYABLE,
             ])
@@ -124,7 +124,7 @@ class PlayxJobs
             $order->retry_count = intval($order->retry_count ?? 0) + 1;
 
             try {
-                $this->sendGrantByOrder($order, $bonusUrl, $withdrawUrl, $maxRetry);
+                $this->sendGrantByOrder($order, $bonusUrl, $maxRetry);
             } catch (\Throwable $e) {
                 $order->fail_reason = $e->getMessage();
                 if (intval($order->retry_count) >= $maxRetry) {
@@ -167,7 +167,7 @@ class PlayxJobs
         return false;
     }
 
-    private function sendGrantByOrder(MallOrder $order, string $bonusUrl, string $withdrawUrl, int $maxRetry): void
+    private function sendGrantByOrder(MallOrder $order, string $bonusUrl, int $maxRetry): void
     {
         $item = null;
         if ($order->mallItem) {
@@ -221,45 +221,7 @@ class PlayxJobs
             return;
         }
 
-        if ($order->type === MallOrder::TYPE_WITHDRAW) {
-            $multiplier = intval($order->multiplier ?? 0);
-            if ($multiplier <= 0) {
-                $multiplier = 1;
-            }
-            $requestId = 'mall_retry_withdraw_' . uniqid();
-            $res = $this->http->post($withdrawUrl, [
-                'json' => [
-                    'request_id' => $requestId,
-                    'externalTransactionId' => $order->external_transaction_id,
-                    'user_id' => $order->user_id,
-                    'amount' => $order->amount,
-                    'multiplier' => $multiplier,
-                ],
-            ]);
-
-            $data = json_decode(strval($res->getBody()), true) ?? [];
-            if ($res->getStatusCode() === 200 && ($data['status'] ?? '') === 'accepted') {
-                $order->grant_status = MallOrder::GRANT_ACCEPTED;
-                $order->playx_transaction_id = strval($data['playx_transaction_id'] ?? '');
-                $order->save();
-                return;
-            }
-
-            $order->fail_reason = strval($data['message'] ?? 'PlayX balance credit not accepted');
-            if (intval($order->retry_count) >= $maxRetry) {
-                $order->grant_status = MallOrder::GRANT_FAILED_FINAL;
-                $order->status = MallOrder::STATUS_REJECTED;
-                $order->save();
-                $this->refundPoints($order);
-                return;
-            }
-
-            $order->grant_status = MallOrder::GRANT_FAILED_RETRYABLE;
-            $order->save();
-            return;
-        }
-
-        // PHYSICAL 目前由后台手工发货/驳回，不参与 PlayX 发放重试
+        // 非 BONUS 订单不参与 PlayX 发放重试（提现/实物由后台流程处理）
     }
 
     private function refundPoints(MallOrder $order): void