@pisell/pisellos 2.3.11 → 2.3.13

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/dist/solution/BookingTicket/index.js

@@ -2600,7 +2600,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handlePrintWristband",
     value: function () {
       var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        var deviceTask, deviceId;
+        var _this$getOrderIdentit;
+        var deviceTask, deviceId, idempotencyKey;
         return _regeneratorRuntime().wrap(function _callee32$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
@@ -2618,27 +2619,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               });
               return _context32.abrupt("return");
             case 4:
-              _context32.next = 6;
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handlePrintWristband',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                }
+              });
+              _context32.next = 7;
               return this.getShortNumberOrDeviceId();
-            case 6:
+            case 7:
               deviceId = _context32.sent;
+              idempotencyKey = createUuidV4();
               deviceTask.dispatch({
-                action: 'print_v1',
+                action: 'print_all',
                 device_id: deviceId,
                 payload: {
                   type: 'WRISTBAND',
                   data: {
-                    order_id: this.getOrderIdentity(),
+                    order_id: (_this$getOrderIdentit = this.getOrderIdentity()) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.orderId,
                     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()
+                idempotency_key: idempotencyKey,
+                name: 'PRINT_WRISTBAND',
+                source: 'bookingTicket',
+                source_type: 'handlePrintWristband',
+                source_id: idempotencyKey
               });
-            case 8:
+            case 10:
             case "end":
               return _context32.stop();
           }
@@ -2653,13 +2662,79 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleCheckIn",
     value: function () {
       var _handleCheckIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+        var _this$store$order5, _this$store$order5$ge, _this$store$order6, _ref20, _tempOrder$order_id2;
+        var voucherIds, voucherIdSet, tempOrder, vouchers, batchMetadata, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handleCheckIn',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids],
+                  is_checkin: params.is_checkin
+                }
+              });
+              voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
+              voucherIdSet = new Set(voucherIds);
+              tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getTempOrder) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getVouchers()) || [];
+              batchMetadata = [];
+              hasUpdatedVoucher = false;
+              nextVouchers = vouchers.map(function (voucher) {
+                var _voucher$metadata;
+                if (!voucherIdSet.has(voucher.voucher_id)) return voucher;
+                hasUpdatedVoucher = true;
+                var metadata = _objectSpread(_objectSpread({}, voucher.metadata || {}), {}, {
+                  ticket: _objectSpread(_objectSpread({}, ((_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.ticket) || {}), {}, {
+                    is_checkin: params.is_checkin
+                  })
+                });
+                batchMetadata.push({
+                  voucher_id: voucher.voucher_id,
+                  metadata: metadata
+                });
+                return _objectSpread(_objectSpread({}, voucher), {}, {
+                  metadata: metadata
+                });
+              });
+              if (!(tempOrder && hasUpdatedVoucher)) {
+                _context33.next = 11;
+                break;
+              }
+              _context33.next = 11;
+              return this.replaceTempOrder(_objectSpread(_objectSpread({}, tempOrder), {}, {
+                vouchers: nextVouchers
+              }));
+            case 11:
+              if (!(batchMetadata.length === 0)) {
+                _context33.next = 13;
+                break;
+              }
+              return _context33.abrupt("return", {
+                code: 200,
+                status: true,
+                message: '',
+                data: []
+              });
+            case 13:
+              identity = this.getOrderIdentity();
+              externalSaleNumber = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) || undefined;
+              orderId = (_ref20 = (_tempOrder$order_id2 = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _ref20 !== void 0 ? _ref20 : undefined;
+              orderLookup = externalSaleNumber || orderId || (identity === null || identity === void 0 ? void 0 : identity.orderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopOrderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopFullOrderNumber) || undefined;
+              return _context33.abrupt("return", this.request.post('/machinecode/batch-metadata', {
+                data: batchMetadata,
+                order_lookup: orderLookup,
+                order_id: orderId,
+                external_sale_number: externalSaleNumber
+              }, {
+                osServer: true
+              }));
+            case 18:
             case "end":
               return _context33.stop();
           }
-        }, _callee33);
+        }, _callee33, this);
       }));
       function handleCheckIn(_x24) {
         return _handleCheckIn.apply(this, arguments);

package/lib/modules/Order/index.d.ts

@@ -524,5 +524,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
+    getVouchers(): any[];
 }
 export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';

package/lib/modules/Order/index.js

@@ -4176,6 +4176,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return res;
   }
+  getVouchers() {
+    var _a;
+    return ((_a = this.store.tempOrder) == null ? void 0 : _a.vouchers) || [];
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/server/index.d.ts

@@ -431,6 +431,9 @@ declare class Server {
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
+    private handleMachinecodeBatchMetadata;
+    private resolveMachinecodeBatchMetadataLookup;
+    private syncMachinecodeBatchMetadataToLocalOrder;
     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,86 @@ var Server = class {
         };
       }
     };
+    this.handleMachinecodeBatchMetadata = async ({ data }) => {
+      var _a, _b;
+      const title = "handleMachinecodeBatchMetadata";
+      const backendPath = "/shop/machinecode/batch-metadata";
+      const batchMetadata = Array.isArray(data == null ? void 0 : data.data) ? data.data : [];
+      this.logInfo(`${title}: 开始处理`, {
+        backendPath,
+        batchSize: batchMetadata.length,
+        order_lookup: this.resolveMachinecodeBatchMetadataLookup(data) ?? null
+      });
+      if (batchMetadata.length === 0) {
+        return {
+          code: 200,
+          status: true,
+          message: "",
+          data: []
+        };
+      }
+      try {
+        await this.syncMachinecodeBatchMetadataToLocalOrder(data, batchMetadata);
+      } catch (error) {
+        const message = this.getUnknownErrorMessage(error);
+        this.logError(`${title}: 本地订单 metadata 更新失败`, {
+          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, {
+          data: batchMetadata
+        }, {
+          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);
@@ -1743,6 +1824,16 @@ var Server = class {
         method: "post",
         path: "/shop/local/print-order",
         handler: this.handleLocalPrintOrder.bind(this)
+      },
+      {
+        method: "post",
+        path: "/shop/machinecode/batch-metadata",
+        handler: this.handleMachinecodeBatchMetadata.bind(this)
+      },
+      {
+        method: "post",
+        path: "/machinecode/batch-metadata",
+        handler: this.handleMachinecodeBatchMetadata.bind(this)
       }
     ]);
     this.registerPrefixRoutes([
@@ -2656,7 +2747,7 @@ var Server = class {
         action: "print_all",
         device_id: params.deviceId ?? deviceId,
         payload: {
-          type: "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,
@@ -2712,7 +2803,8 @@ var Server = class {
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,
       response: params.response,
-      receiptOnly: true
+      receiptOnly: true,
+      isManualPrint: params.isManualPrint
     });
     return { printed: true, order: printableOrder };
   }
@@ -2730,6 +2822,107 @@ 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 syncMachinecodeBatchMetadataToLocalOrder(data, batchMetadata) {
+    var _a;
+    const title = "handleMachinecodeBatchMetadata";
+    const lookup = this.resolveMachinecodeBatchMetadataLookup(data);
+    if (lookup === void 0) {
+      this.logWarning(`${title}: order lookup 缺失，跳过本地订单 metadata 更新`, {
+        batchSize: batchMetadata.length
+      });
+      return;
+    }
+    if (!((_a = this.order) == null ? void 0 : _a.getLocalOrderByLookup)) {
+      this.logWarning(`${title}: Order 模块未注册，跳过本地订单 metadata 更新`, {
+        lookup
+      });
+      return;
+    }
+    const localOrder = await this.order.getLocalOrderByLookup(lookup);
+    if (!localOrder) {
+      this.logWarning(`${title}: 本地订单不存在，跳过 metadata 更新`, {
+        lookup
+      });
+      return;
+    }
+    const metadataByVoucherId = /* @__PURE__ */ new Map();
+    for (const item of batchMetadata) {
+      const voucherId = (item == null ? void 0 : item.voucher_id) ?? (item == null ? void 0 : item.voucherId);
+      if (voucherId === void 0 || voucherId === null || voucherId === "")
+        continue;
+      metadataByVoucherId.set(String(voucherId), (item == null ? void 0 : item.metadata) || {});
+    }
+    if (metadataByVoucherId.size === 0) {
+      this.logWarning(`${title}: voucher metadata 缺失，跳过本地订单 metadata 更新`, {
+        lookup
+      });
+      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;
+      const metadata = metadataByVoucherId.get(String(voucherId));
+      if (!metadata)
+        return voucher;
+      hasUpdatedVoucher = true;
+      return {
+        ...voucher,
+        metadata
+      };
+    });
+    if (!hasUpdatedVoucher) {
+      this.logWarning(`${title}: 本地订单未命中任何 voucher，跳过 metadata 更新`, {
+        lookup,
+        voucher_ids: Array.from(metadataByVoucherId.keys())
+      });
+      return;
+    }
+    if (typeof this.order.overwriteExistingOrder === "function") {
+      await this.order.overwriteExistingOrder({
+        ...localOrder,
+        vouchers: nextVouchers
+      });
+      this.logInfo(`${title}: 本地订单 vouchers metadata 已更新`, {
+        lookup,
+        updatedCount: metadataByVoucherId.size
+      });
+      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 metadata 已更新`, {
+        lookup,
+        updatedCount: metadataByVoucherId.size
+      });
+      return;
+    }
+    this.logWarning(`${title}: Order 模块不支持本地订单覆盖，跳过 metadata 更新`, {
+      lookup
+    });
+  }
   async handleOrderCheckoutSubmit(params) {
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/lib/solution/BookingTicket/index.js

@@ -1513,6 +1513,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   // 打印手环，单个或批量都可以
   async handlePrintWristband(params) {
+    var _a;
     const deviceTask = this.getDeviceTaskPlugin();
     if (!(deviceTask == null ? void 0 : deviceTask.dispatch)) {
       this.logger.addLog({
@@ -1524,26 +1525,96 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       });
       return;
     }
+    this.logger.addLog({
+      type: "info",
+      title: "[BookingTicket] handlePrintWristband",
+      metadata: {
+        voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+      }
+    });
     const deviceId = await this.getShortNumberOrDeviceId();
+    const idempotencyKey = (0, import_utils.createUuidV4)();
     deviceTask.dispatch({
-      action: "print_v1",
+      action: "print_all",
       device_id: deviceId,
       payload: {
         type: "WRISTBAND",
         data: {
-          order_id: this.getOrderIdentity(),
+          order_id: (_a = this.getOrderIdentity()) == null ? void 0 : _a.orderId,
           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)()
+      idempotency_key: idempotencyKey,
+      name: "PRINT_WRISTBAND",
+      source: "bookingTicket",
+      source_type: "handlePrintWristband",
+      source_id: idempotencyKey
     });
   }
   // 触发 checkIn
   async handleCheckIn(params) {
+    var _a, _b, _c;
+    this.logger.addLog({
+      type: "info",
+      title: "[BookingTicket] handleCheckIn",
+      metadata: {
+        voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids],
+        is_checkin: params.is_checkin
+      }
+    });
+    const voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
+    const voucherIdSet = new Set(voucherIds);
+    const tempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
+    const vouchers = (tempOrder == null ? void 0 : tempOrder.vouchers) || ((_c = this.store.order) == null ? void 0 : _c.getVouchers()) || [];
+    const batchMetadata = [];
+    let hasUpdatedVoucher = false;
+    const nextVouchers = vouchers.map((voucher) => {
+      var _a2;
+      if (!voucherIdSet.has(voucher.voucher_id))
+        return voucher;
+      hasUpdatedVoucher = true;
+      const metadata = {
+        ...voucher.metadata || {},
+        ticket: {
+          ...((_a2 = voucher.metadata) == null ? void 0 : _a2.ticket) || {},
+          is_checkin: params.is_checkin
+        }
+      };
+      batchMetadata.push({
+        voucher_id: voucher.voucher_id,
+        metadata
+      });
+      return {
+        ...voucher,
+        metadata
+      };
+    });
+    if (tempOrder && hasUpdatedVoucher) {
+      await this.replaceTempOrder({
+        ...tempOrder,
+        vouchers: nextVouchers
+      });
+    }
+    if (batchMetadata.length === 0) {
+      return {
+        code: 200,
+        status: true,
+        message: "",
+        data: []
+      };
+    }
+    const identity = this.getOrderIdentity();
+    const externalSaleNumber = (tempOrder == null ? void 0 : tempOrder.external_sale_number) || (identity == null ? void 0 : identity.externalSaleNumber) || void 0;
+    const orderId = (tempOrder == null ? void 0 : tempOrder.order_id) ?? (identity == null ? void 0 : identity.orderId) ?? void 0;
+    const orderLookup = externalSaleNumber || orderId || (identity == null ? void 0 : identity.orderNumber) || (identity == null ? void 0 : identity.shopOrderNumber) || (identity == null ? void 0 : identity.shopFullOrderNumber) || void 0;
+    return this.request.post("/machinecode/batch-metadata", {
+      data: batchMetadata,
+      order_lookup: orderLookup,
+      order_id: orderId,
+      external_sale_number: externalSaleNumber
+    }, {
+      osServer: true
+    });
   }
   /**
    * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），

package/package.json

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