@pisell/pisellos 2.3.21 → 2.3.23

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

@@ -276,6 +276,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private shouldKeepCustomerBoundDiscountAfterCustomerChange;
     private productHasCustomerBoundDiscount;
     private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
@@ -463,7 +464,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/modules/Order/index.js

@@ -492,7 +492,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
+        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -511,30 +511,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               discountList = _context3.sent;
               if (!discountList) {
-                _context3.next = 13;
+                _context3.next = 16;
                 break;
               }
-              currentEditDiscounts = (((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || []).filter(function (discount) {
+              currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
+              currentEditDiscounts = currentDiscountList.filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
               });
+              currentScanDiscounts = currentDiscountList.filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              currentScanDiscountIds = new Set(currentScanDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
               runtimeDiscountIds = new Set();
               runtimeDiscounts = discountList.filter(function (discount) {
+                if (currentScanDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
                 if (runtimeDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
                 runtimeDiscountIds.add(discount === null || discount === void 0 ? void 0 : discount.id);
                 return true;
               });
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 11;
+              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(currentScanDiscounts), _toConsumableArray(runtimeDiscounts));
+              _context3.next = 14;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 11:
-              _context3.next = 13;
+            case 14:
+              _context3.next = 16;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 13:
+            case 16:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 15:
+            case 18:
             case "end":
               return _context3.stop();
           }
@@ -2962,6 +2970,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var type = (_discount$type5 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type5 !== void 0 ? _discount$type5 : discount === null || discount === void 0 ? void 0 : discount.tag;
       return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
     }
+  }, {
+    key: "shouldKeepCustomerBoundDiscountAfterCustomerChange",
+    value: function shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
+      return Boolean((discount === null || discount === void 0 ? void 0 : discount.isScan) || (discount === null || discount === void 0 ? void 0 : discount.isEditMode));
+    }
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
@@ -3029,11 +3042,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
+        if (_this18.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
         return !_this18.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
+        if (_this18.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
         return !_this18.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
@@ -3910,7 +3923,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.d.ts

@@ -67,8 +67,8 @@ export declare function sumOptionUnitPrice(options?: Array<{
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
     productsByUid?: Record<string, Record<string, any>>;

package/dist/modules/Order/utils.js

@@ -252,8 +252,8 @@ function getOrderProductDeposit(product, runtimeOrigin) {
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export function calculateOrderProductsDeposit() {
   var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -273,30 +273,18 @@ export function calculateOrderProductsDeposit() {
       product.deposit = deposit;
       if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
       total = total.plus(deposit.total);
-      var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+      var _iterator4 = _createForOfIteratorHelper(deposit.protocols || []),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var discount = _step4.value;
-          total = total.minus((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+          var protocol = _step4.value;
+          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
         }
       } catch (err) {
         _iterator4.e(err);
       } finally {
         _iterator4.f();
       }
-      var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var protocol = _step5.value;
-          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
       hasDeposit = true;
     }
   } catch (err) {
@@ -460,19 +448,19 @@ function resolveSubmitBundleMapId(bundle) {
 }
 function collectSubmitProductDiscountList(product) {
   var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
-  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
-    _step6;
+  var _iterator5 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+    _step5;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var bundle = _step6.value;
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var bundle = _step5.value;
       if (!bundle || _typeof(bundle) !== 'object') continue;
       var bundleMapId = resolveSubmitBundleMapId(bundle);
       var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
-      var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
-        _step7;
+      var _iterator6 = _createForOfIteratorHelper(bundleDiscountList),
+        _step6;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var discount = _step7.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var discount = _step6.value;
           if (!discount || _typeof(discount) !== 'object') continue;
           var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
           var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
@@ -483,15 +471,15 @@ function collectSubmitProductDiscountList(product) {
           } : {}));
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator7.f();
+        _iterator6.f();
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator5.e(err);
   } finally {
-    _iterator6.f();
+    _iterator5.f();
   }
   return normalizeOrderProductDiscountList(submitDiscountList);
 }
@@ -586,11 +574,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 +854,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
       } : {}), {}, {
@@ -957,19 +949,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator8 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step8;
+  var _iterator7 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step7;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var key = _step8.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var key = _step7.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator8.f();
+    _iterator7.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -1282,25 +1274,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator9 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step9;
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step8;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var product = _step9.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var product = _step8.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator9.f();
+    _iterator8.f();
   }
-  var _iterator10 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step10;
+  var _iterator9 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step9;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var booking = _step10.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var booking = _step9.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1311,9 +1303,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator10.f();
+    _iterator9.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {

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

@@ -52,6 +52,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private salesDetailLoadInFlight;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
+    private serverOrderChangeSyncEnabled;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -73,6 +74,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     private logError;
     private isCurrentSalesOrderRecord;
+    setServerOrderChangeSyncEnabled(enabled: boolean): void;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
@@ -191,6 +193,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;