@pisell/pisellos 2.2.167 → 2.2.169

package/lib/solution/BaseSales/utils.js

@@ -38,6 +38,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
+var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -203,9 +204,16 @@ function normalizeOrderProduct(product) {
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
-    { num: product.num, metadata },
+    { num: product.num, metadata, lineOriginalPrice: product.original_price },
     composedOriginalPrice
   );
+  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -216,7 +224,7 @@ function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

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

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

@@ -4,6 +4,7 @@ import type { ProductData } from '../../modules';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
 import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
+import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
 import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
@@ -43,6 +44,14 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 让现有 setActiveCustomer / getActiveCustomer 调用方零成本拿到详情态客户。
      */
     loadSalesDetail(orderIdOrParams: number | string | LoadSalesDetailParams): Promise<ISalesDetail>;
+    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    private hydrateOrderCustomerFromScanDiscounts;
+    private getDiscountCustomerId;
+    private resolveCustomerByDiscountCustomerId;
+    private findCustomerById;
+    private normalizeCustomer;
+    private getRawCustomerId;
+    private hasUsableCustomerDetails;
     /**
      * 更新当前预约的 appointment_status。
      *

package/lib/solution/BookingTicket/index.js

@@ -133,6 +133,83 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return sales;
   }
+  async scanPromotionCode(code, customerId) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    const raw = await this.store.order.scanCode(code, customerId);
+    if (raw.isAvailable) {
+      await this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList);
+      await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+    }
+    return {
+      isAvailable: raw.isAvailable,
+      type: raw.type,
+      unavailableReason: raw.unavailableReason
+    };
+  }
+  async hydrateOrderCustomerFromScanDiscounts(discounts) {
+    const currentOrderCustomer = this.store.order.getOrderCustomer();
+    if (currentOrderCustomer)
+      return;
+    const customerId = this.getDiscountCustomerId(discounts);
+    if (!customerId)
+      return;
+    const customer = await this.resolveCustomerByDiscountCustomerId(customerId);
+    if (!customer)
+      return;
+    this.store.customer.setSelectedCustomer(customer);
+    this.setOrderCustomer(customer);
+  }
+  getDiscountCustomerId(discounts) {
+    const discount = discounts.find((item) => item.customer_id != null);
+    const customerId = Number(discount == null ? void 0 : discount.customer_id);
+    if (!Number.isFinite(customerId) || customerId <= 0)
+      return null;
+    return customerId;
+  }
+  async resolveCustomerByDiscountCustomerId(customerId) {
+    var _a;
+    const localCustomers = this.store.customer.getCustomers();
+    const localCustomer = this.findCustomerById(localCustomers, customerId);
+    const normalizedLocalCustomer = localCustomer ? this.normalizeCustomer(localCustomer) : null;
+    if (normalizedLocalCustomer && this.hasUsableCustomerDetails(normalizedLocalCustomer)) {
+      return normalizedLocalCustomer;
+    }
+    const result = await this.store.customer.queryCustomerList({
+      ids: [customerId],
+      skip: 1,
+      num: 1
+    });
+    const remoteCustomer = this.findCustomerById((result == null ? void 0 : result.list) || [], customerId) || ((_a = result == null ? void 0 : result.list) == null ? void 0 : _a[0]) || null;
+    return remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null;
+  }
+  findCustomerById(customers = [], customerId) {
+    return customers.find((customer) => {
+      const rawId = this.getRawCustomerId(customer);
+      return rawId !== null && String(rawId) === String(customerId);
+    }) || null;
+  }
+  normalizeCustomer(customer) {
+    const raw = customer;
+    const rawId = this.getRawCustomerId(customer);
+    const name = customer.name || raw.display_name || raw.nickname || raw.customer_name || [raw.first_name, raw.last_name].filter(Boolean).join(" ") || "";
+    return {
+      ...customer,
+      id: rawId ?? customer.id,
+      name,
+      phone: customer.phone ?? raw.phone ?? raw.mobile ?? "",
+      email: customer.email ?? raw.email ?? "",
+      country_calling_code: customer.country_calling_code ?? raw.country_calling_code ?? ""
+    };
+  }
+  getRawCustomerId(customer) {
+    const raw = customer;
+    return customer.id ?? raw.customer_id ?? raw.customerId ?? null;
+  }
+  hasUsableCustomerDetails(customer) {
+    return !!(customer.name || customer.phone || customer.email || customer.display_name || customer.customer_name);
+  }
   /**
    * 更新当前预约的 appointment_status。
    *
@@ -213,7 +290,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    */
   async loadProducts(params = {}, options) {
     const { schedule_date, customer_id, menu_list_ids, schedule_datetime } = params;
-    const bookingDate = schedule_date || (schedule_datetime ? String(schedule_datetime).slice(0, 10) : "");
+    const bookingDate = schedule_datetime || schedule_date || "";
     if (bookingDate) {
       this.setBookingDate(bookingDate);
     }

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

@@ -184,7 +184,7 @@ function buildRequiresDetailPayload(item, ctx) {
       number: Boolean(item == null ? void 0 : item.open_sold_weight)
     },
     isOnlySession,
-    isEject,
+    isEject: isEject ? 1 : 0,
     customerId: ctx == null ? void 0 : ctx.customerId,
     date: formatBookingDateForUI(ctx == null ? void 0 : ctx.date),
     productData: item
@@ -298,6 +298,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     origin_total: extend == null ? void 0 : extend.origin_total,
     price_override: extend == null ? void 0 : extend.priceOverride,
     bundle_edit: extend == null ? void 0 : extend.bundle_edit,
+    discount_reason: extend == null ? void 0 : extend.discount_reason,
+    discount_list: cacheItem == null ? void 0 : cacheItem.discount_list,
     _extend: extend
   };
 }

package/lib/solution/ScanOrder/utils.js

@@ -63,6 +63,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
+var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -507,9 +508,16 @@ function normalizeOrderProduct(product) {
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
-    { num: product.num, metadata },
+    { num: product.num, metadata, lineOriginalPrice: product.original_price },
     composedOriginalPrice
   );
+  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -520,7 +528,7 @@ function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

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

@@ -150,12 +150,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         customerId: number;
     }): Promise<void>;
     private recalculateOrderPricesFromQuotation;
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: import("../../modules/Discount").Discount[];
-        type: "server" | "clientCalc";
-        unavailableReason?: import("../../modules/Rules/types").UnavailableReason | undefined;
-    }>;
+    scanCode(code: string, customerId?: number): Promise<import("../../modules/Order/types").OrderScanCodeResult>;
     /** 获取当前折扣列表（包装 order.getDiscountList） */
     getDiscountList(): import("../../modules/Discount").Discount[];
     /** 勾选/取消勾选某张折扣券，重新计算折扣并持久化 */

package/package.json

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