@pisell/pisellos 2.3.154 → 2.3.155

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

@@ -595,7 +595,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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "normal" | "session";
 }

package/dist/solution/BaseSales/index.js

@@ -1399,7 +1399,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _resolveProductsForPriceQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
         var _this7 = this;
-        var selectedProducts, productIds, ids, handledByOsServer, canUseLocalFastPath, productsById, queryPayload, cachedRawProducts, authoritativeProducts, missingIds, remoteRawProducts;
+        var selectedProducts, productIds, ids, handledByOsServer, canUseLocalFastPath, productsById, shouldAlignSelectedVariantPrice, queryPayload, cachedRawProducts, authoritativeProducts, missingIds, remoteRawProducts;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -1423,7 +1423,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               handledByOsServer = this.request ? isProductQueryHandledByOsServer(this.core, this.request) : false;
               canUseLocalFastPath = this.isCustomerUserPriceQuery() && !handledByOsServer;
               if (canUseLocalFastPath) {
-                _context10.next = 14;
+                _context10.next = 15;
                 break;
               }
               if (this.request) {
@@ -1443,10 +1443,37 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 12:
               productsById = _context10.sent;
-              return _context10.abrupt("return", productIds.map(function (productId) {
-                return productId === null ? null : productsById.get(productId) || null;
+              shouldAlignSelectedVariantPrice = handledByOsServer && this.preferAuthoritativeProductQueryPrice();
+              return _context10.abrupt("return", productIds.map(function (productId, index) {
+                var _authoritativeProduct;
+                var authoritativeProduct = productId === null ? null : productsById.get(productId) || null;
+                if (!shouldAlignSelectedVariantPrice || !authoritativeProduct) return authoritativeProduct;
+                var selectedProduct = selectedProducts[index];
+                var selectedVariantId = _this7.getSelectedProductVariantId(selectedProduct);
+                if (!selectedVariantId || _this7.getSelectedProductVariantId(authoritativeProduct) === selectedVariantId) {
+                  return authoritativeProduct;
+                }
+
+                // OS 返回的是目录商品；已命中的智能价格不能被规格基础价覆盖。
+                var appliedFields = (_authoritativeProduct = authoritativeProduct._dataVariant) === null || _authoritativeProduct === void 0 ? void 0 : _authoritativeProduct.appliedFields;
+                if (Array.isArray(appliedFields) && ['price', 'selling_price', 'original_price', 'base_price'].some(function (field) {
+                  return appliedFields.includes(field);
+                })) {
+                  return authoritativeProduct;
+                }
+                var selectedVariant = Array.isArray(authoritativeProduct.variant) ? authoritativeProduct.variant.find(function (variant) {
+                  return Number(variant === null || variant === void 0 ? void 0 : variant.id) === selectedVariantId;
+                }) : undefined;
+                var selectedPrice = [selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.price, selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.selling_price, selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.base_price, params.priceQueries[index].fallback_price, selectedProduct.price, selectedProduct.selling_price, selectedProduct.original_price].find(function (value) {
+                  return (typeof value === 'number' || typeof value === 'string' && value.trim() !== '') && Number.isFinite(Number(value));
+                });
+
+                // 每行独立保留所选规格价格（含 0 元），避免同商品多规格共用目录对象串价。
+                return selectedPrice === undefined ? authoritativeProduct : _objectSpread(_objectSpread({}, authoritativeProduct), {}, {
+                  price: selectedPrice
+                });
               }));
-            case 14:
+            case 15:
               queryPayload = this.buildPriceQueryPayload({
                 ids: ids,
                 schedule: params.schedule,
@@ -1466,25 +1493,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return productId !== null && !authoritativeProducts[index];
               })));
               if (missingIds.length) {
-                _context10.next = 20;
+                _context10.next = 21;
                 break;
               }
               return _context10.abrupt("return", authoritativeProducts);
-            case 20:
+            case 21:
               if (this.request) {
-                _context10.next = 22;
+                _context10.next = 23;
                 break;
               }
               return _context10.abrupt("return", authoritativeProducts);
-            case 22:
-              _context10.next = 24;
+            case 23:
+              _context10.next = 25;
               return this.loadProductsForPriceQuery({
                 ids: missingIds,
                 schedule: params.schedule,
                 customerId: params.customerId,
                 channel: params.channel
               });
-            case 24:
+            case 25:
               remoteRawProducts = _context10.sent;
               authoritativeProducts.forEach(function (authoritativeProduct, index) {
                 if (authoritativeProduct) return;
@@ -1506,7 +1533,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 authoritativeProducts[index] = rawProduct ? _this7.prepareRawProductForPriceQuery(rawProduct, selectedProducts[index]) || rawProduct : null;
               });
               return _context10.abrupt("return", authoritativeProducts);
-            case 27:
+            case 28:
             case "end":
               return _context10.stop();
           }

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

@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -595,7 +595,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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "normal" | "session";
 }

package/lib/solution/BaseSales/index.js

@@ -1043,7 +1043,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         customerId: params.customerId,
         channel: params.channel
       });
-      return productIds.map(productId => productId === null ? null : productsById.get(productId) || null);
+      const shouldAlignSelectedVariantPrice = handledByOsServer && this.preferAuthoritativeProductQueryPrice();
+      return productIds.map((productId, index) => {
+        const authoritativeProduct = productId === null ? null : productsById.get(productId) || null;
+        if (!shouldAlignSelectedVariantPrice || !authoritativeProduct) return authoritativeProduct;
+        const selectedProduct = selectedProducts[index];
+        const selectedVariantId = this.getSelectedProductVariantId(selectedProduct);
+        if (!selectedVariantId || this.getSelectedProductVariantId(authoritativeProduct) === selectedVariantId) {
+          return authoritativeProduct;
+        }
+
+        // OS 返回的是目录商品；已命中的智能价格不能被规格基础价覆盖。
+        const appliedFields = authoritativeProduct._dataVariant?.appliedFields;
+        if (Array.isArray(appliedFields) && ['price', 'selling_price', 'original_price', 'base_price'].some(field => appliedFields.includes(field))) {
+          return authoritativeProduct;
+        }
+        const selectedVariant = Array.isArray(authoritativeProduct.variant) ? authoritativeProduct.variant.find(variant => Number(variant?.id) === selectedVariantId) : undefined;
+        const selectedPrice = [selectedVariant?.price, selectedVariant?.selling_price, selectedVariant?.base_price, params.priceQueries[index].fallback_price, selectedProduct.price, selectedProduct.selling_price, selectedProduct.original_price].find(value => (typeof value === 'number' || typeof value === 'string' && value.trim() !== '') && Number.isFinite(Number(value)));
+
+        // 每行独立保留所选规格价格（含 0 元），避免同商品多规格共用目录对象串价。
+        return selectedPrice === undefined ? authoritativeProduct : {
+          ...authoritativeProduct,
+          price: selectedPrice
+        };
+      });
     }
     const queryPayload = this.buildPriceQueryPayload({
       ids,

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

@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/package.json

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