@pisell/pisellos 2.2.266 → 2.2.268

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

@@ -77,43 +77,19 @@ function getOrderProductOriginalPriceForPromotion(product) {
   }
   return getOrderProductBasePrice(product);
 }
-var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
-var ITEM_REWARD = "ITEM_REWARD";
-function isItemRewardPromotionDiscountItem(item) {
-  var _a, _b;
-  return (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === ITEM_REWARD;
-}
-function isManagedPromotionDiscountItem(item) {
-  if ((item == null ? void 0 : item.type) === "promotion")
-    return true;
-  return isItemRewardPromotionDiscountItem(item);
-}
-function wasInPromotionBeforeEvaluation(item) {
-  var _a, _b;
-  if (((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true)
-    return true;
-  return Array.isArray(item == null ? void 0 : item.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
-}
-function updatePromotionDiscountList(item, promotionDiscount, options) {
+function updatePromotionDiscountList(item, promotionDiscount) {
   let discountList = Array.isArray(item.discount_list) ? [...item.discount_list] : [];
-  discountList = discountList.filter((d) => !isManagedPromotionDiscountItem(d));
+  discountList = discountList.filter((d) => (d == null ? void 0 : d.type) !== "promotion");
   if (promotionDiscount) {
-    const discountType = (options == null ? void 0 : options.discountType) || "promotion";
     discountList.push({
-      type: discountType,
+      type: "promotion",
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
         fixed_amount: promotionDiscount.fixed_amount,
         title: promotionDiscount.title,
         resource_id: ""
-      },
-      ...discountType === "product" ? {
-        metadata: {
-          source: "promotion",
-          actionType: (options == null ? void 0 : options.actionType) || ITEM_REWARD
-        }
-      } : {}
+      }
     });
   }
   if (discountList.length > 0) {
@@ -122,15 +98,7 @@ function updatePromotionDiscountList(item, promotionDiscount, options) {
     delete item.discount_list;
   }
 }
-function evaluatorHasActionType(evaluator, actionType) {
-  var _a;
-  const configs = (_a = evaluator == null ? void 0 : evaluator.getStrategyConfigs) == null ? void 0 : _a.call(evaluator);
-  if (!Array.isArray(configs))
-    return false;
-  return configs.some(
-    (config) => ((config == null ? void 0 : config.actions) || []).some((action) => (action == null ? void 0 : action.type) === actionType)
-  );
-}
+var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
   const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
@@ -157,9 +125,6 @@ function applyPromoUnitPriceToLine(item, input) {
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
-    }, {
-      actionType: input.actionType,
-      discountType: input.actionType === ITEM_REWARD ? "product" : "promotion"
     });
   } else {
     updatePromotionDiscountList(item, null);
@@ -367,8 +332,11 @@ function getProductLineNoteSignature(product) {
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
 function getPromotionLineMergeBoundary(product) {
-  var _a;
-  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_edit_for_runtime) !== true)
+  var _a, _b;
+  if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
+    return `weighing:${getOrderProductUid(product)}`;
+  }
+  if (((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_edit_for_runtime) !== true)
     return "";
   return `edit:${getOrderProductUid(product)}`;
 }
@@ -431,13 +399,14 @@ function buildConsolidateKeyForPromotion(item) {
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {
+  var _a, _b;
   if (!Array.isArray(entries) || entries.length <= 1) {
     return [...entries || []];
   }
   const groups = /* @__PURE__ */ new Map();
   for (const { item, originalListIndex } of entries) {
     const key = buildConsolidateKeyForPromotion(item);
-    const wasInPromotion = wasInPromotionBeforeEvaluation(item);
+    const wasInPromotion = ((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true;
     const existing = groups.get(key);
     if (!existing) {
       const mergedItem = (0, import_lodash_es.cloneDeep)(item);
@@ -503,9 +472,6 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
 function generateNumericId() {
   return Math.floor(Math.random() * 1e9) + Date.now();
 }
-function isBookingEditProductLine(product) {
-  return (product == null ? void 0 : product.booking_id) !== void 0 && (product == null ? void 0 : product.booking_id) !== null && product.booking_id !== 0 && product.booking_id !== "0";
-}
 function convertToPromotionProduct(product, index) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const numericId = generateNumericId();
@@ -518,7 +484,6 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
-    _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
@@ -620,9 +585,6 @@ function resolveStrategyRequiredQuantity(matched) {
   if (matched.actionType === "BUY_X_GET_Y_FREE") {
     return Number(detail.buyQuantity) || 1;
   }
-  if (matched.actionType === "ITEM_REWARD") {
-    return Number(detail.triggerQuantity) || 1;
-  }
   return 1;
 }
 function resolveStrategyEligibleProducts(matched) {
@@ -733,10 +695,6 @@ function processCartPromotion(list, evaluator, options) {
   };
   if (!list || list.length === 0 || !evaluator)
     return empty;
-  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(
-    evaluator,
-    ITEM_REWARD
-  );
   const mainProductsWithIndex = [];
   const existingGiftsWithIndex = [];
   const editProductsWithIndex = [];
@@ -747,12 +705,8 @@ function processCartPromotion(list, evaluator, options) {
       editProductsWithIndex.push({ item, originalListIndex: i });
     } else if (giftInfo) {
       existingGiftsWithIndex.push({ item, originalListIndex: i });
-    } else if (isBookingEditProductLine(item)) {
-      if (shouldIncludeEditProductsForItemReward) {
-        mainProductsWithIndex.push({ item, originalListIndex: i });
-      } else {
-        editProductsWithIndex.push({ item, originalListIndex: i });
-      }
+    } else if ((item == null ? void 0 : item.booking_id) !== void 0 && (item == null ? void 0 : item.booking_id) !== null && item.booking_id !== 0 && item.booking_id !== "0") {
+      editProductsWithIndex.push({ item, originalListIndex: i });
     } else {
       mainProductsWithIndex.push({ item, originalListIndex: i });
     }
@@ -795,8 +749,7 @@ function processCartPromotion(list, evaluator, options) {
       name: ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.product_name) || (item == null ? void 0 : item.title) || "",
       price: getOrderProductBasePrice(item),
       quantity: Number((item == null ? void 0 : item.num) ?? 1) || 1,
-      bundle: getProductBundleForEvaluator(item),
-      _promotionOnlyForItemReward: isBookingEditProductLine(item)
+      bundle: getProductBundleForEvaluator(item)
     };
   });
   for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
@@ -865,7 +818,7 @@ function processCartPromotion(list, evaluator, options) {
     const metadata = newItem.metadata || {};
     const sourceCartNum = (0, import_utils2.getSafeProductNum)(originalItem.num);
     newItem._sourceCartNum = sourceCartNum;
-    const wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
+    const wasInPromotion = ((_a = metadata._promotion) == null ? void 0 : _a.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
     delete metadata._promotion;
     if (Array.isArray(newItem.product_bundle)) {
       for (const b of newItem.product_bundle) {
@@ -882,8 +835,7 @@ function processCartPromotion(list, evaluator, options) {
         applyPromoUnitPriceToLine(newItem, {
           promoUnitPrice,
           originalBasePrice,
-          strategyTitle: (_a = priced.strategyMetadata) == null ? void 0 : _a.name,
-          actionType: priced.strategyId ? (_b = strategyActionMap.get(priced.strategyId)) == null ? void 0 : _b.actionType : void 0
+          strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
         });
       } else {
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -82,13 +82,8 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
-export interface ISalesPaymentMetadata extends Record<string, any> {
-    /** 刷卡机设备快照；OS 不解析内部字段 */
-    card_reader_snapshot?: Record<string, unknown>;
-}
 export interface ISalesPayment {
     order_payment_id?: number | null;
-    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -100,7 +95,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: ISalesPaymentMetadata | null;
+    metadata?: Record<string, any> | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {

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

package/lib/solution/BookingTicket/index.js

@@ -233,7 +233,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return String(this.getAppData("device_id") || 0).slice(-2);
   }
   async configureIdGeneratorFromOpenData() {
-    this.setPaymentNumberDevicePrefix(null);
     let openDataConfig = null;
     try {
       openDataConfig = await this.loadOpenDataConfig();
@@ -265,7 +264,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const resetReceiptSequenceDaily = typeof (openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"]) === "boolean" ? openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"] : false;
     const operatingDayBoundary = this.getAppData("operating_day_boundary");
     const deviceId = await this.getShortNumberOrDeviceId();
-    this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
     if (!businessCode) {
       console.warn("[BookingTicket] businessCode 缺失，跳过 idGenerator 配置");
@@ -1155,8 +1153,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   /** 读取当前 booking config。 */
   getBookingConfig() {
-    var _a;
-    return (_a = this.store.bookingContext) == null ? void 0 : _a.getBookingConfig();
+    return this.store.bookingContext.getBookingConfig();
   }
   /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
   setResources(resources) {
@@ -1529,8 +1526,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return result;
   }
   async setOtherParams(params, { cover = false } = {}) {
-    await super.setOtherParams(params, { cover });
-    if ((params == null ? void 0 : params.businessCode) !== void 0 || (params == null ? void 0 : params.business_code) !== void 0) {
+    super.setOtherParams(params, { cover });
+    if (params == null ? void 0 : params.businessCode) {
       await this.configureIdGeneratorFromOpenData();
     }
   }

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

@@ -118,12 +118,15 @@ export interface BookingTicketCartBookingView extends ISalesBooking {
         canAddTime: boolean;
     };
 }
+export type BookingTicketCartLineView = BookingTicketCartBookingView | BookingTicketCartItemView;
 /**
  * BookingTicket 面向 UI 的购物车视图。
  */
 export interface BookingTicketCartView {
     bookings: BookingTicketCartBookingView[];
     items: BookingTicketCartItemView[];
+    /** 以 tempOrder.products 为唯一顺序真源的统一购物车行（旧到新）。 */
+    lines: BookingTicketCartLineView[];
 }
 /**
  * BookingTicket 面向 UI 的客户展示视图。

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(addProductDecision_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_BookingContext = require("../../../modules/BookingContext");
 var import_transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
+var import_weighingProductSku = require("./weighingProductSku");
 function needsSpecDetailModal(item) {
   if (item == null ? void 0 : item.open_sold_weight)
     return true;
@@ -281,11 +282,14 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
   const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
   const extend = (cacheItem == null ? void 0 : cacheItem._extend) || {};
+  const productSku = (0, import_weighingProductSku.buildProductSkuFromCacheItem)(cacheItem);
   return {
     id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
     product_id: resolvedPid,
     variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
     quantity,
+    // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
+    product_sku: productSku ? { ...productSku, option: (other == null ? void 0 : other.option) || [] } : void 0,
     option: (other == null ? void 0 : other.option) || [],
     bundle: (other == null ? void 0 : other.bundle) || ((_c = extend == null ? void 0 : extend.skuValue) == null ? void 0 : _c.bundle) || ((_d = extend == null ? void 0 : extend._skuValue) == null ? void 0 : _d.bundle) || [],
     unique: other == null ? void 0 : other.unique,

package/lib/solution/BookingTicket/utils/cartView.js

@@ -86,29 +86,27 @@ function isGiftProductLine(line) {
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
+  const childBookings = bookingList.filter((booking) => booking.parent_id !== 0);
+  const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  const claimedUids = /* @__PURE__ */ new Set();
   const claimedAddTimeLines = /* @__PURE__ */ new Set();
-  const cartBookings = bookingList.filter((booking) => booking.parent_id !== 0).reduce((acc, booking) => {
-    const uid = booking == null ? void 0 : booking.product_uid;
+  childBookings.forEach((booking) => {
+    const bookingUid = getBookingUid(booking);
+    if (!bookingUid)
+      return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach((line) => {
+      claimedAddTimeLines.add(line);
+    });
+  });
+  const claimedBookings = /* @__PURE__ */ new Set();
+  const cartBookings = [];
+  const items = [];
+  const orderedLines = [];
+  const buildBookingView = (booking, product) => {
     const bookingUid = getBookingUid(booking);
-    let product = null;
-    if (uid !== void 0 && uid !== null && uid !== "") {
-      const key = String(uid);
-      if (!claimedUids.has(key)) {
-        const line = linesByUid[key];
-        if (isGiftProductLine(line))
-          return acc;
-        if (line) {
-          claimedUids.add(key);
-          product = line;
-        }
-      }
-    }
     const addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
-    addTimeProduct.forEach((line) => claimedAddTimeLines.add(line));
-    acc.push({
+    return {
       ...booking,
       _extend: {
         product,
@@ -122,21 +120,36 @@ function buildCartView(lines, bookings, options = {}) {
           shopOpeningHours: options.shopOpeningHours
         })
       }
-    });
-    return acc;
-  }, []);
-  const items = productLines.filter((line) => {
+    };
+  };
+  productLines.forEach((line) => {
     var _a;
-    if (isGiftProductLine(line))
-      return false;
-    if (claimedAddTimeLines.has(line))
-      return false;
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line))
+      return;
     const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
-    if (uid === void 0 || uid === null || uid === "")
-      return true;
-    return !claimedUids.has(String(uid));
+    const matchedBooking = uid === void 0 || uid === null || uid === "" ? void 0 : (bookingsByProductUid[String(uid)] || []).find(
+      (booking) => !claimedBookings.has(booking)
+    );
+    if (matchedBooking) {
+      claimedBookings.add(matchedBooking);
+      const bookingView = buildBookingView(matchedBooking, line);
+      cartBookings.push(bookingView);
+      orderedLines.push(bookingView);
+      return;
+    }
+    items.push(line);
+    orderedLines.push(line);
+  });
+  childBookings.forEach((booking) => {
+    if (claimedBookings.has(booking))
+      return;
+    const uid = booking == null ? void 0 : booking.product_uid;
+    const linkedProduct = uid === void 0 || uid === null || uid === "" ? null : linesByUid[String(uid)] || null;
+    if (isGiftProductLine(linkedProduct))
+      return;
+    cartBookings.push(buildBookingView(booking, null));
   });
-  return { bookings: cartBookings, items };
+  return { bookings: cartBookings, items, lines: orderedLines };
 }
 function isWalkInCustomer(customer) {
   if (!customer)

package/lib/solution/BookingTicket/utils/weighingProductSku.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export declare function buildProductSkuFromCacheItem(cacheItem: Record<string, any> | null | undefined): Record<string, any> | undefined;

package/lib/solution/BookingTicket/utils/weighingProductSku.js

@@ -0,0 +1,63 @@
+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/solution/BookingTicket/utils/weighingProductSku.ts
+var weighingProductSku_exports = {};
+__export(weighingProductSku_exports, {
+  buildProductSkuFromCacheItem: () => buildProductSkuFromCacheItem
+});
+module.exports = __toCommonJS(weighingProductSku_exports);
+var WEIGHT_UNIT_MAP = {
+  KILOGRAMS: "kg",
+  GRAMS: "g",
+  POUNDS: "lb",
+  OUNCES: "oz"
+};
+function isRecord(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function buildProductSkuFromCacheItem(cacheItem) {
+  var _a, _b, _c, _d;
+  const currentSku = isRecord(cacheItem == null ? void 0 : cacheItem.product_sku) ? cacheItem.product_sku : void 0;
+  const weighing = isRecord((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.weighing) ? (_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.weighing : void 0;
+  const hasRuntimeWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1 && ((currentSku == null ? void 0 : currentSku.weight) !== void 0 || (currentSku == null ? void 0 : currentSku.net_weight) !== void 0 || (currentSku == null ? void 0 : currentSku.weight_source) !== void 0);
+  const isWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1;
+  if (!isWeighingSku && !weighing)
+    return void 0;
+  if (hasRuntimeWeighingSku)
+    return { ...currentSku };
+  if (!weighing)
+    return currentSku ? { ...currentSku } : void 0;
+  return {
+    ...currentSku || {},
+    open_sold_weight: 1,
+    unit_data_snapshot: weighing.scalePriceProduct,
+    unit: WEIGHT_UNIT_MAP[String(weighing.unit)] || weighing.unit,
+    unit_weight: weighing.unit_weight ?? "1.000",
+    unit_price: weighing.unit_price,
+    weight_source: weighing.mode,
+    tare_name: ((_c = weighing.tare) == null ? void 0 : _c.label) ?? "",
+    tare_weight: ((_d = weighing.tare) == null ? void 0 : _d.value) ?? 0,
+    weight: weighing.weight ?? 0,
+    net_weight: weighing.net_weight ?? 0
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildProductSkuFromCacheItem
+});

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

@@ -83,7 +83,6 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
-    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/lib/solution/Sales/index.js

@@ -39,7 +39,6 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 __reExport(Sales_exports, require("./types"), module.exports);
-var UNPAID_PAYMENT_STATUSES = /* @__PURE__ */ new Set(["unpaid", "partially_paid", "payment_processing"]);
 var SalesImpl = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
@@ -259,9 +258,6 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
-  isUnpaidBooking(booking) {
-    return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
-  }
   countBookingOrders(bookings) {
     const orderIds = /* @__PURE__ */ new Set();
     bookings.forEach((booking) => {
@@ -635,7 +631,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
-    const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
+    const unpaidBookingList = matchedBookingList.filter(
+      (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
+    );
     const bookings = this.pickBookingsForCurrentPoint(
       current,
       this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)

package/lib/solution/ScanOrder/index.js

@@ -48,10 +48,6 @@ var import_utils2 = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_itemRule = require("../../model/strategy/adapter/itemRule");
 __reExport(ScanOrder_exports, require("./types"), module.exports);
-function isItemRewardProductDiscount(discount) {
-  var _a, _b;
-  return (discount == null ? void 0 : discount.type) === "product" && ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-}
 var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -746,10 +742,6 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
-        if ((product.discount_list || []).some(isItemRewardProductDiscount)) {
-          product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-          continue;
-        }
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;

package/lib/solution/VenueBooking/index.js

@@ -65,10 +65,6 @@ var OPEN_DATA_SECTION_CODES = [
   "workflow",
   "checkout"
 ];
-function isItemRewardProductDiscount(discount) {
-  var _a, _b;
-  return (discount == null ? void 0 : discount.type) === "product" && ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-}
 function cloneCustomDepositData(customDepositData) {
   if (!customDepositData || typeof customDepositData !== "object")
     return void 0;
@@ -1343,10 +1339,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
-        if ((product.discount_list || []).some(isItemRewardProductDiscount)) {
-          product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-          continue;
-        }
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.266",
+  "version": "2.2.268",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md}\"",
     "changeset": "changeset",
     "version": "changeset version",
-    "release": "changeset publish --registry=https://registry.npmjs.com/ && npm run sync && git push",
+    "release": "changeset publish && npm run sync && git push",
     "example": "npx parcel-bundler examples/index.html",
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",

package/dist/modules/Order/payment-utils.d.ts

@@ -1,26 +0,0 @@
-export type OrderPaymentTransactionStatus = 'success' | 'fail';
-export interface OrderPaymentTransaction {
-    number: string;
-    status: OrderPaymentTransactionStatus;
-}
-export type OrderPaymentIdentityType = 'order_payment_id' | 'payment_number' | 'unique_payment_number';
-export interface OrderPaymentIdentityMatch<T> {
-    index: number;
-    payment: T;
-    matchedBy: OrderPaymentIdentityType;
-}
-export declare function getOrderPaymentIdentityKeys(payment: unknown): string[];
-export declare function isPendingOrderPayment(payment: unknown): boolean;
-export declare function isIdentifiedPendingOrderPayment(payment: unknown): boolean;
-export declare function hasOrderPaymentIdentityOverlap(left: unknown, right: unknown): boolean;
-export declare function resolveOrderPaymentIdentity<T extends Record<string, any>>(payments: T[] | null | undefined, identity: string | number, mode?: 'payment_number' | 'compat'): OrderPaymentIdentityMatch<T> | null;
-export declare function ensureOrderPaymentNumber<T extends Record<string, any>>(payment: T, devicePrefix: string, createPaymentNumber: () => string): T & {
-    payment_number: string;
-};
-export declare function mergeOrderPaymentTransactions(current: unknown, incoming: unknown): OrderPaymentTransaction[];
-export declare function mergeOrderPaymentRecord<T extends Record<string, any>>(payment: T, updates: Record<string, any>): T;
-export declare function mergeOrderPaymentSnapshot<T extends Record<string, any>>(current: T, incoming: T): T;
-export declare function mergeOrderPaymentListsByIdentity<T extends Record<string, any>>(existing: T[] | null | undefined, incoming: T[] | null | undefined, options?: {
-    preserveUnmatchedExisting?: boolean;
-    preserveUnmatchedExistingWhen?: (payment: T) => boolean;
-}): T[];