@pisell/pisellos 2.2.182 → 2.2.183

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.d.ts

@@ -264,7 +264,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -3215,34 +3215,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(record, options) {
-        var raw, defaults, nextTempOrder, TEMP_ORDER_KEYS;
+        var raw, nextTempOrder;
         return _regeneratorRuntime().wrap(function _callee31$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              defaults = this.createDefaultTempOrderInstance();
-              nextTempOrder = _objectSpread({}, defaults);
-              TEMP_ORDER_KEYS = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'customer', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'buzzer', 'delivery_type', 'table_number', 'schedule_date', 'created_at', 'request_unique_idempotency_token'];
-              TEMP_ORDER_KEYS.forEach(function (key) {
-                if (raw[key] !== undefined) {
-                  nextTempOrder[key] = raw[key];
-                }
-              });
+              nextTempOrder = this.normalizeTempOrderForRuntime(raw);
               this.store.tempOrder = nextTempOrder;
               this.store.summary = raw.summary && _typeof(raw.summary) === 'object' ? _objectSpread(_objectSpread({}, createEmptySummary()), raw.summary) : createEmptySummary();
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context33.next = 11;
+                _context33.next = 8;
                 break;
               }
-              _context33.next = 11;
+              _context33.next = 8;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 11:
+            case 8:
               this.persistTempOrder();
               return _context33.abrupt("return", nextTempOrder);
-            case 13:
+            case 10:
             case "end":
               return _context33.stop();
           }
@@ -3303,6 +3296,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
         this.ensureExternalSaleNumber(nextTempOrder);
       }
+      nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
   }, {

package/dist/solution/BaseSales/index.js

@@ -606,102 +606,103 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderIdOrParams
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
+              debugger;
               if (params.forceRemote) {
-                _context5.next = 35;
+                _context5.next = 36;
                 break;
               }
               if (!(params.orderId !== undefined)) {
-                _context5.next = 11;
+                _context5.next = 12;
                 break;
               }
-              _context5.next = 8;
+              _context5.next = 9;
               return this.store.order.getLocalOrderByOrderId(params.orderId);
-            case 8:
+            case 9:
               _context5.t0 = _context5.sent;
-              _context5.next = 26;
+              _context5.next = 27;
               break;
-            case 11:
+            case 12:
               if (!externalSaleNumber) {
-                _context5.next = 17;
+                _context5.next = 18;
                 break;
               }
-              _context5.next = 14;
+              _context5.next = 15;
               return this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber);
-            case 14:
+            case 15:
               _context5.t1 = _context5.sent;
-              _context5.next = 25;
+              _context5.next = 26;
               break;
-            case 17:
+            case 18:
               if (!params.orderNumber) {
-                _context5.next = 23;
+                _context5.next = 24;
                 break;
               }
-              _context5.next = 20;
+              _context5.next = 21;
               return this.store.order.getLocalOrderByOrderNumber(params.orderNumber);
-            case 20:
+            case 21:
               _context5.t2 = _context5.sent;
-              _context5.next = 24;
+              _context5.next = 25;
               break;
-            case 23:
-              _context5.t2 = null;
             case 24:
-              _context5.t1 = _context5.t2;
+              _context5.t2 = null;
             case 25:
-              _context5.t0 = _context5.t1;
+              _context5.t1 = _context5.t2;
             case 26:
+              _context5.t0 = _context5.t1;
+            case 27:
               localRecord = _context5.t0;
               if (!localRecord) {
-                _context5.next = 35;
+                _context5.next = 36;
                 break;
               }
-              _context5.next = 30;
+              _context5.next = 31;
               return this.store.order.hydrateTempOrderFromRecord(localRecord, {
                 recalcOnHydrate: false
               });
-            case 30:
+            case 31:
               _sales = _context5.sent;
               this.currentSalesDetail = _sales;
-              _context5.next = 34;
+              _context5.next = 35;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: _sales
               });
-            case 34:
-              return _context5.abrupt("return", _sales);
             case 35:
+              return _context5.abrupt("return", _sales);
+            case 36:
               if (!(params.orderId === undefined || params.orderId === null)) {
-                _context5.next = 37;
+                _context5.next = 38;
                 break;
               }
               throw new Error('加载销售详情需要 orderId，或本地库中存在对应 externalSaleNumber/orderNumber');
-            case 37:
-              _context5.next = 39;
+            case 38:
+              _context5.next = 40;
               return this.store.order.getOrderInfoByRemote(Number(params.orderId));
-            case 39:
+            case 40:
               res = _context5.sent;
               if (!(!res || res.code !== 200)) {
-                _context5.next = 43;
+                _context5.next = 44;
                 break;
               }
               message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(params.orderId);
               throw new Error(message);
-            case 43:
-              _context5.next = 45;
+            case 44:
+              _context5.next = 46;
               return this.store.order.hydrateTempOrderFromRecord(res.data, {
                 recalcOnHydrate: false
               });
-            case 45:
+            case 46:
               sales = _context5.sent;
-              _context5.next = 48;
+              _context5.next = 49;
               return this.store.order.saveDraft();
-            case 48:
+            case 49:
               this.currentSalesDetail = sales;
-              _context5.next = 51;
+              _context5.next = 52;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: sales
               });
-            case 51:
-              return _context5.abrupt("return", sales);
             case 52:
+              return _context5.abrupt("return", sales);
+            case 53:
             case "end":
               return _context5.stop();
           }

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

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

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.d.ts

@@ -264,7 +264,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -2254,54 +2254,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async hydrateTempOrderFromRecord(record, options) {
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
-    const defaults = this.createDefaultTempOrderInstance();
-    const nextTempOrder = {
-      ...defaults
-    };
-    const TEMP_ORDER_KEYS = [
-      "order_id",
-      "external_sale_number",
-      "order_number",
-      "shop_order_number",
-      "shop_full_order_number",
-      "type",
-      "business_code",
-      "platform",
-      "sales_channel",
-      "order_sales_channel",
-      "vouchers",
-      "status",
-      "payment_status",
-      "shipping_status",
-      "customer_id",
-      "customer_name",
-      "country_calling_code",
-      "phone",
-      "email",
-      "customer",
-      "is_price_include_tax",
-      "tax_title",
-      "tax_country_code",
-      "currency_code",
-      "currency_symbol",
-      "currency_format",
-      "is_deposit",
-      "deposit_amount",
-      "shop_discount",
-      "surcharge_fee",
-      "note",
-      "buzzer",
-      "delivery_type",
-      "table_number",
-      "schedule_date",
-      "created_at",
-      "request_unique_idempotency_token"
-    ];
-    TEMP_ORDER_KEYS.forEach((key) => {
-      if (raw[key] !== void 0) {
-        nextTempOrder[key] = raw[key];
-      }
-    });
+    const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
     this.store.tempOrder = nextTempOrder;
     this.store.summary = raw.summary && typeof raw.summary === "object" ? { ...(0, import_utils.createEmptySummary)(), ...raw.summary } : (0, import_utils.createEmptySummary)();
     this.store.lastOrderInfo = raw.lastOrderInfo || raw;
@@ -2349,6 +2302,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if ((options == null ? void 0 : options.ensureIdentity) !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
+    nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
   normalizeHydratedOrderProduct(product) {

package/lib/solution/BaseSales/index.js

@@ -430,6 +430,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
     const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
+    debugger;
     if (!params.forceRemote) {
       const localRecord = params.orderId !== void 0 ? await this.store.order.getLocalOrderByOrderId(params.orderId) : externalSaleNumber ? await this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber) : params.orderNumber ? await this.store.order.getLocalOrderByOrderNumber(params.orderNumber) : null;
       if (localRecord) {

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

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

package/package.json

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