@pisell/pisellos 2.2.247 → 2.2.249

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

@@ -1183,6 +1183,55 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return result;
   }
+  getPaymentMergeKey(payment) {
+    var _a;
+    const record = payment;
+    if (!record)
+      return "";
+    const uniquePaymentNumber = (_a = record.metadata) == null ? void 0 : _a.unique_payment_number;
+    if (!this.isBlankIdentityValue(uniquePaymentNumber)) {
+      return `unique:${String(uniquePaymentNumber)}`;
+    }
+    const orderPaymentId = record.order_payment_id;
+    if (!this.isBlankIdentityValue(orderPaymentId))
+      return `order_payment:${String(orderPaymentId)}`;
+    const code = record.code;
+    const customPaymentId = record.custom_payment_id;
+    if (!this.isBlankIdentityValue(code) && !this.isBlankIdentityValue(customPaymentId)) {
+      return `custom:${String(code)}#${String(customPaymentId)}`;
+    }
+    return "";
+  }
+  mergeOrderPaymentLists(existing, incoming) {
+    const existingList = Array.isArray(existing) ? existing : [];
+    const incomingList = Array.isArray(incoming) ? incoming : [];
+    if (incomingList.length === 0)
+      return (0, import_lodash_es.cloneDeep)(existingList);
+    if (existingList.length === 0)
+      return (0, import_lodash_es.cloneDeep)(incomingList);
+    const existingByKey = /* @__PURE__ */ new Map();
+    for (const payment of existingList) {
+      const key = this.getPaymentMergeKey(payment);
+      if (!key)
+        continue;
+      existingByKey.set(key, payment);
+    }
+    return incomingList.map((payment) => {
+      const incomingPayment = payment;
+      const key = this.getPaymentMergeKey(incomingPayment);
+      const existingPayment = key ? existingByKey.get(key) : void 0;
+      if (!existingPayment)
+        return (0, import_lodash_es.cloneDeep)(incomingPayment);
+      return {
+        ...(0, import_lodash_es.cloneDeep)(existingPayment),
+        ...(0, import_lodash_es.cloneDeep)(incomingPayment),
+        metadata: {
+          ...(0, import_lodash_es.cloneDeep)(existingPayment.metadata || {}),
+          ...(0, import_lodash_es.cloneDeep)(incomingPayment.metadata || {})
+        }
+      };
+    });
+  }
   mergeOrderRecords(existing, incoming, options) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
@@ -1204,7 +1253,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "updated_at",
       "shop_discount",
       "summary",
-      "payments",
       "products",
       "bookings"
     ];
@@ -1212,6 +1260,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const preferredRecord = preferred;
     const secondaryRecord = secondary;
     const incomingRecord = incoming;
+    const previousRecord = preferred === incoming ? secondaryRecord : preferredRecord;
     for (const field of fieldsToPreserve) {
       if (!this.isBlankIdentityValue(preferredRecord[field])) {
         mergedRecord[field] = preferredRecord[field];
@@ -1233,6 +1282,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
     }
     mergedRecord.products = shouldUseIncomingProductsSnapshot ? (0, import_lodash_es.cloneDeep)(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
+    if (Object.prototype.hasOwnProperty.call(incomingRecord, "payments")) {
+      if (Array.isArray(incomingRecord.payments)) {
+        mergedRecord.payments = this.mergeOrderPaymentLists(
+          previousRecord.payments,
+          incomingRecord.payments
+        );
+      } else if (incomingRecord.payments !== void 0 && incomingRecord.payments !== null) {
+        mergedRecord.payments = (0, import_lodash_es.cloneDeep)(incomingRecord.payments);
+      }
+    }
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

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

@@ -59,7 +59,9 @@ var LABELS = {
     orderDiscount: "Order discount",
     manualDiscount: "Manual discount",
     payProcessingFee: "Pay processing fee",
-    rounding: "Rounding"
+    rounding: "Rounding",
+    gross: "Gross",
+    tare: "Tare"
   },
   zh_CN: {
     contactName: "联系人姓名",
@@ -83,7 +85,9 @@ var LABELS = {
     orderDiscount: "整单折扣",
     manualDiscount: "手动折扣",
     payProcessingFee: "支付手续费",
-    rounding: "抹零"
+    rounding: "抹零",
+    gross: "重量",
+    tare: "去皮"
   },
   zh_HK: {
     contactName: "聯絡人姓名",
@@ -107,7 +111,9 @@ var LABELS = {
     orderDiscount: "整單折扣",
     manualDiscount: "手動折扣",
     payProcessingFee: "支付手續費",
-    rounding: "抹零"
+    rounding: "抹零",
+    gross: "重量",
+    tare: "去皮"
   }
 };
 function buildSmallTicketData(params) {
@@ -187,14 +193,21 @@ function buildProducts(order, locale, productMap) {
       parentProduct
     });
     const resolvedVariant = resolveProductVariantText({ product, parentProduct, locale });
-    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol });
+    const extensionList = buildProductExtensionList({
+      product,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice
+    });
+    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol, quantity });
     return {
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
-      extension_list: Array.isArray(product.extension_list) ? product.extension_list : [],
+      extension_list: extensionList,
       ...discountList.length ? { discount_list: discountList } : {},
       ...options.length ? { options } : {},
       ...resolvedVariant ? { variant: resolvedVariant } : {},
@@ -203,11 +216,11 @@ function buildProducts(order, locale, productMap) {
   });
 }
 function normalizeProductDiscounts(params) {
-  const { product, locale, currencySymbol } = params;
+  const { product, locale, currencySymbol, quantity } = params;
   return normalizeArray(product.discount_list).map((discount) => {
-    const title = resolveDiscountTitle(discount, locale);
+    const title = resolveDiscountTitleWithPercent(discount, locale);
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
-    const formattedAmount = formatNegativeMoney(amount, currencySymbol);
+    const formattedAmount = formatNegativeMoney(new import_decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
     return {
       ...discount,
       item: title,
@@ -217,6 +230,63 @@ function normalizeProductDiscounts(params) {
     };
   });
 }
+function buildProductExtensionList(params) {
+  const { product, locale, currencySymbol, quantity, originalPrice } = params;
+  const extensionList = [
+    ...buildProductOpenWeightRows({ product, locale, currencySymbol }),
+    ...quantity > 1 ? [{
+      item: buildProductQuantityPriceText({ quantity, currencySymbol, price: originalPrice }),
+      value: ""
+    }] : []
+  ];
+  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+}
+function buildProductOpenWeightRows(params) {
+  const { product, locale, currencySymbol } = params;
+  const productSku = product.product_sku || {};
+  if (productSku.open_sold_weight != 1)
+    return [];
+  const unit = productSku.unit ?? "";
+  const manualFlag = productSku.weight_source === "manual" ? "(M) " : "";
+  const hasTare = toNumber(productSku.tare_weight, 0) > 0;
+  const rows = [];
+  if (hasTare) {
+    rows.push({
+      item: `${manualFlag}${label(locale, "gross")}: ${productSku.weight ?? 0}${unit}`,
+      value: ""
+    });
+    rows.push({
+      item: `${label(locale, "tare")}: ${productSku.tare_weight}${unit}`,
+      value: ""
+    });
+  }
+  const netWeight = productSku.net_weight ?? 0;
+  const unitPrice = productSku.unit_price ?? 0;
+  const netItem = `${netWeight} ${unit} NET @ ${currencySymbol}${unitPrice}/${unit}`;
+  rows.push({
+    item: hasTare ? netItem : `${manualFlag}${netItem}`,
+    value: ""
+  });
+  return rows;
+}
+function buildProductQuantityPriceText(params) {
+  const { quantity, currencySymbol, price } = params;
+  return `${quantity} @ ${currencySymbol}${stringify(price)} EACH`;
+}
+function resolveDiscountTitleWithPercent(discount, locale) {
+  var _a, _b;
+  const title = resolveDiscountTitle(discount, locale);
+  const percentRaw = (_a = discount.discount) == null ? void 0 : _a.percent;
+  const cardType = ((_b = discount.discount) == null ? void 0 : _b.discount_card_type) ?? "percent";
+  const percent = percentRaw !== void 0 && percentRaw !== null ? Math.trunc(Number(percentRaw)) : NaN;
+  if (percentRaw === void 0 || percentRaw === null)
+    return title;
+  if (cardType !== "percent")
+    return title;
+  if (Number.isNaN(percent))
+    return title;
+  return `${title} (${percent}%)`;
+}
 function resolveDiscountTitle(discount, locale) {
   var _a, _b, _c;
   const title = getLocalizedValue(
@@ -540,14 +610,14 @@ function buildFees(params) {
       value: formatMoney(payProcessingFee, currencySymbol)
     });
   }
+  const productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
+  const productOriginalAmount = summary.product_original_amount ?? order.product_original_amount ?? productExpectAmount;
+  const totalSavingsAmount = new import_decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
-      product_expect_amount: formatMoney(
-        summary.product_expect_amount || summary.product_amount || order.product_expect_amount,
-        currencySymbol
-      ),
+      product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(
         summary.product_quantity || products.reduce((sum, product) => sum + product.product_quantity, 0),
@@ -558,7 +628,7 @@ function buildFees(params) {
       tax_title: stringify(summary.tax_title || order.tax_title || shopInfo.tax_title),
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol),
       ...isNonZero(roundingAmount) ? { rounding_amount: formatMoney(roundingAmount, currencySymbol) } : {},
-      ...isNonZero(discountAmount) ? { order_total_discount: formatMoney(discountAmount, currencySymbol) } : {},
+      ...isNonZero(totalSavingsAmount) ? { order_total_discount: formatMoney(totalSavingsAmount, currencySymbol) } : {},
       ...isNonZero(payProcessingFee) ? { pay_processing_fee: formatMoney(payProcessingFee, currencySymbol) } : {},
       ...isNonZero(taxFee) ? { tax_fee: formatMoney(taxFee, currencySymbol) } : {}
     }

package/lib/solution/BaseSales/index.js

@@ -70,6 +70,11 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function isBaseSalesHistoricalDiscountEntry(discount) {
+  return Boolean(
+    (discount == null ? void 0 : discount.isEditMode) || (discount == null ? void 0 : discount.isDisabled) || (discount == null ? void 0 : discount.order_discount_id) != null
+  );
+}
 function getBaseSalesUniqueArrayMetadataKey(key) {
   if (key === "products" || key === "bookings")
     return "unique_identification_number";
@@ -883,7 +888,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const historyIds = new Set(historyDiscountList.map((discount) => discount.id));
     return [
       ...historyDiscountList,
-      ...(discountList || []).filter((discount) => !historyIds.has(discount.id))
+      ...(discountList || []).filter((discount) => {
+        if (!historyIds.has(discount.id))
+          return true;
+        return !isBaseSalesHistoricalDiscountEntry(discount);
+      })
     ];
   }
   shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
@@ -906,11 +915,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length)
       return discountList;
-    const currentDiscountMap = new Map(
-      currentDiscountList.map((discount) => [discount.id, discount])
-    );
+    const currentDiscountMap = /* @__PURE__ */ new Map();
+    currentDiscountList.forEach((discount) => {
+      currentDiscountMap.set(
+        `${discount.id}:${isBaseSalesHistoricalDiscountEntry(discount) ? "historical" : "runtime"}`,
+        discount
+      );
+    });
     return discountList.map((discount) => {
-      const currentDiscount = currentDiscountMap.get(discount.id);
+      const currentDiscount = currentDiscountMap.get(
+        `${discount.id}:${isBaseSalesHistoricalDiscountEntry(discount) ? "historical" : "runtime"}`
+      );
       if (!currentDiscount)
         return discount;
       if (currentDiscount.isManualSelect) {
@@ -1145,7 +1160,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         throw new Error("order 模块未初始化");
       const list = this.store.order.getDiscountList();
       const updated = list.map(
-        (d) => d.id === params.discountId ? {
+        (d) => d.id === params.discountId && !isBaseSalesHistoricalDiscountEntry(d) ? {
           ...d,
           isSelected: params.isSelected,
           isManualSelect: !params.isSelected

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

@@ -207,6 +207,10 @@ function transformBaseProductToOrderProduct(params) {
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
+  const productTitle = {
+    ...(sourceProduct == null ? void 0 : sourceProduct.title_i18n) || {},
+    original: (sourceProduct == null ? void 0 : sourceProduct.title) || ""
+  };
   return {
     product_id: productId,
     product_variant_id: productVariantId,
@@ -231,6 +235,7 @@ function transformBaseProductToOrderProduct(params) {
     ),
     metadata,
     note: payload.note != null ? String(payload.note) : "",
+    product_title: productTitle,
     _origin: {
       ...sourceProduct || {},
       callbackData: payload

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -441,19 +441,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/package.json

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