@pisell/pisellos 2.3.7 → 2.3.8

package/lib/modules/Order/utils.js

@@ -380,6 +380,42 @@ function normalizeOrderProductDiscountList(discountList) {
     return normalized;
   });
 }
+function resolveSubmitBundleMapId(bundle) {
+  var _a;
+  const metadataMapId = (_a = bundle.metadata) == null ? void 0 : _a.custom_product_bundle_map_id;
+  if (metadataMapId !== void 0 && metadataMapId !== null && metadataMapId !== "") {
+    return metadataMapId;
+  }
+  if (bundle._id !== void 0 && bundle._id !== null && bundle._id !== "") {
+    return bundle._id;
+  }
+  return void 0;
+}
+function collectSubmitProductDiscountList(product) {
+  const submitDiscountList = Array.isArray(product == null ? void 0 : product.discount_list) ? [...product.discount_list] : [];
+  for (const bundle of (product == null ? void 0 : product.product_bundle) || []) {
+    if (!bundle || typeof bundle !== "object")
+      continue;
+    const bundleMapId = resolveSubmitBundleMapId(bundle);
+    const bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
+    for (const discount of bundleDiscountList) {
+      if (!discount || typeof discount !== "object")
+        continue;
+      const discountMetadata = discount.metadata && typeof discount.metadata === "object" ? discount.metadata : {};
+      const discountMapId = discountMetadata.custom_product_bundle_map_id !== void 0 && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== "" ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
+      submitDiscountList.push({
+        ...discount,
+        ...discountMapId !== void 0 ? {
+          metadata: {
+            ...discountMetadata,
+            custom_product_bundle_map_id: discountMapId
+          }
+        } : {}
+      });
+    }
+  }
+  return normalizeOrderProductDiscountList(submitDiscountList);
+}
 function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
   var _a, _b;
   const metadata = params.metadata || {};
@@ -675,6 +711,10 @@ function formatSubmitBundleItems(bundle) {
   return bundle.map((b) => {
     const rawBundle = b && typeof b === "object" ? b : {};
     const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === "object" ? rawBundle.metadata : {};
+    const {
+      custom_product_bundle_map_id: _customProductBundleMapId,
+      ...submitMetadata
+    } = existedMetadata;
     const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
     const paymentPrice = rawBundle.bundle_payment_price !== void 0 && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== "" ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
     const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
@@ -687,6 +727,8 @@ function formatSubmitBundleItems(bundle) {
       0
     );
     const num = toBundleNumber(rawBundle.num ?? rawBundle.quantity, 1);
+    const bundleMapId = resolveSubmitBundleMapId(rawBundle);
+    const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     return {
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
@@ -704,7 +746,8 @@ function formatSubmitBundleItems(bundle) {
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
       bundle_product_id: (rawBundle == null ? void 0 : rawBundle.bundle_product_id) ?? (rawBundle == null ? void 0 : rawBundle._bundle_product_id),
       metadata: {
-        ...existedMetadata,
+        ...submitMetadata,
+        ...hasSubmitBundleDiscounts && bundleMapId !== void 0 ? { custom_product_bundle_map_id: bundleMapId } : {},
         surcharge_fee: surchargeFee,
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
@@ -769,7 +812,7 @@ function normalizeSubmitProduct(product) {
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
+    discount_list: collectSubmitProductDiscountList(submitProduct),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。

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

@@ -195,6 +195,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     /**
@@ -207,12 +208,14 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
@@ -229,7 +232,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
+    confirmPendingVoucherPayments(): OrderPaymentData[];
+    discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
     initWalletData(params?: {
         order_wait_pay_amount?: number;

package/lib/solution/BaseSales/index.js

@@ -165,10 +165,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return ["products", "order", "salesSummary", "schedule", "payment", "quotation"];
   }
   getReusableSharedSubModule(moduleName) {
-    var _a;
+    var _a, _b;
     if (moduleName !== "schedule" && moduleName !== "quotation")
       return null;
-    return ((_a = this.core) == null ? void 0 : _a.getModule(moduleName)) || null;
+    return ((_b = (_a = this.core) == null ? void 0 : _a.getModule) == null ? void 0 : _b.call(_a, moduleName)) || null;
   }
   isScheduleListLoaded(scheduleModule) {
     if (!scheduleModule)
@@ -1283,6 +1283,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
               if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                 d.isSelected = false;
                 d.isManualSelect = true;
+                d.appliedProductDetails = [];
               }
             }
           }
@@ -1291,16 +1292,32 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const selectedResourceIds = new Set(
         nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
       );
+      const filterSelectedDiscountDetails = (discountList) => (discountList || []).filter((pd) => {
+        var _a2;
+        const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+        return rid != null && selectedResourceIds.has(rid);
+      });
       for (const product of tempOrder.products) {
         const productUid = (_c = product.metadata) == null ? void 0 : _c.unique_identification_number;
         const runtimeOrigin = productUid ? (_f = (_e = (_d = tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[productUid]) == null ? void 0 : _f.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
-        product.discount_list = (product.discount_list || []).filter((pd) => {
-          var _a2;
-          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
-          return rid != null && selectedResourceIds.has(rid);
-        });
+        product.discount_list = filterSelectedDiscountDetails(product.discount_list);
+        if (Array.isArray(product.product_bundle)) {
+          product.product_bundle = product.product_bundle.map((bundle) => {
+            const nextBundleDiscountList = filterSelectedDiscountDetails(bundle == null ? void 0 : bundle.discount_list);
+            const shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
+            const restoredBundlePrice = (bundle == null ? void 0 : bundle.original_price) ?? (bundle == null ? void 0 : bundle.product_price) ?? (bundle == null ? void 0 : bundle.price);
+            return {
+              ...bundle,
+              ...shouldRestoreBundlePrice ? {
+                price: restoredBundlePrice,
+                bundle_selling_price: restoredBundlePrice
+              } : {},
+              discount_list: nextBundleDiscountList
+            };
+          });
+        }
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
           (sum, pd) => sum + (pd.amount || 0),
           0
@@ -1389,6 +1406,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrder(submitParams);
@@ -1408,6 +1426,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrderAsync(submitParams);
@@ -1599,10 +1618,20 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.deleteOrderPayment(paymentIdentity);
   }
   /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-  updateVoucherOrderPayments(payments) {
+  updateVoucherOrderPayments(payments, options) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.updateVoucherOrderPayments(payments, options);
+  }
+  confirmPendingVoucherPayments() {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.confirmPendingVoucherPayments();
+  }
+  discardPendingVoucherPayments() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.updateVoucherOrderPayments(payments);
+    return this.store.order.discardPendingVoucherPayments();
   }
   getWalletProductList() {
     var _a, _b, _c;

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 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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