@pisell/pisellos 2.3.166 → 2.3.167

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

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 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 5 | 1 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -347,7 +347,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/ScanOrder/index.js

@@ -2168,7 +2168,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _origin2, _origin3, _origin4, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _origin2, _origin3, _origin4, prefillItem, productId, productVariantId, targetQuantity, sourceItem, sourceTitle, productTitle, displayFields, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasTitleChanged, hasOriginChanged;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2218,7 +2218,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               _iterator6.s();
             case 22:
               if ((_step6 = _iterator6.n()).done) {
-                _context30.next = 47;
+                _context30.next = 51;
                 break;
               }
               prefillItem = _step6.value;
@@ -2229,25 +2229,32 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _context30.next = 29;
                 break;
               }
-              return _context30.abrupt("continue", 45);
+              return _context30.abrupt("continue", 49);
             case 29:
               if (!Number.isNaN(productVariantId)) {
                 _context30.next = 31;
                 break;
               }
-              return _context30.abrupt("continue", 45);
+              return _context30.abrupt("continue", 49);
             case 31:
               sourceItem = productSourceMap.get(buildProductKey(productId, productVariantId)) || productSourceMap.get(buildProductKey(productId, 0)) || null;
+              sourceTitle = (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.product_title) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name);
+              productTitle = typeof sourceTitle === 'string' ? {
+                auto: sourceTitle
+              } : sourceTitle; // 标准标题在归一化后补入，供购物车展示，并由 Order 在折扣重算时保留。
+              displayFields = productTitle ? {
+                product_title: productTitle
+              } : {};
               productIndex = getProductIdentityIndex(tempOrder.products, {
                 product_id: productId,
                 product_variant_id: productVariantId
               });
               if (!(productIndex === -1)) {
-                _context30.next = 38;
+                _context30.next = 41;
                 break;
               }
               sellingPrice = toPriceString((_sourceItem$price = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _sourceItem$price !== void 0 ? _sourceItem$price : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price, '0.00');
-              tempOrder.products.push(normalizeOrderProduct(_objectSpread(_objectSpread({}, sourceItem), {}, {
+              tempOrder.products.push(_objectSpread(_objectSpread({}, normalizeOrderProduct(_objectSpread(_objectSpread({}, sourceItem), {}, {
                 product_id: productId,
                 product_variant_id: productVariantId,
                 num: targetQuantity,
@@ -2261,14 +2268,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   item_rule_prefill: true,
                   item_rule_id: prefillItem.ruleId
                 })
-              })));
+              }))), displayFields));
               hasChanges = true;
-              return _context30.abrupt("continue", 45);
-            case 38:
+              return _context30.abrupt("continue", 49);
+            case 41:
               targetProduct = tempOrder.products[productIndex];
               existedQuantity = toNonNegativeInt(targetProduct.num);
               delta = targetQuantity - existedQuantity;
-              nextProduct = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), delta > 0 ? {
+              nextProduct = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), displayFields), delta > 0 ? {
                 num: getSafeProductNum(existedQuantity + delta)
               } : {}), {}, {
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
@@ -2278,52 +2285,53 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _origin: sourceItem ? _objectSpread(_objectSpread({}, targetProduct._origin || {}), sourceItem) : targetProduct._origin
               });
               hasQuantityChanged = delta > 0;
+              hasTitleChanged = Boolean(productTitle && JSON.stringify(targetProduct.product_title) !== JSON.stringify(productTitle));
               hasOriginChanged = Boolean(sourceItem && (!targetProduct._origin || ((_origin2 = targetProduct._origin) === null || _origin2 === void 0 ? void 0 : _origin2.name) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name) || ((_origin3 = targetProduct._origin) === null || _origin3 === void 0 ? void 0 : _origin3.title) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || ((_origin4 = targetProduct._origin) === null || _origin4 === void 0 ? void 0 : _origin4.price) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price)));
-              if (hasQuantityChanged || hasOriginChanged) {
+              if (hasQuantityChanged || hasTitleChanged || hasOriginChanged) {
                 tempOrder.products[productIndex] = nextProduct;
                 hasChanges = true;
               }
-            case 45:
+            case 49:
               _context30.next = 22;
               break;
-            case 47:
-              _context30.next = 52;
+            case 51:
+              _context30.next = 56;
               break;
-            case 49:
-              _context30.prev = 49;
+            case 53:
+              _context30.prev = 53;
               _context30.t0 = _context30["catch"](20);
               _iterator6.e(_context30.t0);
-            case 52:
-              _context30.prev = 52;
+            case 56:
+              _context30.prev = 56;
               _iterator6.f();
-              return _context30.finish(52);
-            case 55:
+              return _context30.finish(56);
+            case 59:
               if (!hasChanges) {
-                _context30.next = 60;
+                _context30.next = 64;
                 break;
               }
               // Prefill 属于 products CRUD 的一种形式：新增后让 Rules 重算，以支持自动应用可用优惠券。
               this.store.order.applyDiscount();
-              _context30.next = 59;
+              _context30.next = 63;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 59:
+            case 63:
               this.store.order.persistTempOrder();
-            case 60:
-              _context30.next = 62;
+            case 64:
+              _context30.next = 66;
               return this.refreshItemRuleQuantityLimits();
-            case 62:
+            case 66:
               this.itemRulePrefillApplied = true;
               this.logMethodSuccess('applyPrefillByItemRule', {
                 prefillCount: prefillItems.length,
                 hasChanges: hasChanges
               });
-            case 64:
+            case 68:
             case "end":
               return _context30.stop();
           }
-        }, _callee30, this, [[20, 49, 52, 55]]);
+        }, _callee30, this, [[20, 53, 56, 59]]);
       }));
       function applyPrefillByItemRule() {
         return _applyPrefillByItemRule.apply(this, arguments);

package/dist/solution/ScanOrder/types.d.ts

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, ScheduleModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { OrderLocalizedText } from '../../modules/Order/types';
 /**
  * 扫码下单流程 hook
  */
@@ -43,6 +44,8 @@ export interface ScanOrderProductSku {
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
+    /** 与 Order 一致的商品展示名称。 */
+    product_title?: OrderLocalizedText;
     num: number;
     /** Product 或当前 Variant 的生产编码 */
     production_code?: string;

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

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 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 5 | 1 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -347,7 +347,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/ScanOrder/index.js

@@ -1299,29 +1299,40 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
       if (!Number.isFinite(productId) || targetQuantity <= 0) continue;
       if (Number.isNaN(productVariantId)) continue;
       const sourceItem = productSourceMap.get((0, _utils.buildProductKey)(productId, productVariantId)) || productSourceMap.get((0, _utils.buildProductKey)(productId, 0)) || null;
+      const sourceTitle = sourceItem?.product_title || sourceItem?.title || sourceItem?.name;
+      const productTitle = typeof sourceTitle === 'string' ? {
+        auto: sourceTitle
+      } : sourceTitle;
+      // 标准标题在归一化后补入，供购物车展示，并由 Order 在折扣重算时保留。
+      const displayFields = productTitle ? {
+        product_title: productTitle
+      } : {};
       const productIndex = (0, _utils.getProductIdentityIndex)(tempOrder.products, {
         product_id: productId,
         product_variant_id: productVariantId
       });
       if (productIndex === -1) {
         const sellingPrice = (0, _utils.toPriceString)(sourceItem?.price ?? sourceItem?.selling_price, '0.00');
-        tempOrder.products.push((0, _utils.normalizeOrderProduct)({
-          ...sourceItem,
-          product_id: productId,
-          product_variant_id: productVariantId,
-          num: targetQuantity,
-          selling_price: sellingPrice,
-          original_price: sellingPrice,
-          metadata: {
-            item_rule_prefill: true,
-            item_rule_id: prefillItem.ruleId
-          },
-          _origin: {
-            ...(sourceItem || {}),
-            item_rule_prefill: true,
-            item_rule_id: prefillItem.ruleId
-          }
-        }));
+        tempOrder.products.push({
+          ...(0, _utils.normalizeOrderProduct)({
+            ...sourceItem,
+            product_id: productId,
+            product_variant_id: productVariantId,
+            num: targetQuantity,
+            selling_price: sellingPrice,
+            original_price: sellingPrice,
+            metadata: {
+              item_rule_prefill: true,
+              item_rule_id: prefillItem.ruleId
+            },
+            _origin: {
+              ...(sourceItem || {}),
+              item_rule_prefill: true,
+              item_rule_id: prefillItem.ruleId
+            }
+          }),
+          ...displayFields
+        });
         hasChanges = true;
         continue;
       }
@@ -1330,6 +1341,7 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
       const delta = targetQuantity - existedQuantity;
       const nextProduct = {
         ...targetProduct,
+        ...displayFields,
         ...(delta > 0 ? {
           num: (0, _utils.getSafeProductNum)(existedQuantity + delta)
         } : {}),
@@ -1344,8 +1356,9 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
         } : targetProduct._origin
       };
       const hasQuantityChanged = delta > 0;
+      const hasTitleChanged = Boolean(productTitle && JSON.stringify(targetProduct.product_title) !== JSON.stringify(productTitle));
       const hasOriginChanged = Boolean(sourceItem && (!targetProduct._origin || targetProduct._origin?.name !== sourceItem?.name || targetProduct._origin?.title !== sourceItem?.title || targetProduct._origin?.price !== sourceItem?.price));
-      if (hasQuantityChanged || hasOriginChanged) {
+      if (hasQuantityChanged || hasTitleChanged || hasOriginChanged) {
         tempOrder.products[productIndex] = nextProduct;
         hasChanges = true;
       }

package/lib/solution/ScanOrder/types.d.ts

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, ScheduleModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { OrderLocalizedText } from '../../modules/Order/types';
 /**
  * 扫码下单流程 hook
  */
@@ -43,6 +44,8 @@ export interface ScanOrderProductSku {
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
+    /** 与 Order 一致的商品展示名称。 */
+    product_title?: OrderLocalizedText;
     num: number;
     /** Product 或当前 Variant 的生产编码 */
     production_code?: string;

package/package.json

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