@pisell/pisellos 2.3.9 → 2.3.11

package/dist/modules/Order/index.js

@@ -4640,7 +4640,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
                 result: result,
-                tempOrder: tempOrder
+                tempOrder: _objectSpread(_objectSpread({}, tempOrder), {}, {
+                  _extend: undefined
+                })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
                 _context32.next = 56;

package/dist/server/index.js

@@ -4235,10 +4235,12 @@ var Server = /*#__PURE__*/function () {
                 action: 'print_all',
                 device_id: (_params$deviceId = params.deviceId) !== null && _params$deviceId !== void 0 ? _params$deviceId : deviceId,
                 payload: {
-                  type: params.receiptOnly ? '0' : '99',
+                  type: '99',
                   data: params.receiptOnly ? {
                     order_id: printIdentity,
-                    small_ticket_data: (_params$syncedOrder = params.syncedOrder) === null || _params$syncedOrder === void 0 || (_params$syncedOrder = _params$syncedOrder.payment_info) === null || _params$syncedOrder === void 0 ? void 0 : _params$syncedOrder.small_ticket_data
+                    small_ticket_data: (_params$syncedOrder = params.syncedOrder) === null || _params$syncedOrder === void 0 || (_params$syncedOrder = _params$syncedOrder.payment_info) === null || _params$syncedOrder === void 0 ? void 0 : _params$syncedOrder.small_ticket_data,
+                    skip_wristband: true,
+                    skip_voucher: true
                   } : {
                     order_id: printIdentity,
                     machine_code_print_info: (_params$syncedOrder2 = params.syncedOrder) === null || _params$syncedOrder2 === void 0 || (_params$syncedOrder2 = _params$syncedOrder2.payment_info) === null || _params$syncedOrder2 === void 0 ? void 0 : _params$syncedOrder2.machine_code_print_info,
@@ -4249,7 +4251,7 @@ var Server = /*#__PURE__*/function () {
                 idempotency_key: this.buildPrintOtherReceiptIdempotencyKey(params.syncedOrder, {
                   receiptOnly: params.receiptOnly
                 }),
-                name: '打印转发',
+                name: 'PRINT_V1',
                 source: 'server',
                 source_type: 'order',
                 source_id: printIdentity

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

@@ -180,6 +180,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
      */
     private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

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

@@ -1607,7 +1607,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeOrdersToStore",
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        var storeOrderCountBefore, normalizedFreshOrders, _iterator9, _step9, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator10, _step10, key, _iterator11, _step11, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, mergedOrder, insertIndex, insertCount, updateCount;
+        var storeOrderCountBefore, normalizedFreshOrders, _iterator9, _step9, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator10, _step10, key, _iterator11, _step11, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, mergedOrder, insertIndex, insertCount, updateCount;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1680,7 +1680,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _iterator11.s();
             case 33:
               if ((_step11 = _iterator11.n()).done) {
-                _context16.next = 53;
+                _context16.next = 57;
                 break;
               }
               fresh = _step11.value;
@@ -1689,38 +1689,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context16.next = 46;
+                _context16.next = 50;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+              existingOrder = updatedList[matchIndex];
+              if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
+                _context16.next = 44;
+                break;
+              }
+              this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
+                source: source,
+                order_id: (_ref2 = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref2 !== void 0 ? _ref2 : null,
+                external_sale_number: (_ref3 = (_external_sale_number = existingOrder.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
+                local_payment_status: (_existingOrder$paymen = existingOrder.payment_status) !== null && _existingOrder$paymen !== void 0 ? _existingOrder$paymen : null,
+                remote_payment_status: (_fresh$payment_status = fresh.payment_status) !== null && _fresh$payment_status !== void 0 ? _fresh$payment_status : null,
+                local_need_sync: (_existingOrder$need_s = existingOrder.need_sync) !== null && _existingOrder$need_s !== void 0 ? _existingOrder$need_s : null,
+                remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
+                reason: 'protect_pending_sync_order_from_remote_echo'
+              });
+              return _context16.abrupt("continue", 55);
+            case 44:
+              mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               updatedList[matchIndex] = mergedOrder;
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
               // 供同批后续 fresh 命中同一槽位，避免重复插入
               this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context16.abrupt("continue", 51);
-            case 46:
+              return _context16.abrupt("continue", 55);
+            case 50:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
               this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 51:
+            case 55:
               _context16.next = 33;
               break;
-            case 53:
-              _context16.next = 58;
+            case 57:
+              _context16.next = 62;
               break;
-            case 55:
-              _context16.prev = 55;
+            case 59:
+              _context16.prev = 59;
               _context16.t1 = _context16["catch"](31);
               _iterator11.e(_context16.t1);
-            case 58:
-              _context16.prev = 58;
+            case 62:
+              _context16.prev = 62;
               _iterator11.f();
-              return _context16.finish(58);
-            case 61:
+              return _context16.finish(62);
+            case 65:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -1736,22 +1753,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context16.next = 68;
+              _context16.next = 72;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 68:
+            case 72:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context16.next = 71;
+              _context16.next = 75;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 71:
+            case 75:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[5, 17, 20, 23], [31, 55, 58, 61]]);
+        }, _callee16, this, [[5, 17, 20, 23], [31, 59, 62, 65]]);
       }));
       function mergeOrdersToStore(_x9, _x10) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -1786,6 +1803,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return matchIndex;
     }
+  }, {
+    key: "isRemoteEchoMergeSource",
+    value: function isRemoteEchoMergeSource(source) {
+      return source === 'pubsub.bodyUpsert' || source === 'pubsub.httpRefresh';
+    }
 
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
@@ -2166,22 +2188,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator20.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-          group = _ref3[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref4) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref4) {
         var _ref5 = _slicedToArray(_ref4, 2),
-          key = _ref5[0],
           group = _ref5[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          key = _ref7[0],
+          group = _ref7[1];
         return {
           key: key,
           count: group.length,
           orders: group.map(function (order) {
-            var _order$order_id2, _external_sale_number, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            var _order$order_id2, _external_sale_number2, _shop_order_number, _shop_full_order_numb, _order$need_sync;
             return {
               order_id: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
-              external_sale_number: (_external_sale_number = order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : null,
+              external_sale_number: (_external_sale_number2 = order.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : null,
               shop_order_number: (_shop_order_number = order.shop_order_number) !== null && _shop_order_number !== void 0 ? _shop_order_number : null,
               shop_full_order_number: (_shop_full_order_numb = order.shop_full_order_number) !== null && _shop_full_order_numb !== void 0 ? _shop_full_order_numb : null,
               need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null

package/dist/solution/BaseSales/index.d.ts

@@ -30,7 +30,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
-    private logger;
+    protected logger: any;
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;

package/dist/solution/BookingTicket/index.d.ts

@@ -551,6 +551,13 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
+    private getDeviceTaskPlugin;
+    handlePrintWristband(params: {
+        voucher_ids: number[];
+    }): Promise<void>;
+    handleCheckIn(params: {
+        voucher_ids: number[];
+    }): Promise<void>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/dist/solution/BookingTicket/index.js

@@ -49,6 +49,7 @@ import { buildNormalProductCacheItemFromOrderLine as buildNormalProductCacheItem
 import { buildProductOptionStringFromOrderLine } from "../../modules/BookingContext/utils/orderLineDisplay";
 import { applyBookingsStatus, applyChildBookingStatus, resolveScheduleId, resolveStatusAfterTransition, restoreBookingsStatus, restoreChildBookingStatus } from "./utils/bookingStatus";
 import { resolveBestAddTimePlan as _resolveBestAddTimePlan } from "./utils/resolveBestAddTimePlan";
+import { createUuidV4 } from "../../modules/Order/utils";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 
@@ -2586,6 +2587,85 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }
       return setOtherParams;
     }()
+  }, {
+    key: "getDeviceTaskPlugin",
+    value: function getDeviceTaskPlugin() {
+      var _app$getApp;
+      var app = this.core.getPlugin('app');
+      return (app === null || app === void 0 || (_app$getApp = app.getApp()) === null || _app$getApp === void 0 ? void 0 : _app$getApp.getPlugin('deviceTask')) || null;
+    }
+
+    // 打印手环，单个或批量都可以
+  }, {
+    key: "handlePrintWristband",
+    value: function () {
+      var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var deviceTask, deviceId;
+        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
+            case 0:
+              deviceTask = this.getDeviceTaskPlugin();
+              if (deviceTask !== null && deviceTask !== void 0 && deviceTask.dispatch) {
+                _context32.next = 4;
+                break;
+              }
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handlePrintWristband: deviceTask.dispatch 不可用',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                }
+              });
+              return _context32.abrupt("return");
+            case 4:
+              _context32.next = 6;
+              return this.getShortNumberOrDeviceId();
+            case 6:
+              deviceId = _context32.sent;
+              deviceTask.dispatch({
+                action: 'print_v1',
+                device_id: deviceId,
+                payload: {
+                  type: 'WRISTBAND',
+                  data: {
+                    order_id: this.getOrderIdentity(),
+                    voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                  }
+                },
+                idempotency_key: createUuidV4(),
+                name: 'PRINT_V1',
+                source: 'server',
+                source_type: 'order',
+                source_id: createUuidV4()
+              });
+            case 8:
+            case "end":
+              return _context32.stop();
+          }
+        }, _callee32, this);
+      }));
+      function handlePrintWristband(_x23) {
+        return _handlePrintWristband.apply(this, arguments);
+      }
+      return handlePrintWristband;
+    }() // 触发 checkIn
+  }, {
+    key: "handleCheckIn",
+    value: function () {
+      var _handleCheckIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
+            case 0:
+            case "end":
+              return _context33.stop();
+          }
+        }, _callee33);
+      }));
+      function handleCheckIn(_x24) {
+        return _handleCheckIn.apply(this, arguments);
+      }
+      return handleCheckIn;
+    }()
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
@@ -2593,12 +2673,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "destroy",
     value: (function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var _this$scan;
-        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              _context32.next = 2;
+              _context34.next = 2;
               return _get(_getPrototypeOf(BookingTicketImpl.prototype), "destroy", this).call(this);
             case 2:
               try {
@@ -2609,9 +2689,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               scanCache.clear();
             case 4:
             case "end":
-              return _context32.stop();
+              return _context34.stop();
           }
-        }, _callee32, this);
+        }, _callee34, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/Order/index.js

@@ -3454,7 +3454,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("runSubmitTempOrder: 提交成功", {
       submittedOrderId,
       result,
-      tempOrder
+      tempOrder: {
+        ...tempOrder,
+        _extend: void 0
+      }
     });
     if (submittedOrderId !== null && submittedOrderId !== void 0) {
       tempOrder.order_id = submittedOrderId;

package/lib/server/index.js

@@ -2656,10 +2656,12 @@ var Server = class {
         action: "print_all",
         device_id: params.deviceId ?? deviceId,
         payload: {
-          type: params.receiptOnly ? "0" : "99",
+          type: "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 +2672,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

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

@@ -180,6 +180,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
      */
     private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

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

@@ -985,7 +985,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const storageKey = this.getOrderStorageKey(fresh);
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
-        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+        const existingOrder = updatedList[matchIndex];
+        if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
+          this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
+            source,
+            order_id: existingOrder.order_id ?? fresh.order_id ?? null,
+            external_sale_number: existingOrder.external_sale_number ?? fresh.external_sale_number ?? null,
+            local_payment_status: existingOrder.payment_status ?? null,
+            remote_payment_status: fresh.payment_status ?? null,
+            local_need_sync: existingOrder.need_sync ?? null,
+            remote_need_sync: fresh.need_sync ?? null,
+            reason: "protect_pending_sync_order_from_remote_echo"
+          });
+          continue;
+        }
+        const mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
         updatedList[matchIndex] = mergedOrder;
         this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
         patchedOrders.push(mergedOrder);
@@ -1036,6 +1050,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return matchIndex;
   }
+  isRemoteEchoMergeSource(source) {
+    return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
+  }
   /**
    * 将订单的全部身份键登记到索引并指向其在列表中的下标。
    * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

package/lib/solution/BaseSales/index.d.ts

@@ -30,7 +30,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
-    private logger;
+    protected logger: any;
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;

package/lib/solution/BookingTicket/index.d.ts

@@ -551,6 +551,13 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
+    private getDeviceTaskPlugin;
+    handlePrintWristband(params: {
+        voucher_ids: number[];
+    }): Promise<void>;
+    handleCheckIn(params: {
+        voucher_ids: number[];
+    }): Promise<void>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/lib/solution/BookingTicket/index.js

@@ -52,6 +52,7 @@ var import_buildNormalProductCacheItemFromOrderLine = require("../../modules/Boo
 var import_orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDisplay");
 var import_bookingStatus = require("./utils/bookingStatus");
 var import_resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
+var import_utils = require("../../modules/Order/utils");
 __reExport(BookingTicket_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
@@ -1505,6 +1506,45 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       await this.configureIdGeneratorFromOpenData();
     }
   }
+  getDeviceTaskPlugin() {
+    var _a;
+    const app = this.core.getPlugin("app");
+    return ((_a = app == null ? void 0 : app.getApp()) == null ? void 0 : _a.getPlugin("deviceTask")) || null;
+  }
+  // 打印手环，单个或批量都可以
+  async handlePrintWristband(params) {
+    const deviceTask = this.getDeviceTaskPlugin();
+    if (!(deviceTask == null ? void 0 : deviceTask.dispatch)) {
+      this.logger.addLog({
+        type: "info",
+        title: "[BookingTicket] handlePrintWristband: deviceTask.dispatch 不可用",
+        metadata: {
+          voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+        }
+      });
+      return;
+    }
+    const deviceId = await this.getShortNumberOrDeviceId();
+    deviceTask.dispatch({
+      action: "print_v1",
+      device_id: deviceId,
+      payload: {
+        type: "WRISTBAND",
+        data: {
+          order_id: this.getOrderIdentity(),
+          voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+        }
+      },
+      idempotency_key: (0, import_utils.createUuidV4)(),
+      name: "PRINT_V1",
+      source: "server",
+      source_type: "order",
+      source_id: (0, import_utils.createUuidV4)()
+    });
+  }
+  // 触发 checkIn
+  async handleCheckIn(params) {
+  }
   /**
    * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.9",
+  "version": "2.3.11",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",