@pisell/pisellos 0.0.15 → 0.0.17

package/dist/modules/Rules/index.js

@@ -125,7 +125,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (discount_list && discount_list.length > 0) {
           // 检查是否有使用新折扣的情况
           var usedNewDiscount = discount_list.some(function (discount) {
-            return newDiscountIds.includes(discount.resource_id);
+            var _discount$discount;
+            return newDiscountIds.includes(discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id);
           });
           if (usedNewDiscount) {
             hasApplicableDiscount = true;
@@ -207,7 +208,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品
-          if (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
+          if (!(product !== null && product !== void 0 && product.booking_id) && (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id))) {
             var _discountApplicabilit;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -217,9 +218,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             applicableProducts.push({
               amount: product.price,
               type: discount.tag,
-              resource_id: discount.id,
-              title: discount.format_title,
-              original_amount: product.origin_total
+              discount: {
+                resource_id: discount.id,
+                title: discount.format_title,
+                original_amount: product.origin_total
+              }
             });
             discountApplicableProducts.set(discount.id, applicableProducts);
           }

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

@@ -5,6 +5,9 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     init(steps: IStep[]): void;
@@ -16,4 +19,5 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     prevStep(): void;
     nextStep(): void;
     gotoStep(stepIndex: number): void;
+    storeChange(): void;
 }

package/dist/modules/Step/index.js

@@ -26,18 +26,34 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", "step");
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
+    _defineProperty(_assertThisInitialized(_this), "openCache", false);
+    _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
     return _this;
   }
   _createClass(StepModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _options$otherParams, _options$otherParams2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.store = options.store;
-            case 2:
+              if (options.initialState) {
+                this.store.stepList = options.initialState.stepList;
+                this.store.currentStep = options.initialState.currentStep;
+                this.store.currentStepIndex = options.initialState.currentStepIndex;
+              }
+              if ((_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
+                this.openCache = options.otherParams.openCache;
+                this.cacheId = options.otherParams.cacheId;
+              }
+              if ((_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
+                this.fatherModule = options.otherParams.fatherModule;
+              }
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -102,6 +118,18 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
     value: function gotoStep(stepIndex) {
       this.setCurrentStep(stepIndex);
     }
+  }, {
+    key: "storeChange",
+    value: function storeChange() {
+      if (this.openCache) {
+        this.checkSaveCache({
+          cacheId: this.cacheId,
+          fatherModule: this.fatherModule,
+          store: this.store,
+          cacheKey: ['currentStepIndex', 'currentStep', 'stepList']
+        });
+      }
+    }
   }]);
   return StepModule;
 }(BaseModule);

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

@@ -7,7 +7,11 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     protected defaultVersion: string;
     private shopStore;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    storeChange(): void;
 }

package/dist/modules/Summary/index.js

@@ -28,24 +28,38 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
     _defineProperty(_assertThisInitialized(_this), "shopStore", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
+    _defineProperty(_assertThisInitialized(_this), "openCache", false);
+    _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
     return _this;
   }
   _createClass(SummaryModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _options$otherParams, _options$otherParams2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.store = options.store;
               this.shopStore = this.core.getPlugin("shopStore");
+              if (options.initialState) {
+                this.store.summary = options.initialState.summary;
+              }
+              if ((_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
+                this.openCache = options.otherParams.openCache;
+                this.cacheId = options.otherParams.cacheId;
+              }
+              if ((_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
+                this.fatherModule = options.otherParams.fatherModule;
+              }
               if (this.shopStore) {
-                _context.next = 5;
+                _context.next = 8;
                 break;
               }
               throw new Error("SummaryModule 需要 shopStore 插件支持");
-            case 5:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -80,6 +94,18 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return getSummary;
     }()
+  }, {
+    key: "storeChange",
+    value: function storeChange() {
+      if (this.openCache) {
+        this.checkSaveCache({
+          cacheId: this.cacheId,
+          fatherModule: this.fatherModule,
+          store: this.store,
+          cacheKey: ['summary']
+        });
+      }
+    }
   }]);
   return SummaryModule;
 }(BaseModule);

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

@@ -38,8 +38,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getActiveAccount(): Account | null;
     removeAccount(id: string): void;
     setDateRange(dateRange: ITime[]): Promise<void>;
-    getRangeDate(): Promise<string>;
-    getCart(): Promise<CartItem[]>;
+    clearDateRange(): void;
+    getDateRange(): Promise<ITime[]>;
+    getCart(): CartItem[];
     getAvailableDate(params?: {
         products?: ProductData[];
         startDate?: string;
@@ -79,6 +80,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     deleteCartItemInfo(types: "resource" | "time"): void;
     destory(): void;
     getResourcesList(): any[];
+    getResourcesListByCartItem(id: string | number): {
+        id: number | undefined;
+        _id: string;
+        product: ProductData | undefined;
+        resources: import("./utils/resources").ResourceItem[];
+        holder_id: string | number | undefined;
+        holder_name: string | undefined;
+    } | undefined;
     getResourceTimeSlot({ product, resources, currentResourceId, }: {
         product: ProductData;
         resources: any[];
@@ -111,4 +120,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     getTimeSlotByAllResources(resources_code: string): any[];
     submitTimeSlot(timeSlots: TimeSliceItem): void;
+    clearCache(): void;
+    clearCacheByModule(module: string): void;
 }