@pisell/pisellos 2.2.289 → 2.2.290

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, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/Order/index.d.ts

@@ -512,7 +512,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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/server/index.js

@@ -5358,29 +5358,33 @@ var Server = /*#__PURE__*/function () {
       if (!Array.isArray(bookings)) return '';
       var values = [];
       var seen = new Set();
-      var visitResource = function visitResource(resource) {
-        var identifier = _this13.getCheckoutResourceIdentifier(resource);
+      var visitResource = function visitResource(resource, fallbackName) {
+        var identifier = _this13.getCheckoutResourceIdentifier(resource, fallbackName);
         if (identifier && !seen.has(identifier)) {
           seen.add(identifier);
           values.push(identifier);
         }
         if (Array.isArray(resource === null || resource === void 0 ? void 0 : resource.children)) {
-          resource.children.forEach(visitResource);
+          resource.children.forEach(function (child) {
+            return visitResource(child);
+          });
         }
       };
       bookings.forEach(function (booking) {
         if (Array.isArray(booking === null || booking === void 0 ? void 0 : booking.resources)) {
-          booking.resources.forEach(visitResource);
+          booking.resources.forEach(function (resource, index) {
+            visitResource(resource, index === 0 ? booking === null || booking === void 0 ? void 0 : booking.relation_form_name : undefined);
+          });
         }
       });
       return values.join(',');
     }
   }, {
     key: "getCheckoutResourceIdentifier",
-    value: function getCheckoutResourceIdentifier(resource) {
+    value: function getCheckoutResourceIdentifier(resource, fallbackName) {
       var _resource$metadata, _resource$metadata2;
       if (!resource || _typeof(resource) !== 'object') return '';
-      var candidates = [resource.main_field, resource.name, resource.title, (_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.resource_name, (_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.name, resource.relation_id, resource.id];
+      var candidates = [resource.main_field, resource.name, resource.title, (_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.resource_name, (_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.name, fallbackName, resource.relation_id, resource.id];
       for (var _i2 = 0, _candidates = candidates; _i2 < _candidates.length; _i2++) {
         var candidate = _candidates[_i2];
         var value = this.stringifyCheckoutResourceIdentifier(candidate);

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -334,7 +334,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/modules/Order/index.d.ts

@@ -512,7 +512,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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/server/index.js

@@ -3383,26 +3383,28 @@ class Server {
     if (!Array.isArray(bookings)) return '';
     const values = [];
     const seen = new Set();
-    const visitResource = resource => {
-      const identifier = this.getCheckoutResourceIdentifier(resource);
+    const visitResource = (resource, fallbackName) => {
+      const identifier = this.getCheckoutResourceIdentifier(resource, fallbackName);
       if (identifier && !seen.has(identifier)) {
         seen.add(identifier);
         values.push(identifier);
       }
       if (Array.isArray(resource?.children)) {
-        resource.children.forEach(visitResource);
+        resource.children.forEach(child => visitResource(child));
       }
     };
     bookings.forEach(booking => {
       if (Array.isArray(booking?.resources)) {
-        booking.resources.forEach(visitResource);
+        booking.resources.forEach((resource, index) => {
+          visitResource(resource, index === 0 ? booking?.relation_form_name : undefined);
+        });
       }
     });
     return values.join(',');
   }
-  getCheckoutResourceIdentifier(resource) {
+  getCheckoutResourceIdentifier(resource, fallbackName) {
     if (!resource || typeof resource !== 'object') return '';
-    const candidates = [resource.main_field, resource.name, resource.title, resource.metadata?.resource_name, resource.metadata?.name, resource.relation_id, resource.id];
+    const candidates = [resource.main_field, resource.name, resource.title, resource.metadata?.resource_name, resource.metadata?.name, fallbackName, resource.relation_id, resource.id];
     for (const candidate of candidates) {
       const value = this.stringifyCheckoutResourceIdentifier(candidate);
       if (value) return value;

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -334,7 +334,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/package.json

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