@pisell/pisellos 2.2.239 → 2.2.240

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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/server/index.js

@@ -947,14 +947,19 @@ var Server = /*#__PURE__*/function () {
               });
             case 5:
               shouldLookup = _this.shouldLookupLocalPrintOrder(inputOrder) || _this.shouldLookupLocalPrintOrder(data);
+              _this.logInfo('handleLocalPrintOrder: 是否需要查找本地订单', {
+                shouldLookup: shouldLookup,
+                inputOrder: inputOrder,
+                data: data
+              });
               lookup = shouldLookup ? (_this$getLocalPrintOr = _this.getLocalPrintOrderLookup(inputOrder)) !== null && _this$getLocalPrintOr !== void 0 ? _this$getLocalPrintOr : _this.getLocalPrintOrderLookup(data) : undefined;
               sourceOrder = inputOrder;
               if (!shouldLookup) {
-                _context16.next = 19;
+                _context16.next = 20;
                 break;
               }
               if (!(lookup === undefined)) {
-                _context16.next = 11;
+                _context16.next = 12;
                 break;
               }
               return _context16.abrupt("return", {
@@ -966,9 +971,9 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 11:
+            case 12:
               if ((_this$order = _this.order) !== null && _this$order !== void 0 && _this$order.getLocalOrderByLookup) {
-                _context16.next = 13;
+                _context16.next = 14;
                 break;
               }
               return _context16.abrupt("return", {
@@ -980,13 +985,13 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 13:
-              _context16.next = 15;
+            case 14:
+              _context16.next = 16;
               return _this.order.getLocalOrderByLookup(lookup);
-            case 15:
+            case 16:
               localOrder = _context16.sent;
               if (localOrder) {
-                _context16.next = 18;
+                _context16.next = 19;
                 break;
               }
               return _context16.abrupt("return", {
@@ -998,29 +1003,33 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 18:
+            case 19:
               sourceOrder = _objectSpread(_objectSpread(_objectSpread({}, localOrder), inputOrder), {}, {
                 order_id: (_ref40 = (_localOrder$order_id = localOrder.order_id) !== null && _localOrder$order_id !== void 0 ? _localOrder$order_id : inputOrder.order_id) !== null && _ref40 !== void 0 ? _ref40 : inputOrder.orderId,
                 external_sale_number: (_ref41 = (_external_sale_number = localOrder.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : inputOrder.external_sale_number) !== null && _ref41 !== void 0 ? _ref41 : inputOrder.externalSaleNumber
               });
-            case 19:
-              _context16.next = 21;
+            case 20:
+              _context16.next = 22;
               return _this.ensureCheckoutOrderNumbers(_objectSpread(_objectSpread({}, sourceOrder), {}, {
                 small_ticket_data_flag: 1
               }), 'handleLocalPrintOrder');
-            case 21:
+            case 22:
               checkoutData = _context16.sent;
               printableOrder = _objectSpread(_objectSpread({}, checkoutData), {}, {
                 need_sync: (_need_sync = checkoutData.need_sync) !== null && _need_sync !== void 0 ? _need_sync : 1
               });
-              _context16.next = 25;
+              _this.logInfo('handleLocalPrintOrder: 本地打印小票，构建触发任务前', {
+                checkoutData: checkoutData,
+                printableOrder: printableOrder
+              });
+              _context16.next = 27;
               return _this.dispatchLocalReceiptPrint({
                 checkoutData: checkoutData,
                 order: printableOrder,
                 response: null,
                 requireFullyPaid: false
               });
-            case 25:
+            case 27:
               printResult = _context16.sent;
               return _context16.abrupt("return", {
                 code: 200,
@@ -1031,8 +1040,8 @@ var Server = /*#__PURE__*/function () {
                   order: printResult.order
                 }
               });
-            case 29:
-              _context16.prev = 29;
+            case 31:
+              _context16.prev = 31;
               _context16.t0 = _context16["catch"](1);
               message = _context16.t0 instanceof Error ? _context16.t0.message : String(_context16.t0);
               _this.logError('handleLocalPrintOrder: 本地打印小票失败', {
@@ -1047,11 +1056,11 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 34:
+            case 36:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, null, [[1, 29]]);
+        }, _callee16, null, [[1, 31]]);
       }));
       return function (_x16) {
         return _ref39.apply(this, arguments);
@@ -4172,11 +4181,12 @@ var Server = /*#__PURE__*/function () {
             case 4:
               _context45.prev = 4;
               printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
-              _context45.next = 8;
+              printIdentity = "".concat(printIdentity, "_").concat(Date.now());
+              _context45.next = 9;
               return this.getShortNumberOrDeviceId();
-            case 8:
+            case 9:
               deviceId = _context45.sent;
-              _context45.next = 11;
+              _context45.next = 12;
               return deviceTask.dispatch({
                 action: 'print_all',
                 device_id: (_params$deviceId = params.deviceId) !== null && _params$deviceId !== void 0 ? _params$deviceId : deviceId,
@@ -4200,20 +4210,20 @@ var Server = /*#__PURE__*/function () {
                 source_type: 'order',
                 source_id: printIdentity
               });
-            case 11:
-              _context45.next = 16;
+            case 12:
+              _context45.next = 17;
               break;
-            case 13:
-              _context45.prev = 13;
+            case 14:
+              _context45.prev = 14;
               _context45.t0 = _context45["catch"](4);
               this.logError('dispatchPrintOtherReceiptTask: 派发失败', {
                 error: _context45.t0 instanceof Error ? _context45.t0.message : String(_context45.t0)
               });
-            case 16:
+            case 17:
             case "end":
               return _context45.stop();
           }
-        }, _callee45, this, [[4, 13]]);
+        }, _callee45, this, [[4, 14]]);
       }));
       function dispatchPrintOtherReceiptTask(_x49) {
         return _dispatchPrintOtherReceiptTask.apply(this, arguments);
@@ -4265,7 +4275,11 @@ var Server = /*#__PURE__*/function () {
                 order: printableOrder
               });
             case 7:
-              debugger;
+              this.logInfo('dispatchLocalReceiptPrint: 构建触发任务前', {
+                checkoutData: params.checkoutData,
+                printableOrder: printableOrder,
+                response: params.response
+              });
               _context46.next = 10;
               return this.dispatchPrintOtherReceiptTask({
                 checkoutData: params.checkoutData,

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/server/index.js

@@ -580,6 +580,11 @@ var Server = class {
           };
         }
         const shouldLookup = this.shouldLookupLocalPrintOrder(inputOrder) || this.shouldLookupLocalPrintOrder(data);
+        this.logInfo("handleLocalPrintOrder: 是否需要查找本地订单", {
+          shouldLookup,
+          inputOrder,
+          data
+        });
         const lookup = shouldLookup ? this.getLocalPrintOrderLookup(inputOrder) ?? this.getLocalPrintOrderLookup(data) : void 0;
         let sourceOrder = inputOrder;
         if (shouldLookup) {
@@ -626,6 +631,10 @@ var Server = class {
           ...checkoutData,
           need_sync: checkoutData.need_sync ?? 1
         };
+        this.logInfo("handleLocalPrintOrder: 本地打印小票，构建触发任务前", {
+          checkoutData,
+          printableOrder
+        });
         const printResult = await this.dispatchLocalReceiptPrint({
           checkoutData,
           order: printableOrder,
@@ -2605,7 +2614,8 @@ var Server = class {
       return;
     }
     try {
-      const printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
+      let printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
+      printIdentity = `${printIdentity}_${Date.now()}`;
       const deviceId = await this.getShortNumberOrDeviceId();
       await deviceTask.dispatch({
         action: "print_all",
@@ -2656,7 +2666,11 @@ var Server = class {
     if (!(0, import_small_ticket.hasSmallTicketData)((_a = printableOrder.payment_info) == null ? void 0 : _a.small_ticket_data)) {
       return { printed: false, order: printableOrder };
     }
-    debugger;
+    this.logInfo("dispatchLocalReceiptPrint: 构建触发任务前", {
+      checkoutData: params.checkoutData,
+      printableOrder,
+      response: params.response
+    });
     await this.dispatchPrintOtherReceiptTask({
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,

package/package.json

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