@pisell/pisellos 2.3.11 → 2.3.12

package/dist/server/index.js

@@ -1029,7 +1029,8 @@ var Server = /*#__PURE__*/function () {
                 checkoutData: checkoutData,
                 order: printableOrder,
                 response: null,
-                requireFullyPaid: false
+                requireFullyPaid: false,
+                isManualPrint: true
               });
             case 27:
               printResult = _context16.sent;
@@ -4235,7 +4236,7 @@ var Server = /*#__PURE__*/function () {
                 action: 'print_all',
                 device_id: (_params$deviceId = params.deviceId) !== null && _params$deviceId !== void 0 ? _params$deviceId : deviceId,
                 payload: {
-                  type: '99',
+                  type: params.isManualPrint ? '0' : '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,
@@ -4331,7 +4332,8 @@ var Server = /*#__PURE__*/function () {
                 checkoutData: params.checkoutData,
                 syncedOrder: printableOrder,
                 response: params.response,
-                receiptOnly: true
+                receiptOnly: true,
+                isManualPrint: params.isManualPrint
               });
             case 10:
               return _context46.abrupt("return", {

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -2600,7 +2600,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handlePrintWristband",
     value: function () {
       var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        var deviceTask, deviceId;
+        var deviceTask, deviceId, idempotencyKey;
         return _regeneratorRuntime().wrap(function _callee32$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
@@ -2622,8 +2622,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return this.getShortNumberOrDeviceId();
             case 6:
               deviceId = _context32.sent;
+              idempotencyKey = createUuidV4();
               deviceTask.dispatch({
-                action: 'print_v1',
+                action: 'print_all',
                 device_id: deviceId,
                 payload: {
                   type: 'WRISTBAND',
@@ -2632,13 +2633,13 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                     voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
                   }
                 },
-                idempotency_key: createUuidV4(),
+                idempotency_key: idempotencyKey,
                 name: 'PRINT_V1',
-                source: 'server',
-                source_type: 'order',
-                source_id: createUuidV4()
+                source: 'bookingTicket',
+                source_type: 'handlePrintWristband',
+                source_id: idempotencyKey
               });
-            case 8:
+            case 9:
             case "end":
               return _context32.stop();
           }
@@ -2656,10 +2657,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
+              // 优先修改 tempOrder 中 vouchers 的是否 checkIn 字段（需要同步数据库）
+              // 然后触发 checkIn 接口
+              this.request.post('/shop/machinecode/batch-metadata', {
+                voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+              });
+            case 1:
             case "end":
               return _context33.stop();
           }
-        }, _callee33);
+        }, _callee33, this);
       }));
       function handleCheckIn(_x24) {
         return _handleCheckIn.apply(this, arguments);

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

@@ -0,0 +1,49 @@
+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/server/index.js

@@ -639,7 +639,8 @@ var Server = class {
           checkoutData,
           order: printableOrder,
           response: null,
-          requireFullyPaid: false
+          requireFullyPaid: false,
+          isManualPrint: true
         });
         return {
           code: 200,
@@ -2656,7 +2657,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 +2713,8 @@ var Server = class {
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,
       response: params.response,
-      receiptOnly: true
+      receiptOnly: true,
+      isManualPrint: params.isManualPrint
     });
     return { printed: true, order: printableOrder };
   }

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -1525,8 +1525,9 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       return;
     }
     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",
@@ -1535,15 +1536,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
           voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
         }
       },
-      idempotency_key: (0, import_utils.createUuidV4)(),
+      idempotency_key: idempotencyKey,
       name: "PRINT_V1",
-      source: "server",
-      source_type: "order",
-      source_id: (0, import_utils.createUuidV4)()
+      source: "bookingTicket",
+      source_type: "handlePrintWristband",
+      source_id: idempotencyKey
     });
   }
   // 触发 checkIn
   async handleCheckIn(params) {
+    this.request.post("/shop/machinecode/batch-metadata", {
+      voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+    });
   }
   /**
    * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），

package/package.json

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