@pisell/pisellos 2.3.95 → 2.3.96

package/lib/server/utils/product.js

@@ -194,9 +194,139 @@ const 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;
+  const localizedName = resolveI18nValue(category.name_i18n, locale);
+  const localizedParent = applyI18nToCategory(category.parent_category, locale);
+  const nameChanged = localizedName !== undefined && localizedName !== category.name;
+  const parentChanged = localizedParent !== category.parent_category;
+  if (!nameChanged && !parentChanged) return category;
+  return {
+    ...category,
+    ...(nameChanged ? {
+      name: localizedName
+    } : {}),
+    ...(parentChanged ? {
+      parent_category: localizedParent
+    } : {})
+  };
+}
+function applyI18nToCategories(categories, locale) {
+  if (!Array.isArray(categories)) return categories;
+  let changed = false;
+  const localizedCategories = categories.map(category => {
+    const 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;
+  let changed = false;
+  const localizedItems = items.map(item => {
+    if (!item || typeof item !== 'object') return item;
+    const localizedName = resolveI18nValue(item.name_i18n, locale);
+    if (localizedName === undefined || localizedName === item.name) return item;
+    changed = true;
+    return {
+      ...item,
+      name: localizedName
+    };
+  });
+  return changed ? localizedItems : items;
+}
+
+/**
+ * 格式化选项组、规格组及其子项名称，同时保留未变化节点的引用。
+ */
+function applyI18nToNamedGroups(groups, itemKey, locale) {
+  if (!Array.isArray(groups)) return groups;
+  let changed = false;
+  const localizedGroups = groups.map(group => {
+    if (!group || typeof group !== 'object') return group;
+    const localizedName = resolveI18nValue(group.name_i18n, locale);
+    const localizedItems = applyI18nToNamedItems(group[itemKey], locale);
+    const nameChanged = localizedName !== undefined && localizedName !== group.name;
+    const itemsChanged = localizedItems !== group[itemKey];
+    if (!nameChanged && !itemsChanged) return group;
+    changed = true;
+    return {
+      ...group,
+      ...(nameChanged ? {
+        name: localizedName
+      } : {}),
+      ...(itemsChanged ? {
+        [itemKey]: localizedItems
+      } : {})
+    };
+  });
+  return changed ? localizedGroups : groups;
+}
+function applyI18nToBundleItems(items, locale) {
+  if (!Array.isArray(items)) return items;
+  let changed = false;
+  const localizedItems = items.map(item => {
+    if (!item || typeof item !== 'object') return item;
+    const localizedTitle = resolveI18nValue(item.trans_title, locale);
+    const localizedOptionGroups = applyI18nToNamedGroups(item.option_group, 'option_item', locale);
+    const titleChanged = localizedTitle !== undefined && localizedTitle !== item.title;
+    const optionGroupsChanged = localizedOptionGroups !== item.option_group;
+    if (!titleChanged && !optionGroupsChanged) return item;
+    changed = true;
+    return {
+      ...item,
+      ...(titleChanged ? {
+        title: localizedTitle
+      } : {}),
+      ...(optionGroupsChanged ? {
+        option_group: localizedOptionGroups
+      } : {})
+    };
+  });
+  return changed ? localizedItems : items;
+}
 
 /**
- * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ * 格式化套餐组名称、套餐子商品标题及子商品选项，同时保留未变化节点的引用。
+ */
+function applyI18nToBundleGroups(groups, locale) {
+  if (!Array.isArray(groups)) return groups;
+  let changed = false;
+  const localizedGroups = groups.map(group => {
+    if (!group || typeof group !== 'object') return group;
+    const localizedName = resolveI18nValue(group.name_i18n, locale);
+    const localizedItems = applyI18nToBundleItems(group.bundle_item, locale);
+    const nameChanged = localizedName !== undefined && localizedName !== group.name;
+    const itemsChanged = localizedItems !== group.bundle_item;
+    if (!nameChanged && !itemsChanged) return group;
+    changed = true;
+    return {
+      ...group,
+      ...(nameChanged ? {
+        name: localizedName
+      } : {}),
+      ...(itemsChanged ? {
+        bundle_item: localizedItems
+      } : {})
+    };
+  });
+  return changed ? localizedGroups : groups;
+}
+
+/**
+ * 根据 locale 格式化商品、分类、规格及套餐文案，缺少对应语言时回退 original。
  */
 function applyI18nToProducts(products, locale) {
   if (!locale) return products;
@@ -205,14 +335,44 @@ function applyI18nToProducts(products, locale) {
     for (const [i18nKey, originalKey] of Object.entries(I18N_FIELD_MAP)) {
       const i18nDict = product[i18nKey];
       if (!i18nDict) continue;
-      const localizedValue = i18nDict[locale];
-      if (localizedValue) {
+      const localizedValue = resolveI18nValue(i18nDict, locale);
+      if (localizedValue !== undefined && localizedValue !== product[originalKey]) {
         if (!patched) patched = {
           ...product
         };
         patched[originalKey] = localizedValue;
       }
     }
+    for (const categoryKey of ['category', 'categories']) {
+      const categories = product[categoryKey];
+      const localizedCategories = applyI18nToCategories(categories, locale);
+      if (localizedCategories !== categories) {
+        if (!patched) patched = {
+          ...product
+        };
+        patched[categoryKey] = localizedCategories;
+      }
+    }
+    for (const [groupKey, itemKey] of [['option_group', 'option_item'], ['variant_group', 'variant_item']]) {
+      const groups = product[groupKey];
+      const localizedGroups = applyI18nToNamedGroups(groups, itemKey, locale);
+      if (localizedGroups !== groups) {
+        if (!patched) patched = {
+          ...product
+        };
+        patched[groupKey] = localizedGroups;
+      }
+    }
+    for (const bundleGroupKey of ['bundle_group', 'bundle_groups']) {
+      const groups = product[bundleGroupKey];
+      const localizedGroups = applyI18nToBundleGroups(groups, locale);
+      if (localizedGroups !== groups) {
+        if (!patched) patched = {
+          ...product
+        };
+        patched[bundleGroupKey] = localizedGroups;
+      }
+    }
     return patched ?? product;
   });
 }

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

@@ -32,6 +32,7 @@ const LABELS = {
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
+    surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
     gross: 'Gross',
     tare: 'Tare'
@@ -58,6 +59,7 @@ const LABELS = {
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
+    surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -84,6 +86,7 @@ const LABELS = {
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
+    surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -730,10 +733,17 @@ function buildResources(order, locale) {
 function buildPaymentData(params) {
   const payments = normalizeArray(params.order.payments);
   return payments.filter(payment => isPrintablePayment(payment)).map(payment => {
+    const serviceFee = getPaymentServiceFee(payment);
     const items = [{
       item: paymentMethodName(payment, params.locale),
-      value: formatMoney(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)
+      });
+    }
     const fundRecord = getFundRecord(payment);
     if (fundRecord) {
       items.push(...buildFundRecordPaymentItems({
@@ -758,6 +768,17 @@ function buildPaymentData(params) {
     return items;
   });
 }
+function getPaymentServiceFee(payment) {
+  return new _decimal.default(toMoneyNumber(payment.service_fee));
+}
+function resolveReceiptPaymentAmount(payment, serviceFee) {
+  const amount = new _decimal.default(toMoneyNumber(payment.amount ?? payment.origin_amount));
+  const hasAmount = payment.amount !== undefined && payment.amount !== null && payment.amount !== '';
+  const hasOriginAmount = payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '';
+  if (!hasAmount || !hasOriginAmount || serviceFee.lte(0)) return amount;
+  const originAmount = new _decimal.default(toMoneyNumber(payment.origin_amount));
+  return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
+}
 function buildFundRecordPaymentItems(params) {
   const {
     payment,

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

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

package/package.json

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