@pisell/pisellos 2.3.55 → 2.3.57

package/lib/modules/Order/utils/discountProductLineIdentity.js

@@ -0,0 +1,170 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Order/utils/discountProductLineIdentity.ts
+var discountProductLineIdentity_exports = {};
+__export(discountProductLineIdentity_exports, {
+  DISCOUNT_SPLIT_ORIGIN_UID_KEY: () => DISCOUNT_SPLIT_ORIGIN_UID_KEY,
+  consolidateDiscountFreeProductLines: () => consolidateDiscountFreeProductLines,
+  ensureUniqueProductLineUids: () => ensureUniqueProductLineUids
+});
+module.exports = __toCommonJS(discountProductLineIdentity_exports);
+var import_lodash_es = require("lodash-es");
+var import_utils = require("../../../solution/ScanOrder/utils");
+var import_orderCollectionIdentity = require("./orderCollectionIdentity");
+var DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
+function getProductLineUid(product) {
+  var _a;
+  if (!product || typeof product !== "object")
+    return null;
+  const uid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ?? product.unique_identification_number;
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function getProductSkuOptions(product) {
+  var _a;
+  return Array.isArray((_a = product.product_sku) == null ? void 0 : _a.option) ? product.product_sku.option : [];
+}
+function hasProductLineNote(product) {
+  return typeof product.note === "string" && product.note.trim().length > 0;
+}
+function isManualProductDiscountLine(product) {
+  var _a, _b;
+  return ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || (product.discount_list || []).some((item) => (item == null ? void 0 : item.type) === "product");
+}
+function ensureProductsByUid(tempOrder) {
+  if (!tempOrder._extend || typeof tempOrder._extend !== "object") {
+    tempOrder._extend = { productsByUid: {} };
+  }
+  if (!tempOrder._extend.productsByUid) {
+    tempOrder._extend.productsByUid = {};
+  }
+  return tempOrder._extend.productsByUid;
+}
+function ensureUniqueProductLineUids(tempOrder) {
+  const usedUids = /* @__PURE__ */ new Set();
+  const productsByUid = ensureProductsByUid(tempOrder);
+  tempOrder.products = (tempOrder.products || []).map((product) => {
+    const sourceUid = getProductLineUid(product);
+    if (!sourceUid)
+      return product;
+    if (!usedUids.has(sourceUid)) {
+      usedUids.add(sourceUid);
+      return product;
+    }
+    let splitUid = (0, import_orderCollectionIdentity.createUuidV4)();
+    while (usedUids.has(splitUid)) {
+      splitUid = (0, import_orderCollectionIdentity.createUuidV4)();
+    }
+    product.metadata = {
+      ...product.metadata || {},
+      unique_identification_number: splitUid
+    };
+    const sourceRuntime = productsByUid[sourceUid] || {};
+    const discountSplitOriginUid = String(
+      sourceRuntime[DISCOUNT_SPLIT_ORIGIN_UID_KEY] || sourceUid
+    );
+    productsByUid[sourceUid] = {
+      ...sourceRuntime,
+      [DISCOUNT_SPLIT_ORIGIN_UID_KEY]: discountSplitOriginUid
+    };
+    productsByUid[splitUid] = {
+      ...(0, import_lodash_es.cloneDeep)(sourceRuntime),
+      [DISCOUNT_SPLIT_ORIGIN_UID_KEY]: discountSplitOriginUid
+    };
+    usedUids.add(splitUid);
+    return product;
+  });
+}
+function consolidateDiscountFreeProductLines(tempOrder) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  const consolidatedProducts = [];
+  const productIndexByKey = /* @__PURE__ */ new Map();
+  for (const product of tempOrder.products || []) {
+    const productBundle = Array.isArray(product.product_bundle) ? product.product_bundle : [];
+    const hasDiscount = (product.discount_list || []).length > 0 || productBundle.some((bundle) => ((bundle == null ? void 0 : bundle.discount_list) || []).length > 0);
+    const bookingUid = product.booking_uid ?? ((_a = product.metadata) == null ? void 0 : _a.booking_uid);
+    const bookingId = product.booking_id ?? ((_b = product.metadata) == null ? void 0 : _b.booking_id);
+    const orderDetailId = product.order_detail_id ?? product.orderDetailId;
+    const holderId = product.holder_id ?? ((_c = product.metadata) == null ? void 0 : _c.holder_id);
+    const hasMergeBoundary = hasDiscount || Boolean(((_d = product.metadata) == null ? void 0 : _d._giftInfo) || product._giftInfo) || Boolean((_e = product.metadata) == null ? void 0 : _e._promotion) || isManualProductDiscountLine(product) || hasProductLineNote(product) || Number(((_f = product.product_sku) == null ? void 0 : _f.open_sold_weight) || 0) === 1 || ((_g = product.metadata) == null ? void 0 : _g.is_edit_for_runtime) === true || bookingId !== void 0 && bookingId !== null && bookingId !== 0 && bookingId !== "0" || bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "" || holderId !== void 0 && holderId !== null && String(holderId) !== "" || orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "";
+    if (hasMergeBoundary) {
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const productUid = getProductLineUid(product);
+    const discountSplitOriginUid = productUid ? (_j = (_i = (_h = tempOrder._extend) == null ? void 0 : _h.productsByUid) == null ? void 0 : _i[productUid]) == null ? void 0 : _j[DISCOUNT_SPLIT_ORIGIN_UID_KEY] : void 0;
+    if (!discountSplitOriginUid) {
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const fingerprint = (0, import_utils.buildProductLineFingerprint)(
+      getProductSkuOptions(product),
+      productBundle
+    );
+    const priceSignature = JSON.stringify({
+      selling_price: String(product.selling_price ?? ""),
+      original_price: String(product.original_price ?? ""),
+      custom_price: String(product.custom_price ?? ""),
+      is_charge_tax: Number(product.is_charge_tax ?? 0),
+      gift_card: Number(product.gift_card ?? 0),
+      bundle_edit: Number(product.bundle_edit ?? 0),
+      price_schema_version: ((_k = product.metadata) == null ? void 0 : _k.price_schema_version) ?? "",
+      source_product_price: String(((_l = product.metadata) == null ? void 0 : _l.source_product_price) ?? ""),
+      main_product_selling_price: String(
+        ((_m = product.metadata) == null ? void 0 : _m.main_product_selling_price) ?? ""
+      ),
+      main_product_original_price: String(
+        ((_n = product.metadata) == null ? void 0 : _n.main_product_original_price) ?? ""
+      ),
+      bundle: productBundle.map((bundle) => ({
+        bundle_id: (bundle == null ? void 0 : bundle.bundle_id) ?? (bundle == null ? void 0 : bundle.id) ?? "",
+        product_id: (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id) ?? "",
+        product_variant_id: (bundle == null ? void 0 : bundle.bundle_variant_id) ?? (bundle == null ? void 0 : bundle.variant_id) ?? (bundle == null ? void 0 : bundle.product_variant_id) ?? 0,
+        price: String((bundle == null ? void 0 : bundle.price) ?? ""),
+        original_price: String((bundle == null ? void 0 : bundle.original_price) ?? ""),
+        bundle_selling_price: String((bundle == null ? void 0 : bundle.bundle_selling_price) ?? "")
+      }))
+    });
+    const mergeKey = [
+      discountSplitOriginUid,
+      product.product_id,
+      product.product_variant_id ?? 0,
+      fingerprint,
+      priceSignature
+    ].join("#");
+    const matchedIndex = productIndexByKey.get(mergeKey);
+    if (matchedIndex === void 0) {
+      productIndexByKey.set(mergeKey, consolidatedProducts.length);
+      consolidatedProducts.push(product);
+      continue;
+    }
+    const matchedProduct = consolidatedProducts[matchedIndex];
+    matchedProduct.num = (0, import_utils.getSafeProductNum)(
+      Number(matchedProduct.num || 0) + Number(product.num || 0)
+    );
+  }
+  tempOrder.products = consolidatedProducts;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DISCOUNT_SPLIT_ORIGIN_UID_KEY,
+  consolidateDiscountFreeProductLines,
+  ensureUniqueProductLineUids
+});

package/lib/modules/Rules/index.js

@@ -1045,16 +1045,60 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const arr = [];
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
+          const remainingQuantity = totalQuantity - splitCount;
+          const applicableNonGoodPassById = new Map(
+            applicableDiscounts.filter((discount) => (discount.tag || discount.type) !== "good_pass").map((discount) => [String(discount.id), discount])
+          );
+          const remainderDiscountList = (product.discount_list || []).filter((discount) => {
+            var _a3;
+            const discountType = discount.tag || discount.type;
+            if (discountType === "promotion")
+              return true;
+            if (discountType === "good_pass")
+              return false;
+            const resourceId = ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) ?? discount.id;
+            return resourceId !== void 0 && resourceId !== null && applicableNonGoodPassById.has(String(resourceId));
+          }).map((discount) => {
+            var _a3;
+            if ((discount.tag || discount.type) === "promotion")
+              return discount;
+            const resourceId = ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) ?? discount.id;
+            const matchedDiscount = applicableNonGoodPassById.get(String(resourceId));
+            if (matchedDiscount) {
+              usedDiscounts.set(matchedDiscount.id, true);
+              const appliedProducts = appliedDiscountProducts.get(matchedDiscount.id) || [];
+              appliedProducts.push({
+                ...discount,
+                _num: remainingQuantity
+              });
+              appliedDiscountProducts.set(matchedDiscount.id, appliedProducts);
+            }
+            return {
+              ...discount,
+              // _num 是 Rules 运行态的行数量；Order 写回 tempOrder 时会裁剪该字段。
+              _num: remainingQuantity
+            };
+          });
+          const hasRetainedWalletDiscount = remainderDiscountList.some(
+            (discount) => !["promotion", "good_pass"].includes(discount.tag || discount.type)
+          );
           let total = product.origin_total ?? product.total;
           if ((product.discount_list || []).some((item) => item.type === "promotion")) {
             total = product.total ?? product.origin_total;
           }
           arr.push(
             this.hooks.setProduct(originProduct, {
-              discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
-              quantity: totalQuantity - splitCount,
+              // 商品券只替换被拆出的 splitCount 件。余量行原本仍有效的折扣卡
+              // 不能随 good_pass 拆分一起清除；已取消或已失效的折扣不会进入此列表。
+              discount_list: remainderDiscountList,
+              quantity: remainingQuantity,
               _id: product._id.split("___")[0],
-              total
+              total,
+              // 保留余量行当前的折后主价；Order.applyProductDiscountPrices 随后会基于
+              // source_product_price + discount_list 再归一化，避免出现重复折扣。
+              ...hasRetainedWalletDiscount ? {
+                main_product_selling_price: product.main_product_selling_price ?? product.price
+              } : {}
             })
           );
         }

package/lib/solution/BaseSales/index.js

@@ -73,8 +73,11 @@ function isRejectedSalesSubmitResult(result) {
   return candidates.some((candidate) => {
     if (!candidate || typeof candidate !== "object")
       return false;
-    const responseCode = Number(candidate.code ?? candidate.statusCode);
-    if (Number.isFinite(responseCode) && responseCode >= 400)
+    if (candidate.code !== void 0 && candidate.code !== 200 && candidate.code !== "200") {
+      return true;
+    }
+    const statusCode = Number(candidate.statusCode);
+    if (Number.isFinite(statusCode) && statusCode >= 400)
       return true;
     if (candidate.status === false || candidate.success === false || candidate.result === false) {
       return true;
@@ -84,9 +87,9 @@ function isRejectedSalesSubmitResult(result) {
     );
   });
 }
-function getSalesSubmitErrorMessage(result) {
+function getSalesSubmitErrorMessage(result, fallbackMessage) {
   var _a, _b;
-  return (result == null ? void 0 : result.message) || (result == null ? void 0 : result.msg) || ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.message) || ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.msg) || "Wallet 支付确认失败";
+  return (result == null ? void 0 : result.message) || (result == null ? void 0 : result.msg) || ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.message) || ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.msg) || fallbackMessage;
 }
 function toWalletFundValue(value) {
   try {
@@ -2658,7 +2661,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async scanWalletAsset(code) {
     if (!this.store.payment)
       throw new Error("payment 模块未初始化");
-    const result = await this.store.payment.wallet.scanWalletAssetAsync(code);
+    const wallet = this.store.payment.wallet;
+    const businessData = this.buildWalletInitBusinessData();
+    if (businessData) {
+      wallet.generateWalletParams(businessData);
+    }
+    const result = await wallet.scanWalletAssetAsync(code);
     if (result.type === "normalCode") {
       await this.syncSelectedWalletAssets(result.state);
       await this.publishWalletAssetsState(result.state);
@@ -2786,7 +2794,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         confirmPendingVoucherPayments: true
       });
       if (isRejectedSalesSubmitResult(submitResult)) {
-        throw new Error(getSalesSubmitErrorMessage(submitResult));
+        throw new Error(
+          getSalesSubmitErrorMessage(submitResult, "Wallet 支付确认失败")
+        );
       }
     } catch (error) {
       this.store.order.setOrderPayments(beforePayments);
@@ -2889,6 +2899,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: 1,
         confirmPendingVoucherPayments: true
       });
+      if (isRejectedSalesSubmitResult(syncResult.submitResult)) {
+        throw new Error(
+          getSalesSubmitErrorMessage(syncResult.submitResult, "订单提交失败")
+        );
+      }
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(
@@ -2999,6 +3014,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: 1,
         confirmPendingVoucherPayments: true
       });
+      if (isRejectedSalesSubmitResult(syncResult.submitResult)) {
+        throw new Error(
+          getSalesSubmitErrorMessage(syncResult.submitResult, "订单提交失败")
+        );
+      }
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(

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

@@ -366,11 +366,29 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
+function hasGoodPassDiscount(product) {
+  var _a, _b;
+  const productBundle = Array.isArray(product == null ? void 0 : product.product_bundle) ? product.product_bundle : [];
+  const extendedBundle = Array.isArray((_b = (_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) ? product._extend.other.bundle : [];
+  const discountLists = [
+    product == null ? void 0 : product.discount_list,
+    ...productBundle.map((item) => item == null ? void 0 : item.discount_list),
+    ...extendedBundle.map((item) => item == null ? void 0 : item.discount_list)
+  ];
+  return discountLists.some(
+    (discountList) => Array.isArray(discountList) && discountList.some(
+      (item) => (item == null ? void 0 : item.type) === "good_pass" || (item == null ? void 0 : item.tag) === "good_pass"
+    )
+  );
+}
 function getPromotionLineMergeBoundary(product) {
   var _a, _b;
   if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
     return `custom:${getOrderProductUid(product)}`;
   }
+  if (hasGoodPassDiscount(product)) {
+    return `good-pass:${getOrderProductUid(product)}`;
+  }
   if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;
   }

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

@@ -217,7 +217,7 @@ function transformBaseProductToOrderProduct(params) {
   }
   const productTitle = {
     ...(sourceProduct == null ? void 0 : sourceProduct.title_i18n) || {},
-    original: (sourceProduct == null ? void 0 : sourceProduct.title) || ""
+    original: (sourceProduct == null ? void 0 : sourceProduct.original_title) || (sourceProduct == null ? void 0 : sourceProduct.title) || ""
   };
   return {
     product_id: productId,

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

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

package/lib/solution/BookingTicket/index.js

@@ -1576,10 +1576,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       });
     }
     if (typeof this.store.order.addProductsToOrder === "function") {
-      return this.store.order.addProductsToOrder(orderLines, {
-        skipEditDiscountConfigRefresh: true,
-        skipDiscountRecalculation: true
-      });
+      return this.store.order.addProductsToOrder(orderLines);
     }
     const result = [];
     for (const line of orderLines) {

package/package.json

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