@pisell/pisellos 2.2.248 → 2.2.250

package/lib/modules/Order/index.js

@@ -805,9 +805,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.order_id) ?? (result == null ? void 0 : result.order_id) ?? ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.id) ?? (result == null ? void 0 : result.id) ?? null;
   }
   calculatePaymentEffectiveAmount(payment) {
-    const amount = new import_decimal.default(payment.amount || 0).minus(new import_decimal.default(payment.service_fee || 0));
+    const amount = new import_decimal.default(payment.amount || 0);
+    const originAmount = new import_decimal.default(payment.origin_amount ?? payment.amount ?? 0);
+    const serviceFee = new import_decimal.default(payment.service_fee || 0);
+    const effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
     const rounding = new import_decimal.default(payment.rounding_amount || 0);
-    return amount.minus(rounding);
+    return effectiveAmount.minus(rounding);
   }
   calculatePaymentTotal(payments) {
     return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {

package/lib/server/index.d.ts

@@ -422,6 +422,10 @@ declare class Server {
     private canAssignStringProductTitleToLocale;
     private hasCjkText;
     private resolveFirstProductTitleValue;
+    private getPaymentCodeKey;
+    private isBlankPaymentName;
+    private shouldLookupPaymentMethodNameByCode;
+    private enrichPaymentNamesByCode;
     private withLocalSmallTicketData;
     private handleOrderSalesDetail;
     /**

package/lib/server/index.js

@@ -3091,22 +3091,85 @@ var Server = class {
     );
     return firstValue === void 0 ? null : String(firstValue);
   }
+  getPaymentCodeKey(code) {
+    if (code === void 0 || code === null)
+      return "";
+    return String(code).trim().toUpperCase();
+  }
+  isBlankPaymentName(name) {
+    if (name === void 0 || name === null)
+      return true;
+    if (typeof name === "string")
+      return name.trim() === "";
+    return false;
+  }
+  shouldLookupPaymentMethodNameByCode(code) {
+    const codeKey = this.getPaymentCodeKey(code);
+    if (!codeKey)
+      return false;
+    const builtInNameTokens = ["CASH", "EFTPOS", "CARD", "WALLET", "GIFT"];
+    return !builtInNameTokens.some((token) => codeKey.includes(token));
+  }
+  async enrichPaymentNamesByCode(order) {
+    const payments = Array.isArray(order == null ? void 0 : order.payments) ? order.payments : [];
+    const hasMissingName = payments.some((payment) => this.isBlankPaymentName(payment == null ? void 0 : payment.name) && this.shouldLookupPaymentMethodNameByCode(payment == null ? void 0 : payment.code));
+    if (!hasMissingName)
+      return order;
+    try {
+      const paymentModule = await this.getPaymentRouteModule();
+      const payMethods = await paymentModule.getPayMethodListAsync();
+      const nameByCode = /* @__PURE__ */ new Map();
+      for (const method of payMethods || []) {
+        const codeKey = this.getPaymentCodeKey(method == null ? void 0 : method.code);
+        const name = this.resolveFirstProductTitleValue(method == null ? void 0 : method.name);
+        if (codeKey && name)
+          nameByCode.set(codeKey, name);
+      }
+      let hasResolvedName = false;
+      const enrichedPayments = payments.map((payment) => {
+        if (!this.isBlankPaymentName(payment == null ? void 0 : payment.name))
+          return payment;
+        if (!this.shouldLookupPaymentMethodNameByCode(payment == null ? void 0 : payment.code))
+          return payment;
+        const name = nameByCode.get(this.getPaymentCodeKey(payment == null ? void 0 : payment.code));
+        if (!name)
+          return payment;
+        hasResolvedName = true;
+        return {
+          ...payment,
+          name
+        };
+      });
+      if (!hasResolvedName)
+        return order;
+      return {
+        ...order,
+        payments: enrichedPayments
+      };
+    } catch (error) {
+      this.logWarning("enrichPaymentNamesByCode: 支付方式名称回填失败", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return order;
+    }
+  }
   async withLocalSmallTicketData(order, options) {
     if (!this.shouldBuildSmallTicketData(order))
       return order;
     if ((options == null ? void 0 : options.requireFullyPaid) && !this.isSalesOrderFullyPaid(order))
       return order;
     try {
-      const productMap = (options == null ? void 0 : options.productMap) ?? await this.buildSmallTicketProductMap(order);
+      const enrichedOrder = await this.enrichPaymentNamesByCode(order);
+      const productMap = (options == null ? void 0 : options.productMap) ?? await this.buildSmallTicketProductMap(enrichedOrder);
       const smallTicketData = (0, import_small_ticket.buildSmallTicketData)({
-        order,
+        order: enrichedOrder,
         shopInfo: this.getSmallTicketShopInfo(),
         productMap
       });
       return {
-        ...order,
+        ...enrichedOrder,
         payment_info: {
-          ...order.payment_info || {},
+          ...enrichedOrder.payment_info || {},
           small_ticket_data: smallTicketData
         }
       };
@@ -3985,6 +4048,8 @@ var Server = class {
     if (changedOrders.length === 0) {
       return;
     }
+    if (window.isPaymentModalPluginOpen)
+      return;
     for (const [subscriberId, subscriber] of this.salesSearchSubscribers.entries()) {
       try {
         const changedVisibleOrders = changedOrders.filter((order) => {

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

@@ -193,8 +193,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
-    private getProductMergeKey;
+    private getProductIdentityKeys;
     private mergeOrderProductLists;
+    private getPaymentMergeKey;
+    private mergeOrderPaymentLists;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;

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

@@ -1141,24 +1141,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return right;
     return left;
   }
-  getProductMergeKey(product) {
+  getProductIdentityKeys(product) {
     var _a;
     const record = product;
     if (!record)
-      return "";
+      return [];
+    const keys = [];
     const metadataUid = (_a = record.metadata) == null ? void 0 : _a.unique_identification_number;
     if (!this.isBlankIdentityValue(metadataUid))
-      return `uid:${String(metadataUid)}`;
+      keys.push(`uid:${String(metadataUid)}`);
     const topLevelUid = record.unique_identification_number;
     if (!this.isBlankIdentityValue(topLevelUid))
-      return `uid:${String(topLevelUid)}`;
+      keys.push(`uid:${String(topLevelUid)}`);
     const orderDetailId = record.order_detail_id;
     if (!this.isBlankIdentityValue(orderDetailId))
-      return `detail:${String(orderDetailId)}`;
+      keys.push(`detail:${String(orderDetailId)}`);
     const bookingUid = record.booking_uid;
     if (!this.isBlankIdentityValue(bookingUid))
-      return `booking:${String(bookingUid)}`;
-    return "";
+      keys.push(`booking:${String(bookingUid)}`);
+    return keys;
   }
   mergeOrderProductLists(preferred, secondary) {
     const preferredList = Array.isArray(preferred) ? preferred : [];
@@ -1169,20 +1170,70 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return secondaryList;
     const seenKeys = /* @__PURE__ */ new Set();
     for (const item of preferredList) {
-      const key = this.getProductMergeKey(item);
-      if (key)
+      const keys = this.getProductIdentityKeys(item);
+      for (const key of keys)
         seenKeys.add(key);
     }
     const result = [...preferredList];
     for (const item of secondaryList) {
-      const key = this.getProductMergeKey(item);
-      if (!key || seenKeys.has(key))
+      const keys = this.getProductIdentityKeys(item);
+      if (keys.length === 0 || keys.some((key) => seenKeys.has(key)))
         continue;
-      seenKeys.add(key);
+      for (const key of keys)
+        seenKeys.add(key);
       result.push((0, import_lodash_es.cloneDeep)(item));
     }
     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 +1255,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "updated_at",
       "shop_discount",
       "summary",
-      "payments",
       "products",
       "bookings"
     ];
@@ -1212,6 +1262,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 +1284,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/solution/BaseSales/index.js

@@ -1465,8 +1465,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const paymentTimestamp = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
     const paymentTime = paymentRecord.payment_time ?? paymentTimestamp;
     const createdAt = paymentRecord.created_at ?? paymentTimestamp;
+    const serviceCharge = paymentRecord.service_charge && typeof paymentRecord.service_charge === "object" ? paymentRecord.service_charge : null;
+    const calculatedServiceFee = serviceCharge ? new import_decimal.default(paymentRecord.origin_amount ?? paymentRecord.amount ?? 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : void 0;
     const payments = this.store.order.addOrderPayment({
       ...paymentRecord,
+      ...calculatedServiceFee !== void 0 ? { service_fee: calculatedServiceFee } : {},
       metadata,
       payment_time: paymentTime,
       created_at: createdAt

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/package.json

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