@pisell/pisellos 0.10.22 → 0.10.24

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

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

@@ -28,6 +28,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
      * openDataModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' })
      */
     updateOtherParams(params: Record<string, any>): void;
+    private shouldSkipInvoiceTemplateDocument;
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;

package/dist/modules/OpenData/index.js

@@ -128,6 +128,12 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
       this.cacheId = this.otherParams.cacheId;
       this.fatherModule = this.otherParams.fatherModule;
     }
+  }, {
+    key: "shouldSkipInvoiceTemplateDocument",
+    value: function shouldSkipInvoiceTemplateDocument() {
+      var _this$otherParams;
+      return String(((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform) || '').trim().toLowerCase() === 'h5';
+    }
   }, {
     key: "fetchOpenData",
     value: function () {
@@ -205,6 +211,9 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
     key: "getInvoiceTemplateSettings",
     value: function getInvoiceTemplateSettings() {
       var _this$store$data2;
+      if (this.shouldSkipInvoiceTemplateDocument()) {
+        return getDefaultInvoiceTemplateSettings();
+      }
       if (isRecord(this.store.invoiceTemplateSettings)) {
         var _this$store$data;
         var documentId = resolveInvoiceDocumentId((_this$store$data = this.store.data) === null || _this$store$data === void 0 ? void 0 : _this$store$data['documents.invoice_template']);
@@ -278,10 +287,20 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              if (!this.shouldSkipInvoiceTemplateDocument()) {
+                _context4.next = 2;
+                break;
+              }
+              return _context4.abrupt("return", {
+                settings: getDefaultInvoiceTemplateSettings(),
+                documentId: null,
+                cacheKey: null
+              });
+            case 2:
               rawTemplate = config['documents.invoice_template'];
               documentId = resolveInvoiceDocumentId(rawTemplate);
               if (documentId) {
-                _context4.next = 4;
+                _context4.next = 6;
                 break;
               }
               return _context4.abrupt("return", {
@@ -289,10 +308,10 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
                 documentId: null,
                 cacheKey: null
               });
-            case 4:
+            case 6:
               cacheKey = this.buildInvoiceTemplateCacheKey(target, documentId);
               if (!(this.store.invoiceTemplateTarget === target && this.store.invoiceTemplateDocumentId === documentId && this.store.invoiceTemplateCacheKey === cacheKey && isRecord(this.store.invoiceTemplateSettings))) {
-                _context4.next = 7;
+                _context4.next = 9;
                 break;
               }
               return _context4.abrupt("return", {
@@ -300,10 +319,10 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
                 documentId: documentId,
                 cacheKey: cacheKey
               });
-            case 7:
+            case 9:
               cachedSettings = this.invoiceTemplateDocumentCache.get(cacheKey);
               if (!cachedSettings) {
-                _context4.next = 10;
+                _context4.next = 12;
                 break;
               }
               return _context4.abrupt("return", {
@@ -311,7 +330,7 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
                 documentId: documentId,
                 cacheKey: cacheKey
               });
-            case 10:
+            case 12:
               request = this.invoiceTemplateDocumentInFlight.get(cacheKey);
               if (!request) {
                 cacheRevision = this.invoiceTemplateCacheRevision;
@@ -331,9 +350,9 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
                 });
                 this.invoiceTemplateDocumentInFlight.set(cacheKey, request);
               }
-              _context4.next = 14;
+              _context4.next = 16;
               return request;
-            case 14:
+            case 16:
               _context4.t0 = _context4.sent;
               _context4.t1 = documentId;
               _context4.t2 = cacheKey;
@@ -342,7 +361,7 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
                 documentId: _context4.t1,
                 cacheKey: _context4.t2
               });
-            case 18:
+            case 20:
             case "end":
               return _context4.stop();
           }

package/dist/modules/Order/index.js

@@ -294,14 +294,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }
         if (Array.isArray(product.product_bundle)) {
           product.product_bundle = product.product_bundle.map(function (bundle) {
-            var _ref11, _bundle$original_pric;
+            var _ref11, _bundle$original_pric, _bundle$bundle_sellin;
             var hasBundleDiscount = Array.isArray(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
             if (hasBundleDiscount) return bundle;
             var restoredPrice = (_ref11 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref11 !== void 0 ? _ref11 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
             if (restoredPrice === undefined || restoredPrice === null || restoredPrice === '') return bundle;
             return _objectSpread(_objectSpread({}, bundle), {}, {
               price: restoredPrice,
-              bundle_selling_price: restoredPrice
+              bundle_selling_price: (_bundle$bundle_sellin = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : restoredPrice
             });
           });
         }

package/dist/solution/Sales/index.js

@@ -73,6 +73,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core) {
+        var _this$otherParams;
         var options,
           appPlugin,
           _args = arguments;
@@ -117,7 +118,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 initialState: {},
                 otherParams: {
                   fatherModule: this.name,
-                  openCache: false
+                  openCache: false,
+                  platform: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform
                 }
               });
               _context.next = 18;
@@ -524,8 +526,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimelineBucketMinutes",
     value: function getTimelineBucketMinutes() {
-      var _this$otherParams;
-      var dynamicBucket = Number((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.timelineBucketMinutes);
+      var _this$otherParams2;
+      var dynamicBucket = Number((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.timelineBucketMinutes);
       if (!Number.isFinite(dynamicBucket) || dynamicBucket <= 0) return this.defaultTimelineBucketMinutes;
       return Math.floor(dynamicBucket);
     }

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

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/modules/OpenData/index.d.ts

@@ -28,6 +28,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
      * openDataModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' })
      */
     updateOtherParams(params: Record<string, any>): void;
+    private shouldSkipInvoiceTemplateDocument;
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;

package/lib/modules/OpenData/index.js

@@ -152,6 +152,9 @@ class OpenDataModule extends _BaseModule.BaseModule {
     this.cacheId = this.otherParams.cacheId;
     this.fatherModule = this.otherParams.fatherModule;
   }
+  shouldSkipInvoiceTemplateDocument() {
+    return String(this.otherParams?.platform || '').trim().toLowerCase() === 'h5';
+  }
   async fetchOpenData(params) {
     const fetchRevision = ++this.fetchRevision;
     const getData = this.appPlugin?.getData?.();
@@ -190,6 +193,9 @@ class OpenDataModule extends _BaseModule.BaseModule {
     return (0, _utils.normalizeInvoiceLayoutFromTemplateSettings)(this.getInvoiceTemplateSettings());
   }
   getInvoiceTemplateSettings() {
+    if (this.shouldSkipInvoiceTemplateDocument()) {
+      return (0, _utils.getDefaultInvoiceTemplateSettings)();
+    }
     if (isRecord(this.store.invoiceTemplateSettings)) {
       const documentId = resolveInvoiceDocumentId(this.store.data?.['documents.invoice_template']);
       if (documentId) {
@@ -226,6 +232,13 @@ class OpenDataModule extends _BaseModule.BaseModule {
     this.store.invoiceTemplateCacheKey = resolved.cacheKey;
   }
   async resolveInvoiceTemplateSettings(config, target) {
+    if (this.shouldSkipInvoiceTemplateDocument()) {
+      return {
+        settings: (0, _utils.getDefaultInvoiceTemplateSettings)(),
+        documentId: null,
+        cacheKey: null
+      };
+    }
     const rawTemplate = config['documents.invoice_template'];
     const documentId = resolveInvoiceDocumentId(rawTemplate);
     if (!documentId) {

package/lib/modules/Order/index.js

@@ -266,7 +266,7 @@ class OrderModule extends _BaseModule.BaseModule {
           return {
             ...bundle,
             price: restoredPrice,
-            bundle_selling_price: restoredPrice
+            bundle_selling_price: bundle?.bundle_selling_price ?? restoredPrice
           };
         });
       }

package/lib/solution/Sales/index.js

@@ -94,7 +94,8 @@ class SalesImpl extends _BaseModule.BaseModule {
       initialState: {},
       otherParams: {
         fatherModule: this.name,
-        openCache: false
+        openCache: false,
+        platform: this.otherParams?.platform
       }
     });
     await this.core.effects.emit(`${this.name}:onInited`, {});

package/package.json

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