@pisell/pisellos 2.2.166 → 2.2.168

package/dist/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/lib/modules/Discount/types.d.ts

@@ -135,6 +135,7 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

package/lib/modules/Order/index.d.ts

@@ -3,10 +3,9 @@ import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderScanCodeResult, ReplaceTempOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
-import { UnavailableReason } from '../Rules/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -48,12 +47,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: Discount[];
-        type: 'server' | 'clientCalc';
-        unavailableReason?: UnavailableReason;
-    }>;
+    scanCode(code: string, customerId?: number): Promise<OrderScanCodeResult>;
     applyDiscount(): void;
     initTempOrder(params: {
         cacheId?: string;

package/lib/modules/Order/index.js

@@ -207,6 +207,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: false,
         discountList: this.getDiscountList(),
+        scannedDiscountList: resultDiscountList,
         unavailableReason: import_types2.UnavailableReason.Unknown
       };
     }
@@ -214,7 +215,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "server",
         isAvailable: false,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        scannedDiscountList: resultDiscountList
       };
     }
     const withScanList = resultDiscountList.map((item) => ({
@@ -226,7 +228,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: true,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        scannedDiscountList: resultDiscountList
       };
     }
     const tempOrder = this.store.tempOrder;
@@ -247,6 +250,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       type: "clientCalc",
       isAvailable: isAvailable || false,
       discountList: newDiscountList || this.getDiscountList(),
+      scannedDiscountList: resultDiscountList,
       unavailableReason
     };
   }
@@ -570,6 +574,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.tempOrder = freshTempOrder;
     this.store.summary = (0, import_utils.createEmptySummary)();
     this.store.lastOrderInfo = void 0;
+    this.store.syncState = void 0;
     void ((_a = this.store.discount) == null ? void 0 : _a.setOriginalDiscountList([]));
     void ((_b = this.store.discount) == null ? void 0 : _b.setDiscountList([]));
     this.persistTempOrder();
@@ -988,6 +993,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   /** 追加单个支付项，并立即持久化当前 tempOrder。 */
   addOrderPayment(payment) {
+    this.logInfo("addOrderPayment", {
+      payment
+    });
     const tempOrder = this.ensureTempOrder();
     const mapped = (0, import_utils.mapPaymentItemsToOrderPayments)([payment]);
     tempOrder.payments = [...tempOrder.payments || [], ...mapped];
@@ -1556,20 +1564,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
       params.payments || []
     );
-    tempOrder.payments = mappedPayments;
-    if (params.paymentStatus)
-      tempOrder.payment_status = params.paymentStatus;
-    this.persistTempOrder();
-    await this.saveDraft();
     const paymentTotal = this.calculatePaymentTotal(mappedPayments);
     const targetAmount = this.getPaymentTargetAmount();
     const isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
-    if (!isFullyPaid || !params.submitWhenPaid) {
+    const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
+    tempOrder.payments = mappedPayments;
+    tempOrder.payment_status = paymentStatus;
+    this.persistTempOrder();
+    await this.saveDraft();
+    if (!params.submitWhenPaid) {
+      return { isFullyPaid };
+    }
+    if (this.store.syncState === "submitting") {
       return { isFullyPaid };
     }
+    this.store.syncState = "submitting";
     const submitResult = await this.submitTempOrder({
       payments: mappedPayments,
-      paymentStatus: params.paymentStatus || "paid",
+      paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
       channel: params.channel
     });

package/lib/modules/Order/types.d.ts

@@ -2,6 +2,7 @@ import { CartItem } from '../Cart/types';
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
+import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
@@ -48,6 +49,13 @@ export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
 }
+export interface OrderScanCodeResult {
+    isAvailable: boolean;
+    discountList: Discount[];
+    scannedDiscountList: Discount[];
+    type: 'server' | 'clientCalc';
+    unavailableReason?: UnavailableReason;
+}
 export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;

package/lib/modules/Order/utils.js

@@ -572,7 +572,7 @@ function buildSubmitPayload(params) {
     note: tempOrder.note || "",
     delivery_type: tempOrder.delivery_type || "nil",
     schedule_date: scheduleDate,
-    created_at: tempOrder.created_at || formatDateTime(now),
+    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(
       (booking) => Number(booking.parent_id) !== 0
     ).map((booking) => normalizeSubmitBooking(booking)),

package/lib/server/modules/order/utils/filterOrders.js

@@ -33,6 +33,13 @@ __export(filterOrders_exports, {
 });
 module.exports = __toCommonJS(filterOrders_exports);
 var import_dayjs = __toESM(require("dayjs"));
+function getOrderPaymentCodes(order) {
+  const payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map((item) => item == null ? void 0 : item.code).filter((code) => typeof code === "string" && code.length > 0);
+}
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -133,26 +140,27 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      const orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
+      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/lib/solution/BaseSales/index.js

@@ -34,9 +34,10 @@ __export(BaseSales_exports, {
 });
 module.exports = __toCommonJS(BaseSales_exports);
 var import_BaseModule = require("../../modules/BaseModule");
+var import_types = require("./types");
 var import_Order = require("../../modules/Order");
 var import_decimal = __toESM(require("decimal.js"));
-var import_types = require("../BookingByStep/types");
+var import_types2 = require("../BookingByStep/types");
 var import_utils = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 __reExport(BaseSales_exports, require("./types"), module.exports);
@@ -147,7 +148,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (moduleName === "quotation") {
       return new import_Quotation.QuotationModule(`${this.name}_quotation`);
     }
-    return (0, import_types.createModule)(moduleName, this.name);
+    return (0, import_types2.createModule)(moduleName, this.name);
   }
   getSubModuleHooks(moduleName) {
     var _a, _b;
@@ -779,6 +780,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       tempOrder.discount_list = (nextDiscountList || []).filter((d) => d.isSelected);
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products,
+        discountList: nextDiscountList,
+        selectedDiscountList: tempOrder.discount_list,
+        tempOrder
+      });
     } catch (error) {
       throw error;
     }
@@ -844,10 +851,43 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
-    return this.store.order.syncPaymentsToOrder({
+    const syncParams = {
       ...params,
       ...channel !== void 0 ? { channel } : {}
+    };
+    const syncState = this.store.order.getOrderSyncState();
+    if (params.submitWhenPaid && syncState === "submitting") {
+      return this.store.order.syncPaymentsToOrder(syncParams);
+    }
+    const payments = params.payments || [];
+    await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncStart, {
+      payments,
+      params: syncParams,
+      amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+      orderSnapshot: this.store.order.getOrderSnapshot()
     });
+    try {
+      const syncResult = await this.store.order.syncPaymentsToOrder(syncParams);
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
+        ok: true,
+        syncResult,
+        payments: this.store.order.getOrderPayments(),
+        params: syncParams,
+        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+        orderSnapshot: this.store.order.getOrderSnapshot()
+      });
+      return syncResult;
+    } catch (error) {
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
+        ok: false,
+        error,
+        payments: this.store.order.getOrderPayments(),
+        params: syncParams,
+        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+        orderSnapshot: this.store.order.getOrderSnapshot()
+      });
+      throw error;
+    }
   }
   /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
   getOrderPayments() {
@@ -865,7 +905,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   addOrderPayment(payment) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.addOrderPayment(payment);
+    const payments = this.store.order.addOrderPayment(payment);
+    const amountSnapshot = this.store.order.getOrderAmountSnapshot();
+    const syncState = this.store.order.getOrderSyncState();
+    if (amountSnapshot && syncState !== "submitting") {
+      const paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? "paid" : "partially_paid";
+      void this.syncPaymentsToOrder({
+        payments,
+        paymentStatus,
+        submitWhenPaid: true,
+        smallTicketDataFlag: 1
+      }).catch((error) => {
+        this.logError("auto sync payments failed", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+    }
+    return payments;
   }
   /** 更新当前订单中的指定支付项。 */
   updateOrderPayment(paymentIdentity, updates) {

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

@@ -11,6 +11,8 @@ export declare const BaseSalesHookNames: {
     readonly onRetryInit: "onRetryInit";
     readonly onRefresh: "onRefresh";
     readonly onCartValidationChanged: "onCartValidationChanged";
+    readonly onPaymentSyncStart: "onPaymentSyncStart";
+    readonly onPaymentSyncEnd: "onPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/lib/solution/BaseSales/types.js

@@ -28,7 +28,9 @@ var BaseSalesHookNames = {
   onDestroy: "onDestroy",
   onRetryInit: "onRetryInit",
   onRefresh: "onRefresh",
-  onCartValidationChanged: "onCartValidationChanged"
+  onCartValidationChanged: "onCartValidationChanged",
+  onPaymentSyncStart: "onPaymentSyncStart",
+  onPaymentSyncEnd: "onPaymentSyncEnd"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

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 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     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。
      *
@@ -251,7 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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.getCustomerList({
+      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。
    *

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