@pisell/pisellos 2.2.248 → 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/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/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.248",
+  "version": "2.2.249",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",