@pisell/pisellos 2.3.21 → 2.3.22

package/dist/modules/Order/index.js

@@ -3910,7 +3910,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
         var previous = previousByIdentity.get(_this23.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
-        return _objectSpread(_objectSpread({}, bundle), {}, {
+        return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
+          cover: previous.cover
+        } : {}), {}, {
           price: previous.price,
           custom_price: previous.custom_price,
           bundle_payment_price: previous.bundle_payment_price,

package/dist/modules/Order/utils.js

@@ -586,11 +586,14 @@ export function createDefaultOrderRulesHooks() {
       if (!bundle || _typeof(bundle) !== 'object') return bundle;
       var current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current) return bundle;
+      var bundleWithDisplayFields = _objectSpread(_objectSpread({}, bundle), isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? {
+        cover: current.cover
+      } : {});
       var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
-      if (!isProductPriceBundle) return bundle;
+      if (!isProductPriceBundle) return bundleWithDisplayFields;
       var sourcePrice = (_ref18 = (_ref19 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref19 !== void 0 ? _ref19 : current.original_price) !== null && _ref18 !== void 0 ? _ref18 : current.bundle_selling_price;
       var originalPrice = (_ref20 = (_ref21 = (_ref22 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref22 !== void 0 ? _ref22 : current.price) !== null && _ref21 !== void 0 ? _ref21 : current.custom_price) !== null && _ref20 !== void 0 ? _ref20 : sourcePrice;
-      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundleWithDisplayFields), sourcePrice !== undefined ? {
         price: sourcePrice
       } : {}), originalPrice !== undefined ? {
         original_price: originalPrice
@@ -863,6 +866,7 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
       bundle_id: (_rawBundle$bundle_id = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_id) !== null && _rawBundle$bundle_id !== void 0 ? _rawBundle$bundle_id : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
       bundle_product_id: (_rawBundle$bundle_pro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_product_id) !== null && _rawBundle$bundle_pro !== void 0 ? _rawBundle$bundle_pro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle._bundle_product_id,
+      cover: rawBundle.cover,
       metadata: _objectSpread(_objectSpread(_objectSpread({}, submitMetadata), hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
         custom_product_bundle_map_id: bundleMapId
       } : {}), {}, {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/server/index.d.ts

@@ -448,6 +448,7 @@ declare class Server {
     private collectSalesDetailProductIds;
     private buildSalesDetailProductSnapshotMap;
     private withProductCatalogSnapshots;
+    private withBundleCatalogSnapshots;
     private withSalesDetailProductSnapshots;
     private withPendingSyncProductTitles;
     private buildProductTitleSnapshot;

package/dist/server/index.js

@@ -5123,12 +5123,20 @@ var Server = /*#__PURE__*/function () {
     value: function collectSalesDetailProductIds(order) {
       var products = Array.isArray(order === null || order === void 0 ? void 0 : order.products) ? order.products : [];
       var productIds = new Set();
-      products.forEach(function (product) {
-        var _product$product_id2;
-        var rawProductId = (_product$product_id2 = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : product === null || product === void 0 ? void 0 : product.id;
+      var addProductId = function addProductId(rawProductId) {
         if (rawProductId === undefined || rawProductId === null || rawProductId === '') return;
         var productId = Number(rawProductId);
         if (Number.isFinite(productId)) productIds.add(productId);
+      };
+      products.forEach(function (product) {
+        var _product$product_id2;
+        addProductId((_product$product_id2 = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : product === null || product === void 0 ? void 0 : product.id);
+        if (Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle)) {
+          product.product_bundle.forEach(function (bundle) {
+            var _ref61, _bundle$bundle_produc2;
+            addProductId((_ref61 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref61 !== void 0 ? _ref61 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id);
+          });
+        }
       });
       return Array.from(productIds);
     }
@@ -5196,6 +5204,31 @@ var Server = /*#__PURE__*/function () {
         })
       } : {});
     }
+  }, {
+    key: "withBundleCatalogSnapshots",
+    value: function withBundleCatalogSnapshots(product, snapshotMap) {
+      if (!Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle)) return product;
+      var hasChanged = false;
+      var productBundle = product.product_bundle.map(function (bundle) {
+        var _ref62, _bundle$bundle_produc3;
+        if (!bundle || _typeof(bundle) !== 'object') return bundle;
+        var rawProductId = (_ref62 = (_bundle$bundle_produc3 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref62 !== void 0 ? _ref62 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id;
+        if (rawProductId === undefined || rawProductId === null || rawProductId === '') return bundle;
+        var productId = Number(rawProductId);
+        if (!Number.isFinite(productId)) return bundle;
+        var snapshot = snapshotMap[String(productId)];
+        var shouldFillCover = (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && (snapshot === null || snapshot === void 0 ? void 0 : snapshot.cover) !== undefined && snapshot.cover !== null && snapshot.cover !== '';
+        if (!shouldFillCover) return bundle;
+        hasChanged = true;
+        return _objectSpread(_objectSpread({}, bundle), {}, {
+          cover: snapshot.cover
+        });
+      });
+      if (!hasChanged) return product;
+      return _objectSpread(_objectSpread({}, product), {}, {
+        product_bundle: productBundle
+      });
+    }
   }, {
     key: "withSalesDetailProductSnapshots",
     value: function () {
@@ -5224,7 +5257,8 @@ var Server = /*#__PURE__*/function () {
             case 8:
               hasChanged = false;
               enrichedProducts = products.map(function (product) {
-                var nextProduct = _this13.withProductCatalogSnapshots(product, snapshotMap);
+                var productWithBundleSnapshots = _this13.withBundleCatalogSnapshots(product, snapshotMap);
+                var nextProduct = _this13.withProductCatalogSnapshots(productWithBundleSnapshots, snapshotMap);
                 if (nextProduct !== product) hasChanged = true;
                 return nextProduct;
               });
@@ -5302,7 +5336,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "resolveProductTitleValue",
     value: function resolveProductTitleValue(value, key, currentLocale) {
-      var _ref61, _ref62, _value$key;
+      var _ref63, _ref64, _value$key;
       if (value === undefined || value === null || value === '') return null;
       if (_typeof(value) !== 'object') {
         var title = String(value);
@@ -5312,7 +5346,7 @@ var Server = /*#__PURE__*/function () {
       }
       var normalizedKey = key.replace('-', '_');
       var dashedKey = key.replace('_', '-');
-      var rawValue = (_ref61 = (_ref62 = (_value$key = value[key]) !== null && _value$key !== void 0 ? _value$key : value[normalizedKey]) !== null && _ref62 !== void 0 ? _ref62 : value[dashedKey]) !== null && _ref61 !== void 0 ? _ref61 : key === 'auto' ? value.default : undefined;
+      var rawValue = (_ref63 = (_ref64 = (_value$key = value[key]) !== null && _value$key !== void 0 ? _value$key : value[normalizedKey]) !== null && _ref64 !== void 0 ? _ref64 : value[dashedKey]) !== null && _ref63 !== void 0 ? _ref63 : key === 'auto' ? value.default : undefined;
       if (rawValue === undefined || rawValue === null || rawValue === '') return null;
       if (_typeof(rawValue) === 'object') return this.resolveFirstProductTitleValue(rawValue);
       return String(rawValue);

package/dist/server/modules/order/types.d.ts

@@ -63,6 +63,8 @@ export interface OrderProductBundleItem {
     bundle_group_id?: number;
     /** 套餐商品 ID */
     bundle_id?: number;
+    /** 套餐子商品封面图 */
+    cover?: string | null;
     /** 套餐商品规格 ID */
     bundle_variant_id?: number;
     /** 数量 */

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

@@ -191,6 +191,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
     }>;
     getDiscountList(): Discount[];
+    /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+    getOriginalDiscountList(): Discount[];
+    /**
+     * 同步写入 Discount 模块的 discountList / originalDiscountList。
+     * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+     */
+    replaceDiscountStoreLists(params: {
+        discountList: Discount[];
+        originalDiscountList?: Discount[];
+    }): Promise<void>;
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;