@pisell/pisellos 2.3.10 → 2.3.12

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -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,10 +4236,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: 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
+                    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 +4252,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
@@ -4329,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/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

@@ -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 客户状态
@@ -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,92 @@ 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, idempotencyKey;
+        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;
+              idempotencyKey = createUuidV4();
+              deviceTask.dispatch({
+                action: 'print_all',
+                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: idempotencyKey,
+                name: 'PRINT_V1',
+                source: 'bookingTicket',
+                source_type: 'handlePrintWristband',
+                source_id: idempotencyKey
+              });
+            case 9:
+            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:
+              // 优先修改 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, this);
+      }));
+      function handleCheckIn(_x24) {
+        return _handleCheckIn.apply(this, arguments);
+      }
+      return handleCheckIn;
+    }()
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
@@ -2593,12 +2680,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 +2696,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/dist/solution/Sales/index.js

@@ -896,7 +896,6 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
               });
-              debugger;
               unpaidBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
@@ -941,7 +940,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 completedBookings: completedBookings,
                 unpaidBookings: unpaidBookings
               }));
-            case 29:
+            case 28:
             case "end":
               return _context6.stop();
           }

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

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

@@ -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 客户状态
@@ -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,49 @@ 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();
+    const idempotencyKey = (0, import_utils.createUuidV4)();
+    deviceTask.dispatch({
+      action: "print_all",
+      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: idempotencyKey,
+      name: "PRINT_V1",
+      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()），
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/lib/solution/Sales/index.js

@@ -631,7 +631,6 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
-    debugger;
     const unpaidBookingList = matchedBookingList.filter(
       (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
     );

package/package.json

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