@pisell/pisellos 2.2.236 → 2.2.238

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/modules/resource/index.d.ts

@@ -61,6 +61,8 @@ export declare class ResourceModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

package/dist/server/modules/resource/index.js

@@ -428,15 +428,41 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
         bookings: this.getBookingsByResourceId(resource.id)
       });
     }
+  }, {
+    key: "normalizeIntegerIdValue",
+    value: function normalizeIntegerIdValue(value) {
+      if (typeof value !== 'string') return value;
+      var matched = value.match(/^(-?\d+)\.0+$/);
+      if (!matched) return value;
+      return matched[1];
+    }
+  }, {
+    key: "normalizeResourceIdFields",
+    value: function normalizeResourceIdFields(resource) {
+      resource.id = this.normalizeIntegerIdValue(resource.id);
+      if (resource.form_record_id !== undefined) {
+        resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+      }
+      if (resource.form_id !== undefined) {
+        resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+      }
+      if (resource.resource_form_id !== undefined) {
+        resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+      }
+      if (resource.resource_id !== undefined) {
+        resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+      }
+      return resource;
+    }
   }, {
     key: "normalizeResource",
     value: function normalizeResource(resource) {
       var _ref2,
         _resource$id,
         _this7 = this;
-      var normalized = _objectSpread(_objectSpread({}, resource), {}, {
-        id: (_ref2 = (_resource$id = resource === null || resource === void 0 ? void 0 : resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource === null || resource === void 0 ? void 0 : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : ''
-      });
+      var normalized = this.normalizeResourceIdFields(_objectSpread(_objectSpread({}, resource), {}, {
+        id: this.normalizeIntegerIdValue((_ref2 = (_resource$id = resource === null || resource === void 0 ? void 0 : resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource === null || resource === void 0 ? void 0 : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : '')
+      }));
       if (normalized.form_record_id === undefined && normalized.id !== '') {
         normalized.form_record_id = normalized.id;
       }

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

@@ -283,7 +283,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 break;
               }
               console.warn('[BookingTicket] businessCode 缺失，跳过 OpenData 配置加载，当前 module name: ', this.name);
-              return _context2.abrupt("return", null);
+              return _context2.abrupt("return", new Error('businessCode 缺失'));
             case 6:
               lastFetchedAt = this.store.openData.getLastFetchedAt();
               cachedData = this.store.openData.getOpenData();

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/modules/resource/index.d.ts

@@ -61,6 +61,8 @@ export declare class ResourceModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

package/lib/server/modules/resource/index.js

@@ -268,11 +268,35 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
       bookings: this.getBookingsByResourceId(resource.id)
     };
   }
+  normalizeIntegerIdValue(value) {
+    if (typeof value !== "string")
+      return value;
+    const matched = value.match(/^(-?\d+)\.0+$/);
+    if (!matched)
+      return value;
+    return matched[1];
+  }
+  normalizeResourceIdFields(resource) {
+    resource.id = this.normalizeIntegerIdValue(resource.id);
+    if (resource.form_record_id !== void 0) {
+      resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+    }
+    if (resource.form_id !== void 0) {
+      resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+    }
+    if (resource.resource_form_id !== void 0) {
+      resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+    }
+    if (resource.resource_id !== void 0) {
+      resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+    }
+    return resource;
+  }
   normalizeResource(resource) {
-    const normalized = {
+    const normalized = this.normalizeResourceIdFields({
       ...resource,
-      id: (resource == null ? void 0 : resource.id) ?? (resource == null ? void 0 : resource.form_record_id) ?? ""
-    };
+      id: this.normalizeIntegerIdValue((resource == null ? void 0 : resource.id) ?? (resource == null ? void 0 : resource.form_record_id) ?? "")
+    });
     if (normalized.form_record_id === void 0 && normalized.id !== "") {
       normalized.form_record_id = normalized.id;
     }

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

@@ -192,7 +192,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const businessCode = this.getBookingTicketBusinessCode();
     if (!businessCode) {
       console.warn("[BookingTicket] businessCode 缺失，跳过 OpenData 配置加载，当前 module name: ", this.name);
-      return null;
+      return new Error("businessCode 缺失");
     }
     const lastFetchedAt = this.store.openData.getLastFetchedAt();
     const cachedData = this.store.openData.getOpenData();

package/package.json

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