@pisell/pisellos 2.3.95 → 2.3.96

package/dist/server/utils/product.js

@@ -1,4 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -6,6 +5,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -195,9 +195,120 @@ var I18N_FIELD_MAP = {
   description_i18n: 'description',
   cover_i18n: 'cover'
 };
+/**
+ * 按当前语言读取 i18n 文案；当前语言为空时回退到商家原始文案。
+ */
+function resolveI18nValue(i18nDict, locale) {
+  if (!i18nDict) return undefined;
+  return i18nDict[locale] || i18nDict.original || undefined;
+}
+
+/**
+ * 递归格式化商品分类名称，同时保留未变化节点的引用。
+ */
+function applyI18nToCategory(category, locale) {
+  if (!category || _typeof(category) !== 'object') return category;
+  var localizedName = resolveI18nValue(category.name_i18n, locale);
+  var localizedParent = applyI18nToCategory(category.parent_category, locale);
+  var nameChanged = localizedName !== undefined && localizedName !== category.name;
+  var parentChanged = localizedParent !== category.parent_category;
+  if (!nameChanged && !parentChanged) return category;
+  return _objectSpread(_objectSpread(_objectSpread({}, category), nameChanged ? {
+    name: localizedName
+  } : {}), parentChanged ? {
+    parent_category: localizedParent
+  } : {});
+}
+function applyI18nToCategories(categories, locale) {
+  if (!Array.isArray(categories)) return categories;
+  var changed = false;
+  var localizedCategories = categories.map(function (category) {
+    var localizedCategory = applyI18nToCategory(category, locale);
+    if (localizedCategory !== category) changed = true;
+    return localizedCategory;
+  });
+  return changed ? localizedCategories : categories;
+}
+function applyI18nToNamedItems(items, locale) {
+  if (!Array.isArray(items)) return items;
+  var changed = false;
+  var localizedItems = items.map(function (item) {
+    if (!item || _typeof(item) !== 'object') return item;
+    var localizedName = resolveI18nValue(item.name_i18n, locale);
+    if (localizedName === undefined || localizedName === item.name) return item;
+    changed = true;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      name: localizedName
+    });
+  });
+  return changed ? localizedItems : items;
+}
+
+/**
+ * 格式化选项组、规格组及其子项名称，同时保留未变化节点的引用。
+ */
+function applyI18nToNamedGroups(groups, itemKey, locale) {
+  if (!Array.isArray(groups)) return groups;
+  var changed = false;
+  var localizedGroups = groups.map(function (group) {
+    if (!group || _typeof(group) !== 'object') return group;
+    var localizedName = resolveI18nValue(group.name_i18n, locale);
+    var localizedItems = applyI18nToNamedItems(group[itemKey], locale);
+    var nameChanged = localizedName !== undefined && localizedName !== group.name;
+    var itemsChanged = localizedItems !== group[itemKey];
+    if (!nameChanged && !itemsChanged) return group;
+    changed = true;
+    return _objectSpread(_objectSpread(_objectSpread({}, group), nameChanged ? {
+      name: localizedName
+    } : {}), itemsChanged ? _defineProperty({}, itemKey, localizedItems) : {});
+  });
+  return changed ? localizedGroups : groups;
+}
+function applyI18nToBundleItems(items, locale) {
+  if (!Array.isArray(items)) return items;
+  var changed = false;
+  var localizedItems = items.map(function (item) {
+    if (!item || _typeof(item) !== 'object') return item;
+    var localizedTitle = resolveI18nValue(item.trans_title, locale);
+    var localizedOptionGroups = applyI18nToNamedGroups(item.option_group, 'option_item', locale);
+    var titleChanged = localizedTitle !== undefined && localizedTitle !== item.title;
+    var optionGroupsChanged = localizedOptionGroups !== item.option_group;
+    if (!titleChanged && !optionGroupsChanged) return item;
+    changed = true;
+    return _objectSpread(_objectSpread(_objectSpread({}, item), titleChanged ? {
+      title: localizedTitle
+    } : {}), optionGroupsChanged ? {
+      option_group: localizedOptionGroups
+    } : {});
+  });
+  return changed ? localizedItems : items;
+}
 
 /**
- * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ * 格式化套餐组名称、套餐子商品标题及子商品选项，同时保留未变化节点的引用。
+ */
+function applyI18nToBundleGroups(groups, locale) {
+  if (!Array.isArray(groups)) return groups;
+  var changed = false;
+  var localizedGroups = groups.map(function (group) {
+    if (!group || _typeof(group) !== 'object') return group;
+    var localizedName = resolveI18nValue(group.name_i18n, locale);
+    var localizedItems = applyI18nToBundleItems(group.bundle_item, locale);
+    var nameChanged = localizedName !== undefined && localizedName !== group.name;
+    var itemsChanged = localizedItems !== group.bundle_item;
+    if (!nameChanged && !itemsChanged) return group;
+    changed = true;
+    return _objectSpread(_objectSpread(_objectSpread({}, group), nameChanged ? {
+      name: localizedName
+    } : {}), itemsChanged ? {
+      bundle_item: localizedItems
+    } : {});
+  });
+  return changed ? localizedGroups : groups;
+}
+
+/**
+ * 根据 locale 格式化商品、分类、规格及套餐文案，缺少对应语言时回退 original。
  */
 export function applyI18nToProducts(products, locale) {
   if (!locale) return products;
@@ -210,12 +321,65 @@ export function applyI18nToProducts(products, locale) {
         originalKey = _Object$entries$_i[1];
       var i18nDict = product[i18nKey];
       if (!i18nDict) continue;
-      var localizedValue = i18nDict[locale];
-      if (localizedValue) {
+      var localizedValue = resolveI18nValue(i18nDict, locale);
+      if (localizedValue !== undefined && localizedValue !== product[originalKey]) {
         if (!patched) patched = _objectSpread({}, product);
         patched[originalKey] = localizedValue;
       }
     }
+    var _iterator = _createForOfIteratorHelper(['category', 'categories']),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var categoryKey = _step.value;
+        var categories = product[categoryKey];
+        var localizedCategories = applyI18nToCategories(categories, locale);
+        if (localizedCategories !== categories) {
+          if (!patched) patched = _objectSpread({}, product);
+          patched[categoryKey] = localizedCategories;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    var _iterator2 = _createForOfIteratorHelper([['option_group', 'option_item'], ['variant_group', 'variant_item']]),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _step2$value = _slicedToArray(_step2.value, 2),
+          groupKey = _step2$value[0],
+          itemKey = _step2$value[1];
+        var groups = product[groupKey];
+        var localizedGroups = applyI18nToNamedGroups(groups, itemKey, locale);
+        if (localizedGroups !== groups) {
+          if (!patched) patched = _objectSpread({}, product);
+          patched[groupKey] = localizedGroups;
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    var _iterator3 = _createForOfIteratorHelper(['bundle_group', 'bundle_groups']),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var bundleGroupKey = _step3.value;
+        var _groups = product[bundleGroupKey];
+        var _localizedGroups = applyI18nToBundleGroups(_groups, locale);
+        if (_localizedGroups !== _groups) {
+          if (!patched) patched = _objectSpread({}, product);
+          patched[bundleGroupKey] = _localizedGroups;
+        }
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
     return (_patched = patched) !== null && _patched !== void 0 ? _patched : product;
   });
 }
@@ -234,54 +398,54 @@ var formatDataKey = function formatDataKey(data) {
 
   // 单规格
   if (_data !== null && _data !== void 0 && (_data$option = _data.option) !== null && _data$option !== void 0 && _data$option.length) {
-    var _iterator = _createForOfIteratorHelper(_data.option),
-      _step;
+    var _iterator4 = _createForOfIteratorHelper(_data.option),
+      _step4;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var item = _step.value;
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var item = _step4.value;
         var _str = "_".concat(item.option_group_id, "_").concat(item.option_group_item_id);
         key += _str;
         rowKey += "".concat(_str, "_").concat(item.quantity || item.num);
       }
     } catch (err) {
-      _iterator.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator.f();
+      _iterator4.f();
     }
   }
 
   // 套餐
   if (_data !== null && _data !== void 0 && (_data$bundle = _data.bundle) !== null && _data$bundle !== void 0 && _data$bundle.length) {
-    var _iterator2 = _createForOfIteratorHelper(_data.bundle),
-      _step2;
+    var _iterator5 = _createForOfIteratorHelper(_data.bundle),
+      _step5;
     try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var _item = _step2.value;
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var _item = _step5.value;
         var _str2 = "_".concat(_item.group_id, "_").concat(_item.bundle_product_id);
         key += _str2;
         rowKey += "".concat(_str2, "_").concat(_item.quantity || _item.num);
         // 如果有单规格
         if (_item !== null && _item !== void 0 && _item.option) {
-          var _iterator3 = _createForOfIteratorHelper(_item.option),
-            _step3;
+          var _iterator6 = _createForOfIteratorHelper(_item.option),
+            _step6;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var opt = _step3.value;
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var opt = _step6.value;
               var _str3 = "_".concat(opt.option_group_id, "_").concat(opt.option_group_item_id);
               key += _str3;
               rowKey += "".concat(_str3, "_").concat(opt.quantity || opt.num);
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator6.e(err);
           } finally {
-            _iterator3.f();
+            _iterator6.f();
           }
         }
       }
     } catch (err) {
-      _iterator2.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator2.f();
+      _iterator5.f();
     }
   }
 

package/dist/server/utils/small-ticket.js

@@ -40,6 +40,7 @@ var LABELS = {
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
+    surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
     gross: 'Gross',
     tare: 'Tare'
@@ -66,6 +67,7 @@ var LABELS = {
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
+    surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -92,6 +94,7 @@ var LABELS = {
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
+    surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -760,11 +763,17 @@ function buildPaymentData(params) {
   return payments.filter(function (payment) {
     return isPrintablePayment(payment);
   }).map(function (payment) {
-    var _payment$amount;
+    var serviceFee = getPaymentServiceFee(payment);
     var items = [{
       item: paymentMethodName(payment, params.locale),
-      value: formatMoney((_payment$amount = payment.amount) !== null && _payment$amount !== void 0 ? _payment$amount : payment.origin_amount, params.currencySymbol)
+      value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), params.currencySymbol)
     }];
+    if (serviceFee.gt(0)) {
+      items.push({
+        item: label(params.locale, 'surchargeIncluded'),
+        value: formatMoney(serviceFee, params.currencySymbol)
+      });
+    }
     var fundRecord = getFundRecord(payment);
     if (fundRecord) {
       items.push.apply(items, _toConsumableArray(buildFundRecordPaymentItems({
@@ -790,6 +799,18 @@ function buildPaymentData(params) {
     return items;
   });
 }
+function getPaymentServiceFee(payment) {
+  return new Decimal(toMoneyNumber(payment.service_fee));
+}
+function resolveReceiptPaymentAmount(payment, serviceFee) {
+  var _payment$amount;
+  var amount = new Decimal(toMoneyNumber((_payment$amount = payment.amount) !== null && _payment$amount !== void 0 ? _payment$amount : payment.origin_amount));
+  var hasAmount = payment.amount !== undefined && payment.amount !== null && payment.amount !== '';
+  var hasOriginAmount = payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '';
+  if (!hasAmount || !hasOriginAmount || serviceFee.lte(0)) return amount;
+  var originAmount = new Decimal(toMoneyNumber(payment.origin_amount));
+  return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
+}
 function buildFundRecordPaymentItems(params) {
   var payment = params.payment,
     fundRecord = params.fundRecord,

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -197,8 +197,9 @@ export function transformBaseProductToOrderProduct(params) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
   // 从源头补充商品多语言标题
-  var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
-    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+  var productTitleI18n = (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {};
+  var productTitle = _objectSpread(_objectSpread({}, productTitleI18n), {}, {
+    original: productTitleI18n.original || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
   return _objectSpread(_objectSpread({
     product_id: productId,

package/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -234,15 +234,25 @@ class DataVariantEvaluator {
     if (!appliedInfo?.appliedFields?.length) {
       return originalItem;
     }
+
+    // 套餐加价/减价使用配置价；仅商品原价模式跟随子商品的 Data Variant 价格。
+    const isOriginalPriceBundleItem = originalItem.price_type === 'markup' && originalItem.price_type_ext === 'product_price';
+    const appliedFields = appliedInfo.appliedFields.filter(field => field !== 'price' || isOriginalPriceBundleItem);
+    if (!appliedFields.length) {
+      return originalItem;
+    }
     const result = {
       ...originalItem
     };
-    for (const field of appliedInfo.appliedFields) {
+    for (const field of appliedFields) {
       if (resolvedItem[field] !== undefined) {
         result[field] = resolvedItem[field];
       }
     }
-    result._dataVariant = appliedInfo;
+    result._dataVariant = {
+      ...appliedInfo,
+      appliedFields
+    };
     return result;
   }
   evaluateProductRules(rule, product, businessData, menuScopeMap) {

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

@@ -179,6 +179,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private normalizeDepositFlag;
+    private getHistoricalDepositSnapshot;
     private getLastOrderDepositSnapshot;
     private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;

package/lib/modules/Order/index.js

@@ -1008,19 +1008,26 @@ class OrderModule extends _BaseModule.BaseModule {
   normalizeDepositAmount(amount) {
     return _decimal.default.max(new _decimal.default(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
   }
-  getLastOrderDepositSnapshot() {
-    const lastOrderInfo = this.store.lastOrderInfo;
-    if (!lastOrderInfo || typeof lastOrderInfo !== 'object') return null;
-    const rawDepositAmount = lastOrderInfo.deposit_amount ?? lastOrderInfo.summary?.deposit_amount;
+  normalizeDepositFlag(value) {
+    if (value === 0 || value === '0') return 0;
+    if (value === 1 || value === '1') return 1;
+    return null;
+  }
+  getHistoricalDepositSnapshot(source) {
+    if (!source || typeof source !== 'object') return null;
+    const record = source;
+    const rawDepositAmount = record.deposit_amount ?? record.summary?.deposit_amount;
     const depositAmount = this.normalizeDepositAmount(rawDepositAmount ?? 0);
-    const hasDepositAmount = new _decimal.default(depositAmount).gt(0);
-    const isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
-    if (!isDeposit || !hasDepositAmount) return null;
+    if (!new _decimal.default(depositAmount).gt(0)) return null;
     return {
-      isDeposit: 1,
+      // 兼容历史数据：旧快照缺少 is_deposit 时，沿用正定金金额的推导规则。
+      isDeposit: this.normalizeDepositFlag(record.is_deposit) ?? 1,
       depositAmount
     };
   }
+  getLastOrderDepositSnapshot() {
+    return this.getHistoricalDepositSnapshot(this.store.lastOrderInfo);
+  }
   getLastOrderSubmitSnapshot() {
     const lastOrderInfo = this.store.lastOrderInfo;
     if (!lastOrderInfo || typeof lastOrderInfo !== 'object') return {};
@@ -1068,7 +1075,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     };
     tempOrder.deposit_amount = snapshot.depositAmount;
-    tempOrder.is_deposit = tempOrder.is_deposit === 0 && new _decimal.default(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+    tempOrder.is_deposit = snapshot.isDeposit;
     return nextSummary;
   }
   isDepositOrder(tempOrder, depositAmount) {
@@ -1605,10 +1612,17 @@ class OrderModule extends _BaseModule.BaseModule {
       ...(0, _lodashEs.cloneDeep)(snapshot.summary || {})
     };
     const shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+    const historicalDepositSnapshot = this.getHistoricalDepositSnapshot(snapshot);
     if (shouldUseManualDepositOverride) {
       summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
-    } else if (manualDepositOverride) {
-      this.clearManualDepositOverride(tempOrder);
+    } else {
+      if (manualDepositOverride) {
+        this.clearManualDepositOverride(tempOrder);
+      }
+      if (historicalDepositSnapshot) {
+        summary = this.applyDepositAmountToSummary(tempOrder, summary, historicalDepositSnapshot.depositAmount);
+        tempOrder.is_deposit = historicalDepositSnapshot.isDeposit;
+      }
     }
     const isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
     if (!isPayableAmountUnchanged) return null;
@@ -1625,8 +1639,8 @@ class OrderModule extends _BaseModule.BaseModule {
       tempOrder.surcharges = (0, _lodashEs.cloneDeep)(snapshot.surcharges);
     }
     tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
-    tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-    tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+    tempOrder.deposit_amount = this.normalizeDepositAmount(summary.deposit_amount || 0);
+    tempOrder.is_deposit = shouldUseManualDepositOverride ? new _decimal.default(tempOrder.deposit_amount).gt(0) ? 1 : 0 : historicalDepositSnapshot?.isDeposit ?? (new _decimal.default(tempOrder.deposit_amount).gt(0) ? 1 : 0);
     const previousSummary = this.store.summary;
     this.store.summary = summary;
     this.updateTempOrderPaymentStatus(tempOrder, {
@@ -2083,7 +2097,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const isExistingDepositDisabled = tempOrder.is_deposit === 0 && new _decimal.default(tempOrder.deposit_amount || 0).gt(0);
     tempOrder.deposit_amount = depositAmount;
     tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
-    return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
+    return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
     const tempOrder = options?.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
@@ -4469,6 +4483,7 @@ class OrderModule extends _BaseModule.BaseModule {
       externalSaleNumber: nextTempOrder.external_sale_number
     };
     const rawSummary = raw.summary && typeof raw.summary === 'object' ? raw.summary : {};
+    const historicalDepositSnapshot = this.getHistoricalDepositSnapshot(sourceLastOrderInfo);
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(s => ({
       ...(s || {})
     })) : (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []);
@@ -4487,6 +4502,10 @@ class OrderModule extends _BaseModule.BaseModule {
         surcharges: (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []),
         shop_discount: nextTempOrder.shop_discount || '0.00',
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || []),
+        ...(historicalDepositSnapshot ? {
+          is_deposit: historicalDepositSnapshot.isDeposit,
+          deposit_amount: historicalDepositSnapshot.depositAmount
+        } : {}),
         // merged record 的 summary 仍是远端旧值，保留快照仅用于完整重算的价格清理基线。
         ...(isMergedSalesDetailHydrate ? {
           requiresFullSummaryRecalculation: true

package/lib/modules/SalesSummary/index.js

@@ -133,7 +133,9 @@ class SalesSummaryModule extends _BaseModule.BaseModule {
       await this.getSurchargeList(summaryChannel);
     }
     const taxConfig = this.getTaxConfig();
-    const summarySchedule = this.core.getModule(`${this.name.split('_')[0]}_schedule`);
+    const fatherModuleName = this.otherParams?.fatherModule || this.name.replace(/_salesSummary$/, '');
+    const scheduleModuleName = `${fatherModuleName}_schedule`;
+    const summarySchedule = this.core.getModule(scheduleModuleName);
     const needScheduleIds = (this.store.surchargeList?.map(item => item.available_schedule_ids)?.flat() || []).filter(id => id !== undefined && id !== null && id !== '');
     const scheduleList = needScheduleIds.length > 0 ? summarySchedule?.getScheduleListByIds(needScheduleIds) : [];
     const scheduleById = {};

package/lib/server/index.js

@@ -3464,26 +3464,28 @@ class Server {
     if (!Array.isArray(bookings)) return '';
     const values = [];
     const seen = new Set();
-    const visitResource = resource => {
-      const identifier = this.getCheckoutResourceIdentifier(resource);
+    const visitResource = (resource, fallbackName) => {
+      const identifier = this.getCheckoutResourceIdentifier(resource, fallbackName);
       if (identifier && !seen.has(identifier)) {
         seen.add(identifier);
         values.push(identifier);
       }
       if (Array.isArray(resource?.children)) {
-        resource.children.forEach(visitResource);
+        resource.children.forEach(child => visitResource(child));
       }
     };
     bookings.forEach(booking => {
       if (Array.isArray(booking?.resources)) {
-        booking.resources.forEach(visitResource);
+        booking.resources.forEach((resource, index) => {
+          visitResource(resource, index === 0 ? booking?.relation_form_name : undefined);
+        });
       }
     });
     return values.join(',');
   }
-  getCheckoutResourceIdentifier(resource) {
+  getCheckoutResourceIdentifier(resource, fallbackName) {
     if (!resource || typeof resource !== 'object') return '';
-    const candidates = [resource.main_field, resource.name, resource.title, resource.metadata?.resource_name, resource.metadata?.name, resource.relation_id, resource.id];
+    const candidates = [resource.main_field, resource.name, resource.title, resource.metadata?.resource_name, resource.metadata?.name, fallbackName, resource.relation_id, resource.id];
     for (const candidate of candidates) {
       const value = this.stringifyCheckoutResourceIdentifier(candidate);
       if (value) return value;
@@ -5740,6 +5742,8 @@ class Server {
       schedule_datetime: context.schedule_datetime,
       customer_id: context.customer_id,
       strategy_context: context.strategy_context,
+      // 固定本次商品查询使用的语言，确保格式化与缓存使用同一份 locale 快照。
+      locale: this.core.context?.locale,
       menuList: this.menu?.getMenuList?.() || [],
       scheduleList: scheduleModule?.getScheduleList?.() || [],
       dataVariantEvaluator: this.core.context?.dataVariantEvaluator

package/lib/server/modules/products/index.d.ts

@@ -89,8 +89,8 @@ export declare class ProductsModule extends BaseModule implements Module {
     private buildBundleGroupPriceData;
     /**
      * 获取应用了价格的商品列表（带缓存）
-     * 使用日期作为缓存 key，同一天的商品价格会被缓存
-     * 缓存的是已经应用了价格的完整商品列表，避免重复转换
+     * 使用时间、客户、策略、商品范围和语言作为缓存 key
+     * 缓存的是已经应用了价格与多语言的完整商品列表，避免重复转换
      * @param schedule_date 日期
      * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
      * @param options 可选参数

package/lib/server/modules/products/index.js

@@ -30,7 +30,7 @@ class ProductsModule extends _BaseModule.BaseModule {
   logger; // LoggerManager 实例
   otherParams = {};
 
-  // 商品价格缓存：Map<日期, 应用了价格的商品列表>
+  // 商品格式化缓存：Map<查询上下文 key, 已应用价格与多语言的商品列表>
   productsPriceCache = new Map();
 
   // 缓存配置
@@ -394,8 +394,8 @@ class ProductsModule extends _BaseModule.BaseModule {
 
   /**
    * 获取应用了价格的商品列表（带缓存）
-   * 使用日期作为缓存 key，同一天的商品价格会被缓存
-   * 缓存的是已经应用了价格的完整商品列表，避免重复转换
+   * 使用时间、客户、策略、商品范围和语言作为缓存 key
+   * 缓存的是已经应用了价格与多语言的完整商品列表，避免重复转换
    * @param schedule_date 日期
    * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
    * @param options 可选参数
@@ -600,9 +600,10 @@ class ProductsModule extends _BaseModule.BaseModule {
   }
   getProductsPriceCacheKey(schedule_date, extraContext, productIds) {
     const datetime = extraContext?.schedule_datetime || schedule_date;
+    const locale = extraContext?.locale ?? this.core?.context?.locale ?? '';
     const productScope = productIds ? `:products:${productIds.join(',')}` : '';
     const strategyScope = this.stringifyStable(extraContext?.strategy_context || {});
-    return `${datetime}:customer:${extraContext?.customer_id ?? ''}:strategy:${strategyScope}${productScope}`;
+    return `${datetime}:locale:${locale}:customer:${extraContext?.customer_id ?? ''}` + `:strategy:${strategyScope}${productScope}`;
   }
 
   /**

package/lib/server/utils/product.d.ts

@@ -11,7 +11,7 @@ export declare function perfMark(label: string, durationMs: number, meta?: Recor
 export declare function applyPriceDataToProducts(products: ProductData[], priceData: LoadProductsPriceData[]): ProductData[];
 export declare const getIsSessionProduct: (product: ProductData) => boolean;
 /**
- * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ * 根据 locale 格式化商品、分类、规格及套餐文案，缺少对应语言时回退 original。
  */
 export declare function applyI18nToProducts(products: ProductData[], locale?: string): ProductData[];
 /**