From 186af5a55f1eda41833a2858d8a37d403f38b9c9 Mon Sep 17 00:00:00 2001
From: zhenhui <1276357500@qq.com>
Date: Wed, 8 Apr 2026 10:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A8=E9=80=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9Estart=5Ftime?=
 =?UTF-8?q?=E5=92=8Cend=5Ftime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/v1/Playx.php            |  2 ++
 app/process/AngpowImportJobs.php           | 20 ++++++++++----------
 web/src/lang/backend/en/mall/order.ts      |  2 ++
 web/src/lang/backend/zh-cn/mall/order.ts   |  5 +++--
 web/src/views/backend/mall/order/index.vue | 19 +++++++++++++++++++
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/app/api/controller/v1/Playx.php b/app/api/controller/v1/Playx.php
index 261d7e6..28e4a58 100644
--- a/app/api/controller/v1/Playx.php
+++ b/app/api/controller/v1/Playx.php
@@ -942,6 +942,8 @@ class Playx extends Api
                 'grant_status'             => MallOrder::GRANT_NOT_SENT,
                 'create_time'              => time(),
                 'update_time'              => time(),
+                'start_time'               => date('Y-m-d H:i:s', time()),
+                'end_time'                 => date('Y-m-d H:i:s', time()+86400*3),
             ]);
 
             Db::commit();
diff --git a/app/process/AngpowImportJobs.php b/app/process/AngpowImportJobs.php
index da6dbe2..a631adc 100644
--- a/app/process/AngpowImportJobs.php
+++ b/app/process/AngpowImportJobs.php
@@ -238,17 +238,17 @@ class AngpowImportJobs
             return null;
         }
 
-        $createTime = $order->create_time ?? null;
-        if (!is_int($createTime)) {
-            if (is_numeric($createTime)) {
-                $createTime = intval($createTime);
-            } else {
-                $createTime = time();
-            }
-        }
+//        $createTime = $order->create_time ?? null;
+//        if (!is_int($createTime)) {
+//            if (is_numeric($createTime)) {
+//                $createTime = intval($createTime);
+//            } else {
+//                $createTime = time();
+//            }
+//        }
 
-        $start = gmdate('Y-m-d\TH:i:s\Z', $createTime);
-        $end = gmdate('Y-m-d\TH:i:s\Z', $createTime + 86400);
+        $start = gmdate('Y-m-d\TH:i:s\Z', strtotime($order->start_time));
+        $end = gmdate('Y-m-d\TH:i:s\Z', strtotime($order->end_time));
 
         return [
             'member_login' => strval($asset->playx_user_id),
diff --git a/web/src/lang/backend/en/mall/order.ts b/web/src/lang/backend/en/mall/order.ts
index 21d28f4..eca0884 100644
--- a/web/src/lang/backend/en/mall/order.ts
+++ b/web/src/lang/backend/en/mall/order.ts
@@ -35,6 +35,8 @@ export default {
     receiver_phone: 'Recipient phone',
     receiver_address: 'Shipping address',
     mall_address_id: 'Address ID',
+    start_time: 'Redemption time',
+    end_time: 'Collection end time',
     create_time: 'Created at',
     update_time: 'Updated at',
     'quick Search Fields': 'Order ID',
diff --git a/web/src/lang/backend/zh-cn/mall/order.ts b/web/src/lang/backend/zh-cn/mall/order.ts
index b7f76d8..24de560 100644
--- a/web/src/lang/backend/zh-cn/mall/order.ts
+++ b/web/src/lang/backend/zh-cn/mall/order.ts
@@ -23,7 +23,7 @@ export default {
     grant_status: '推送playx状态',
     'grant_status NOT_SENT': '未发送',
     'grant_status SENT_PENDING': '已发送排队',
-    'grant_status ACCEPTED': '已接收(accepted)',
+    'grant_status ACCEPTED': '已接收',
     'grant_status FAILED_RETRYABLE': '失败可重试',
     'grant_status FAILED_FINAL': '失败最终',
     'grant_status ---': '---',
@@ -35,8 +35,9 @@ export default {
     receiver_phone: '收货电话',
     receiver_address: '收货地址',
     mall_address_id: '地址ID',
+    start_time: '兑换时间',
+    end_time: '领取结束时间',
     create_time: '创建时间',
     update_time: '修改时间',
     'quick Search Fields': 'ID',
 }
-
diff --git a/web/src/views/backend/mall/order/index.vue b/web/src/views/backend/mall/order/index.vue
index a2ad912..33d5a05 100644
--- a/web/src/views/backend/mall/order/index.vue
+++ b/web/src/views/backend/mall/order/index.vue
@@ -210,6 +210,24 @@ const baTable = new baTableClass(
                 operatorPlaceholder: t('Fuzzy query'),
             },
             { label: t('mall.order.mall_address_id'), prop: 'mall_address_id', align: 'center', width: 100, operator: 'eq', sortable: false },
+            {
+                label: t('mall.order.start_time'),
+                prop: 'start_time',
+                align: 'center',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                sortable: 'custom',
+                width: 160,
+            },
+            {
+                label: t('mall.order.end_time'),
+                prop: 'end_time',
+                align: 'center',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                sortable: 'custom',
+                width: 160,
+            },
             {
                 label: t('mall.order.create_time'),
                 prop: 'create_time',
@@ -225,6 +243,7 @@ const baTable = new baTableClass(
                 label: t('mall.order.update_time'),
                 prop: 'update_time',
                 align: 'center',
+                show: false,
                 render: 'datetime',
                 operator: 'RANGE',
                 comSearchRender: 'datetime',