@pisell/pisellos 2.2.313 → 2.2.315

package/lib/server/modules/order/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.OrderModule = void 0;
 var _lodashEs = require("lodash-es");
+var _localEftposState = require("../../../modules/Order/localEftposState");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _BaseModule = require("../../../modules/BaseModule");
 var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
@@ -259,9 +260,9 @@ class OrderModule extends _BaseModule.BaseModule {
   mergeAuthoritativeOrderCollection(field, existing, incoming, uidRemaps = [], options = {}) {
     const kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
     const existingItems = Array.isArray(existing) ? existing : [];
-    if (field === 'payments' && options.preserveIdentifiedPendingPayments) {
+    if (field === 'payments' && (options.preserveIdentifiedPendingPayments || existingItems.some(_localEftposState.isLocalFinalizedPayment))) {
       return (0, _paymentUtils.mergeOrderPaymentListsByIdentity)(existingItems, incoming, {
-        preserveUnmatchedExistingWhen: _paymentUtils.isIdentifiedPendingOrderPayment
+        preserveUnmatchedExistingWhen: payment => options.preserveIdentifiedPendingPayments === true && (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment) || (0, _localEftposState.isLocalFinalizedPayment)(payment)
       });
     }
     return incoming.map(incomingItem => {
@@ -637,6 +638,42 @@ class OrderModule extends _BaseModule.BaseModule {
     const memoryOrder = this.store.list.find(order => this.isOrderLookupMatch(order, key));
     return memoryOrder || null;
   }
+
+  /** Read-only payment gate lookup; never hydrate the whole order list on a miss. */
+  async getLocalOrderForPaymentReadiness(lookup) {
+    if (lookup === undefined || lookup === null || lookup === '') return null;
+    const memoryOrder = this.getLocalOrderFromMemoryByLookup(lookup);
+    if (memoryOrder) return memoryOrder;
+    if (typeof this.dbManager?.find !== 'function') {
+      return this.getLocalOrderByLookup(lookup);
+    }
+    const key = this.getIdKey(lookup);
+    const fields = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+    const candidates = [];
+    for (const column of fields) {
+      // Match getAll's storage-key ordering even when aliases collide across rows.
+      // Let query errors reach the payment gate rather than treating them as a miss.
+      const rows = await this.dbManager.find(INDEXDB_STORE_NAME, {
+        filters: [{
+          column,
+          op: '=',
+          value: key
+        }],
+        orderBy: [{
+          column: '__order_storage_key',
+          dir: 'asc'
+        }],
+        limit: 1
+      });
+      if (rows?.[0] && this.isOrderLookupMatch(rows[0], key)) candidates.push(rows[0]);
+    }
+    candidates.sort((left, right) => {
+      const leftKey = String(left.__order_storage_key ?? this.getOrderStorageKey(left));
+      const rightKey = String(right.__order_storage_key ?? this.getOrderStorageKey(right));
+      return leftKey < rightKey ? -1 : leftKey > rightKey ? 1 : 0;
+    });
+    return candidates.length ? this.normalizeOrderForMemoryList(candidates[0], 'paymentReadiness.sqlite') : null;
+  }
   async getLocalOrderByLookup(lookup, options = {}) {
     const key = this.getIdKey(lookup);
     const logContext = {
@@ -753,6 +790,13 @@ class OrderModule extends _BaseModule.BaseModule {
       return null;
     }
     const previousPayment = (0, _lodashEs.cloneDeep)(found.payment);
+    if (params.finalizeUnsuccessful && (found.payment.status === 'paid' || found.payment.metadata?.transactions?.some(transaction => transaction.status === 'success') || (0, _localEftposState.isLocalFinalizedPayment)(found.payment))) {
+      return {
+        order: found.order,
+        payment: found.payment,
+        previousPayment
+      };
+    }
     const nextPayment = (0, _paymentUtils.mergeOrderPaymentRecord)(found.payment, {
       ...params.updates,
       updated_at: params.updates.updated_at || (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss')
@@ -762,6 +806,13 @@ class OrderModule extends _BaseModule.BaseModule {
       payments: (found.order.payments || []).map((payment, index) => index === found.paymentIndex ? nextPayment : payment),
       updated_at: (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss')
     };
+    if (params.finalizeUnsuccessful && this.hasRealOrderId(found.order) && Number(found.order.need_sync || 0) === 0 && !(nextOrder.payments || []).some(_paymentUtils.isPendingOrderPayment)) {
+      nextOrder.is_draft_order = 0;
+      nextOrder.metadata = {
+        ...nextOrder.metadata,
+        [_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED]: true
+      };
+    }
     const paymentContext = {
       ...logContext,
       matched_by: found.matchedBy,
@@ -813,6 +864,60 @@ class OrderModule extends _BaseModule.BaseModule {
       previousPayment
     };
   }
+  async finalizeLocalEftposPayment(params) {
+    const found = await this.getLocalPayment(params);
+    if (!found) throw new Error('未找到本地支付记录');
+    const transactions = found.payment.metadata?.transactions || [];
+    if (transactions.some(transaction => transaction.status !== 'fail' && transaction.status !== 'success' && !params.failedTransactionNumbers.includes(String(transaction.number)))) {
+      throw new Error('仍有结果未知的交易，保留待确认支付');
+    }
+    if (params.result === 'not_started' && transactions.length > 0 && !(0, _localEftposState.isLocalFinalizedPayment)(found.payment) && found.payment.status !== 'paid') {
+      throw new Error('支付已有交易记录，不能按未发起交易结束');
+    }
+    return this.updateLocalPayment({
+      ...params,
+      finalizeUnsuccessful: true,
+      updates: {
+        status: 'voided',
+        metadata: {
+          [_localEftposState.LOCAL_EFTPOS_FINALIZED]: true,
+          transactions: params.failedTransactionNumbers.map(number => ({
+            number,
+            status: 'fail'
+          }))
+        }
+      }
+    });
+  }
+
+  /** Only a successful full detail GET may release the persisted payment gate. */
+  async completeLocalPaymentRefresh(fresh) {
+    const existing = await this.getLocalOrderByLookup(fresh.order_id);
+    if (!existing || !(0, _localEftposState.requiresLocalPaymentRefresh)(existing)) {
+      await this.upsertOrdersFromRemote([fresh]);
+      return (await this.getLocalOrderByLookup(fresh.order_id)) || fresh;
+    }
+    if (this.isPendingSyncOrder(existing) || this.isDraftOrder(existing) || (existing.payments || []).some(_paymentUtils.isPendingOrderPayment)) {
+      throw new Error('订单仍有未结束支付或待同步改动，暂不能刷新');
+    }
+    if (!Array.isArray(fresh.products) || !fresh.summary) {
+      throw new Error('远端订单详情不完整，请重新刷新');
+    }
+    const nextOrder = this.mergeOrderRecords(existing, this.normalizeRemoteSyncedOrder(fresh));
+    nextOrder.metadata = {
+      ...nextOrder.metadata
+    };
+    delete nextOrder.metadata[_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED];
+    // Do not publish/clear the gate in memory until SQLite has accepted the full snapshot.
+    await this.updateOrderInSQLite(nextOrder, 'completeLocalPaymentRefresh', {
+      throwOnError: true
+    });
+    const index = this.findOrderIndexByIdentity(this.store.list, existing);
+    this.store.list = index < 0 ? [...this.store.list, nextOrder] : this.store.list.map((order, i) => i === index ? nextOrder : order);
+    this.syncOrdersMap();
+    await this.emitOrdersChanged([nextOrder], 'completeLocalPaymentRefresh');
+    return nextOrder;
+  }
   async loadOrdersByServer(options = {}) {
     let orderList = [];
     let hasFetchedRemoteSnapshot = false;
@@ -1997,7 +2102,7 @@ class OrderModule extends _BaseModule.BaseModule {
     return payments.filter(payment => (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment));
   }
   shouldProtectLocalOrderFromRemoteSnapshot(order) {
-    return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
+    return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0 || (0, _localEftposState.requiresLocalPaymentRefresh)(order) || (order.payments || []).some(_localEftposState.isLocalFinalizedPayment);
   }
   getUnmatchedIdentifiedPendingPayments(existing, incoming) {
     const existingPayments = Array.isArray(existing) ? existing : [];
@@ -2019,6 +2124,12 @@ class OrderModule extends _BaseModule.BaseModule {
     const secondaryRecord = secondary;
     const existingRecord = existing;
     const incomingRecord = incoming;
+    if ((0, _localEftposState.requiresLocalPaymentRefresh)(existing)) {
+      mergedRecord.metadata = {
+        ...mergedRecord.metadata,
+        [_localEftposState.LOCAL_EFTPOS_REFRESH_REQUIRED]: true
+      };
+    }
     const childUidRemaps = [];
     for (const field of fieldsToPreserve) {
       if (!this.isBlankIdentityValue(preferredRecord[field])) {

package/lib/server/modules/order/types.d.ts

@@ -463,6 +463,7 @@ export interface OrderData {
             id: number | string;
             tag: 'virtual_currency';
             product_id?: number | string;
+            code?: string;
             product_name: string;
             par_value: string;
             used_par_value: string;

package/lib/server/test.json

@@ -132,7 +132,7 @@
     "contacts_info": null,
     "holder": null,
     "metadata": {},
-    "delivery_type": "nil",
+    "delivery_type": "shop_service",
     "small_ticket_data_flag": 1,
     "need_sync": 1,
     "payment_info": {

package/lib/server/utils/small-ticket.d.ts

@@ -1,85 +1 @@
-export interface SmallTicketShopInfo {
-    name?: string;
-    phone?: string;
-    address?: string;
-    address_street?: string;
-    address_detail?: string;
-    city?: string;
-    province?: string;
-    country?: string;
-    zip?: string;
-    tax_number?: string;
-    tax_title?: string;
-    is_price_include_tax?: 0 | 1 | boolean;
-    currency_symbol?: string;
-    currency_code?: string;
-    primary_locale?: string;
-    timezone?: string;
-    [key: string]: any;
-}
-export interface BuildSmallTicketDataParams {
-    order: Record<string, any>;
-    shopInfo?: SmallTicketShopInfo | null;
-    locales?: string[];
-    productMap?: Record<string | number, Record<string, any>>;
-}
-export interface SmallTicketItem {
-    item: string;
-    value: string;
-    size?: number;
-    align?: string;
-    product_uid?: string | number;
-    booking_uid?: string | number;
-}
-export interface SmallTicketProduct {
-    product_title: string;
-    product_quantity: number;
-    selling_price: string;
-    total_selling_price: string;
-    original_price: string;
-    base_price?: string;
-    total_original_price: string;
-    options_total_price?: string;
-    package_items_total_price?: string;
-    extension_list: any[];
-    product_uid?: string | number;
-    booking_uid?: string | number;
-    product_note?: string;
-    allergy?: string;
-    options?: Array<{
-        name: string;
-        num?: number;
-        price?: string;
-        total_price: string;
-        value?: string;
-    }>;
-    variant?: string;
-    combinations?: any[];
-}
-export type SmallTicketAppointment = SmallTicketItem[];
-export interface SmallTicketLocaleData {
-    base_data: Record<string, any>;
-    products: SmallTicketProduct[];
-    fees: {
-        fees: SmallTicketItem[];
-        countFee: Record<string, any>;
-    };
-    customer: SmallTicketItem[];
-    appointment: SmallTicketAppointment;
-    delivery?: SmallTicketItem[];
-    resources: Array<{
-        id: string | number;
-        code: string;
-        title: string;
-        form_title: string;
-    }>;
-    payment_data: SmallTicketItem[][];
-    wallets: SmallTicketItem[][];
-    tickets: any[];
-    source_shop: any[];
-    refund_data: SmallTicketItem[][];
-    expend_data: any[];
-}
-export type SmallTicketData = Record<string, SmallTicketLocaleData>;
-export declare function buildSmallTicketData(params: BuildSmallTicketDataParams): SmallTicketData;
-export declare function hasSmallTicketData(value: any): boolean;
+export * from '../../shared/receipt/small-ticket';