Merge branch 'dev-xpy' into dev

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2717,6 +2717,17 @@ class StoreOrderRepository extends BaseRepository
 //        if ($query->order_type == 1) {
 //            $query->append(['take']);
 //        }
+        $auto_close_minutes = ((int) systemConfig('auto_close_order_timer')) ?: 15;
+        $createTime = $data['create_time'] ?? $pay_time ?? date('Y-m-d H:i:s');
+        $closeTime = date('Y-m-d H:i:s', strtotime($createTime) + $auto_close_minutes * 60);
+        if (!empty($data['seckill']) && $data['seckill'] == 1) {
+            $nextHourTimestamp = time() + 3600;
+            $closeTime = date('Y-m-d H:00:00', $nextHourTimestamp);
+        }
+        if (!empty($data['is_day_pay']) && $data['is_day_pay'] == 1) {
+            $closeTime = date('Y-m-d H:i:s', strtotime($createTime) + 3 * 60);
+        }
+        $data['close_time'] = $closeTime;
         return $data;
     }