@pisell/pisellos 2.2.257 → 2.2.259

package/lib/modules/SurchargeList/index.js

@@ -25,15 +25,17 @@ __export(SurchargeList_exports, {
 module.exports = __toCommonJS(SurchargeList_exports);
 var import_BaseModule = require("../BaseModule");
 __reExport(SurchargeList_exports, require("./types"), module.exports);
+var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SurchargeListModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "surchargeList";
     this.defaultVersion = "1.0.0";
-    this.loadingPromise = null;
+    this.loadingPromises = /* @__PURE__ */ new Map();
+    this.requestVersion = 0;
   }
   async initialize(core, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
@@ -41,44 +43,62 @@ var SurchargeListModule = class extends import_BaseModule.BaseModule {
       (_a = options.initialState) == null ? void 0 : _a.surchargeList
     );
     this.store.surchargeList = hasInitialSurchargeList ? (_b = options.initialState) == null ? void 0 : _b.surchargeList : [];
-    this.store.isLoaded = Boolean((_c = options.initialState) == null ? void 0 : _c.isLoaded) || hasInitialSurchargeList;
+    this.store.channel = ((_c = options.initialState) == null ? void 0 : _c.channel) || ((_d = options.otherParams) == null ? void 0 : _d.channel) || DEFAULT_SURCHARGE_CHANNEL;
+    this.store.isLoaded = Boolean((_e = options.initialState) == null ? void 0 : _e.isLoaded) || hasInitialSurchargeList;
     if (!this.request) {
       throw new Error("SurchargeListModule 需要 request 插件支持");
     }
   }
-  async getSurchargeList() {
-    if (this.store.isLoaded)
+  resolveChannel(query) {
+    return (query == null ? void 0 : query.channel) || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    if (this.store.isLoaded && this.store.channel === channel) {
       return this.store.surchargeList;
-    if (this.loadingPromise)
-      return this.loadingPromise;
-    this.loadingPromise = this.loadSurchargeList();
-    return this.loadingPromise;
+    }
+    const loadingPromise = this.loadingPromises.get(channel);
+    if (loadingPromise)
+      return loadingPromise;
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
   }
-  async refreshSurchargeList() {
-    this.loadingPromise = this.loadSurchargeList();
-    return this.loadingPromise;
+  async refreshSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
   }
-  async loadSurchargeList() {
+  async loadSurchargeList(channel) {
+    const currentRequestVersion = ++this.requestVersion;
     try {
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          channel: "online-store",
+          channel,
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
           with: ["relationSchedule"]
         }
       );
-      this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
-      this.store.isLoaded = true;
-      return this.store.surchargeList;
+      const nextSurchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = nextSurchargeList;
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return nextSurchargeList;
     } catch (error) {
       console.warn("[SurchargeListModule] 加载附加费配置失败", error);
-      this.store.surchargeList = [];
-      this.store.isLoaded = true;
-      return this.store.surchargeList;
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = [];
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return [];
     } finally {
-      this.loadingPromise = null;
+      this.loadingPromises.delete(channel);
     }
   }
 };

package/lib/modules/SurchargeList/types.d.ts

@@ -4,8 +4,12 @@ export interface SurchargeListItem {
 export interface SurchargeListState {
     surchargeList: SurchargeListItem[];
     isLoaded: boolean;
+    channel?: string;
+}
+export interface SurchargeListQuery {
+    channel?: string;
 }
 export interface SurchargeListModuleAPI {
-    getSurchargeList(): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
 }

package/lib/server/index.d.ts

@@ -431,6 +431,9 @@ declare class Server {
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
+    private handleMachinecodeBatchMeta;
+    private resolveMachinecodeBatchMetadataLookup;
+    private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;

package/lib/server/index.js

@@ -639,7 +639,8 @@ var Server = class {
           checkoutData,
           order: printableOrder,
           response: null,
-          requireFullyPaid: false
+          requireFullyPaid: false,
+          isManualPrint: true
         });
         return {
           code: 200,
@@ -661,6 +662,97 @@ var Server = class {
         };
       }
     };
+    this.handleMachinecodeBatchMeta = async ({ data }) => {
+      var _a, _b;
+      const title = "handleMachinecodeBatchMeta";
+      const backendPath = "/shop/machinecode/batch";
+      const ids = Array.isArray(data == null ? void 0 : data.ids) ? data.ids : [];
+      const status = data == null ? void 0 : data.status;
+      this.logInfo(`${title}: 开始处理`, {
+        backendPath,
+        batchSize: ids.length,
+        status,
+        order_lookup: this.resolveMachinecodeBatchMetadataLookup(data) ?? null
+      });
+      if (ids.length === 0) {
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: []
+        };
+      }
+      if (status !== "used" && status !== "unused") {
+        return {
+          code: 400,
+          status: false,
+          message: "无效的核销状态",
+          data: null
+        };
+      }
+      try {
+        await this.syncMachinecodeRedeemStatusToLocalOrder(data, ids, status);
+      } catch (error) {
+        const message = this.getUnknownErrorMessage(error);
+        this.logError(`${title}: 本地订单核销状态更新失败`, {
+          error: message,
+          error_detail: this.normalizeUnknownError(error)
+        });
+        return {
+          code: 500,
+          status: false,
+          message,
+          data: null
+        };
+      }
+      if (!((_b = (_a = this.app) == null ? void 0 : _a.request) == null ? void 0 : _b.post)) {
+        this.logError(`${title}: app.request 不可用`, { backendPath });
+        return {
+          code: 500,
+          status: false,
+          message: "app.request 不可用",
+          data: null
+        };
+      }
+      try {
+        const response = await this.app.request.post(backendPath, {
+          ids,
+          status
+        }, {
+          isShopApi: true,
+          customToast: () => {
+          }
+        });
+        return {
+          code: (response == null ? void 0 : response.code) ?? 200,
+          status: (response == null ? void 0 : response.status) ?? true,
+          message: (response == null ? void 0 : response.message) ?? "",
+          data: (response == null ? void 0 : response.data) ?? response
+        };
+      } catch (error) {
+        const backendError = this.extractBackendErrorResponse(error);
+        if (backendError) {
+          return {
+            code: backendError.code ?? 500,
+            status: backendError.status ?? false,
+            message: backendError.message ?? "后端拒绝 batch-metadata",
+            data: backendError.data ?? null
+          };
+        }
+        const message = this.getUnknownErrorMessage(error);
+        this.logError(`${title}: 请求失败`, {
+          backendPath,
+          error: message,
+          error_detail: this.normalizeUnknownError(error)
+        });
+        return {
+          code: 500,
+          status: false,
+          message,
+          data: null
+        };
+      }
+    };
     this.handleOrderSalesDetail = async ({ url, data, path }) => {
       var _a;
       const requestPath = this.parseRequestPath(url, path);
@@ -737,7 +829,7 @@ var Server = class {
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logError("handleOrderSalesDetail: 请求失败", {
+        this.logInfo("handleOrderSalesDetail: 请求失败", {
           lookup,
           backendPath,
           error: errorMessage
@@ -1743,6 +1835,16 @@ var Server = class {
         method: "post",
         path: "/shop/local/print-order",
         handler: this.handleLocalPrintOrder.bind(this)
+      },
+      {
+        method: "post",
+        path: "/shop/machinecode/batch",
+        handler: this.handleMachinecodeBatchMeta.bind(this)
+      },
+      {
+        method: "post",
+        path: "/machinecode/batch",
+        handler: this.handleMachinecodeBatchMeta.bind(this)
       }
     ]);
     this.registerPrefixRoutes([
@@ -2656,10 +2758,12 @@ var Server = class {
         action: "print_all",
         device_id: params.deviceId ?? deviceId,
         payload: {
-          type: params.receiptOnly ? "0" : "99",
+          type: params.isManualPrint ? "0" : "99",
           data: params.receiptOnly ? {
             order_id: printIdentity,
-            small_ticket_data: (_b = (_a = params.syncedOrder) == null ? void 0 : _a.payment_info) == null ? void 0 : _b.small_ticket_data
+            small_ticket_data: (_b = (_a = params.syncedOrder) == null ? void 0 : _a.payment_info) == null ? void 0 : _b.small_ticket_data,
+            skip_wristband: true,
+            skip_voucher: true
           } : {
             order_id: printIdentity,
             machine_code_print_info: (_d = (_c = params.syncedOrder) == null ? void 0 : _c.payment_info) == null ? void 0 : _d.machine_code_print_info,
@@ -2670,7 +2774,7 @@ var Server = class {
         idempotency_key: this.buildPrintOtherReceiptIdempotencyKey(params.syncedOrder, {
           receiptOnly: params.receiptOnly
         }),
-        name: "打印转发",
+        name: "PRINT_V1",
         source: "server",
         source_type: "order",
         source_id: printIdentity
@@ -2710,7 +2814,8 @@ var Server = class {
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,
       response: params.response,
-      receiptOnly: true
+      receiptOnly: true,
+      isManualPrint: params.isManualPrint
     });
     return { printed: true, order: printableOrder };
   }
@@ -2728,6 +2833,110 @@ var Server = class {
     }
     return void 0;
   }
+  resolveMachinecodeBatchMetadataLookup(data) {
+    const candidates = [
+      data == null ? void 0 : data.order_lookup,
+      data == null ? void 0 : data.orderLookup,
+      data == null ? void 0 : data.external_sale_number,
+      data == null ? void 0 : data.externalSaleNumber,
+      data == null ? void 0 : data.order_id,
+      data == null ? void 0 : data.orderId,
+      data == null ? void 0 : data.order_number,
+      data == null ? void 0 : data.orderNumber,
+      data == null ? void 0 : data.shop_order_number,
+      data == null ? void 0 : data.shopOrderNumber,
+      data == null ? void 0 : data.shop_full_order_number,
+      data == null ? void 0 : data.shopFullOrderNumber
+    ];
+    return candidates.find((candidate) => candidate !== void 0 && candidate !== null && candidate !== "");
+  }
+  async syncMachinecodeRedeemStatusToLocalOrder(data, ids, status) {
+    var _a;
+    const title = "handleMachinecodeBatchMetadata";
+    const lookup = this.resolveMachinecodeBatchMetadataLookup(data);
+    if (lookup === void 0) {
+      this.logWarning(`${title}: order lookup 缺失，跳过本地订单核销状态更新`, {
+        batchSize: ids.length,
+        status
+      });
+      return;
+    }
+    if (!((_a = this.order) == null ? void 0 : _a.getLocalOrderByLookup)) {
+      this.logWarning(`${title}: Order 模块未注册，跳过本地订单核销状态更新`, {
+        lookup,
+        status
+      });
+      return;
+    }
+    const localOrder = await this.order.getLocalOrderByLookup(lookup);
+    if (!localOrder) {
+      this.logWarning(`${title}: 本地订单不存在，跳过核销状态更新`, {
+        lookup,
+        status
+      });
+      return;
+    }
+    const voucherIdSet = new Set(
+      ids.filter((id) => id !== void 0 && id !== null && id !== "").map((id) => String(id))
+    );
+    if (voucherIdSet.size === 0) {
+      this.logWarning(`${title}: voucher ids 缺失，跳过本地订单核销状态更新`, {
+        lookup,
+        status
+      });
+      return;
+    }
+    const vouchers = Array.isArray(localOrder.vouchers) ? localOrder.vouchers : [];
+    let hasUpdatedVoucher = false;
+    const nextVouchers = vouchers.map((voucher) => {
+      const voucherId = voucher == null ? void 0 : voucher.voucher_id;
+      if (voucherId === void 0 || voucherId === null)
+        return voucher;
+      if (!voucherIdSet.has(String(voucherId)))
+        return voucher;
+      hasUpdatedVoucher = true;
+      return {
+        ...voucher,
+        status
+      };
+    });
+    if (!hasUpdatedVoucher) {
+      this.logWarning(`${title}: 本地订单未命中任何 voucher，跳过核销状态更新`, {
+        lookup,
+        voucher_ids: Array.from(voucherIdSet),
+        status
+      });
+      return;
+    }
+    if (typeof this.order.overwriteExistingOrder === "function") {
+      await this.order.overwriteExistingOrder({
+        ...localOrder,
+        vouchers: nextVouchers
+      });
+      this.logInfo(`${title}: 本地订单 vouchers 核销状态已更新`, {
+        lookup,
+        updatedCount: voucherIdSet.size,
+        status
+      });
+      return;
+    }
+    if ((data == null ? void 0 : data.external_sale_number) && typeof this.order.markOrderSyncedByExternalSaleNumber === "function") {
+      await this.order.markOrderSyncedByExternalSaleNumber({
+        externalSaleNumber: data.external_sale_number,
+        patch: { vouchers: nextVouchers }
+      });
+      this.logInfo(`${title}: 本地订单 vouchers 核销状态已更新`, {
+        lookup,
+        updatedCount: voucherIdSet.size,
+        status
+      });
+      return;
+    }
+    this.logWarning(`${title}: Order 模块不支持本地订单覆盖，跳过核销状态更新`, {
+      lookup,
+      status
+    });
+  }
   async handleOrderCheckoutSubmit(params) {
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {
@@ -2925,11 +3134,8 @@ var Server = class {
     );
   }
   shouldBuildSmallTicketData(order) {
-    var _a;
     if (!order || typeof order !== "object")
       return false;
-    if ((0, import_small_ticket.hasSmallTicketData)((_a = order.payment_info) == null ? void 0 : _a.small_ticket_data))
-      return false;
     return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
   }
   shouldPrintSyncedOrder(params) {

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

@@ -15,7 +15,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncTimer?;
     private isProcessingSyncBatch;
     private isIdlePhase;
-    private resourceIdIndex;
     private logger;
     private storage;
     private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
@@ -89,7 +88,6 @@ export declare class OrderModule extends BaseModule implements Module {
      * @returns 刷新后的订单列表
      */
     silentRefresh(): Promise<OrderData[]>;
-    getOrdersByResourceId(resourceId: string | number): OrderData[];
     private normalizeOrderForMemoryList;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
@@ -126,7 +124,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private isBlankIdentityValue;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
-    private extractResourceIds;
     private getOrderDateKey;
     /**
      * 初始化 OrderDataSource 实例
@@ -175,6 +172,28 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将增量订单合并到 store
      */
     private mergeOrdersToStore;
+    /**
+     * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+     * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+     *
+     * @example
+     * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+     */
+    private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
+    /**
+     * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+     * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+     *
+     * @example
+     * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+     */
+    private registerOrderIdentityKeys;
+    /**
+     * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+     * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+     */
+    private runOrderStoreSelfCheck;
     private normalizeOrderSyncMessage;
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;