@pisell/pisellos 2.2.170 → 2.2.172

package/lib/modules/Order/utils.js

@@ -49,6 +49,7 @@ __export(utils_exports, {
   mergeRelationForms: () => mergeRelationForms,
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
+  normalizeOrderProductDiscountList: () => normalizeOrderProductDiscountList,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
   resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
@@ -106,6 +107,42 @@ function resolveRulesManualDiscountFlag(metadata) {
   }
   return void 0;
 }
+function normalizeOrderProductDiscountAmount(amount) {
+  if (amount === void 0 || amount === null)
+    return void 0;
+  return String(amount);
+}
+function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList))
+    return [];
+  return discountList.filter((item) => !!item && typeof item === "object").map((item) => {
+    const normalized = {
+      discount_id: Number.isFinite(Number(item.discount_id)) ? Number(item.discount_id) : 0
+    };
+    if (item.order_discount_id === null) {
+      normalized.order_discount_id = null;
+    } else if (item.order_discount_id !== void 0) {
+      const orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== void 0)
+      normalized.type = item.type;
+    const amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== void 0)
+      normalized.amount = amount;
+    if (item.discount && typeof item.discount === "object") {
+      normalized.discount = { ...item.discount };
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && typeof item.metadata === "object") {
+      normalized.metadata = { ...item.metadata };
+    }
+    return normalized;
+  });
+}
 function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
   var _a, _b;
   const metadata = params.metadata || {};
@@ -426,7 +463,7 @@ function normalizeSubmitProduct(product) {
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: submitProduct.discount_list || [],
+    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
@@ -521,7 +558,6 @@ function createDefaultTempOrder(params) {
     bookings: [],
     payments: [],
     surcharges: [],
-    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -559,6 +595,7 @@ function buildSubmitPayload(params) {
     shop_service_type: _shopServiceType,
     start_time: _startTime,
     customer: _customer,
+    discount_list: _discountList,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
@@ -603,7 +640,6 @@ function buildSubmitPayload(params) {
       (booking) => Number(booking.parent_id) !== 0
     ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
-    // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
@@ -706,6 +742,7 @@ function formatV1Product(products) {
   mergeRelationForms,
   normalizeBookingIsAll,
   normalizeBookingSubType,
+  normalizeOrderProductDiscountList,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
   resolveManualDiscountMessage,

package/lib/modules/Quotation/index.js

@@ -74,9 +74,11 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getPriceForProduct(params) {
     const { productId, variantId, datetime, customer_id } = params;
     for (const quotation of this.store.list) {
-      if (!this.isQuotationVisibleForCustomer(quotation, customer_id))
+      const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
+      if (!visible)
         continue;
-      if (!this.isQuotationActiveAt(quotation, datetime))
+      const active = this.isQuotationActiveAt(quotation, datetime);
+      if (!active)
         continue;
       const match = this.findProductData(quotation.product_data, productId, variantId);
       if (!match)
@@ -148,18 +150,27 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
       return false;
-    const scheduleItems = quotation.schedule.map((s) => {
+    const scheduleItems = [];
+    quotation.schedule.forEach((s) => {
       var _a2;
       const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
-      if (full)
-        return full;
-      return {
+      if (full) {
+        scheduleItems.push(full);
+        return;
+      }
+      if (this.scheduleResolver) {
+        return;
+      }
+      const fallbackSchedule = {
         ...s,
         repeat_type: s.repeat_type || "none",
         repeat_rule: s.repeat_rule || null,
         time_slot: s.time_slot || []
       };
+      scheduleItems.push(fallbackSchedule);
     });
+    if (!scheduleItems.length)
+      return false;
     return (0, import_getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
   }
   findProductData(productData, productId, variantId) {

package/lib/modules/Schedule/index.js

@@ -135,7 +135,9 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
-    return this.store.scheduleList.filter((n) => ids.includes(n.id));
+    const idSet = new Set(ids.map((id) => String(id)));
+    const list = this.store.scheduleList.filter((n) => idSet.has(String(n.id)));
+    return list;
   }
   setAvailabilityScheduleDateList(list) {
     this.store.availabilityDateList = list;

package/lib/server/index.js

@@ -931,6 +931,8 @@ var Server = class {
       return;
     }
     try {
+      await this.schedule.loadAllSchedule();
+      this.products.clearPriceCache();
       await this.products.setupQuotationPriceBridge({
         scheduleModule: this.schedule,
         channel: (_a = this.core.context) == null ? void 0 : _a.channel

package/lib/server/modules/products/index.js

@@ -177,7 +177,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a, _b, _c;
+    var _a;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -190,15 +190,14 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
-      const scheduleList = ((_c = (_b = params.scheduleModule).getScheduleList) == null ? void 0 : _c.call(_b)) || [];
-      const scheduleMap = new Map(
-        scheduleList.map((schedule) => [schedule.id, schedule])
-      );
       this.quotationPriceBridge.setScheduleResolver((id) => {
-        var _a2, _b2;
-        if (scheduleMap.has(id))
-          return scheduleMap.get(id);
-        const schedules = ((_b2 = (_a2 = params.scheduleModule).getScheduleByIds) == null ? void 0 : _b2.call(_a2, [id])) || [];
+        var _a2, _b, _c, _d, _e, _f;
+        const scheduleId = String(id);
+        const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+        const schedule = scheduleList.find((item) => String(item.id) === scheduleId);
+        if (schedule)
+          return schedule;
+        const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
         return schedules[0];
       });
     }

package/lib/server/modules/schedule/index.js

@@ -183,8 +183,9 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
       return [];
     }
     const result = [];
+    const scheduleList = this.store.scheduleList || [];
     for (const id of ids) {
-      const schedule = this.store.map.get(id);
+      const schedule = this.store.map.get(id) || scheduleList.find((item) => String(item.id) === String(id));
       if (schedule) {
         result.push(schedule);
       }

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

@@ -113,6 +113,24 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    /**
+     * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
+     * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
+     *
+     * @example
+     * bookingTicket.setEnableTempOrderPersist(false);
+     * await bookingTicket.addProductToOrder(product);
+     */
+    setEnableTempOrderPersist(enabled: boolean): void;
+    /**
+     * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
+     *
+     * @example
+     * if (bookingTicket.isTempOrderPersistEnabled()) {
+     *   bookingTicket.restoreOrder();
+     * }
+     */
+    isTempOrderPersistEnabled(): boolean;
     private ensureTempOrder;
     addNewOrder(): Promise<OrderTempOrder>;
     saveDraft(): Promise<void>;
@@ -127,6 +145,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getHistoricalProductDiscountList;
     private isPersistedOrderProduct;
     private mergeHistoricalDiscountList;
+    private mergeCurrentDiscountSelectionState;
     loadDiscountConfig(params?: {
         customerId?: number;
         action?: 'create' | 'edit';

package/lib/solution/BaseSales/index.js

@@ -417,6 +417,32 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);
   }
+  /**
+   * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
+   * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
+   *
+   * @example
+   * bookingTicket.setEnableTempOrderPersist(false);
+   * await bookingTicket.addProductToOrder(product);
+   */
+  setEnableTempOrderPersist(enabled) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    this.store.order.setEnableTempOrderPersist(enabled);
+  }
+  /**
+   * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
+   *
+   * @example
+   * if (bookingTicket.isTempOrderPersistEnabled()) {
+   *   bookingTicket.restoreOrder();
+   * }
+   */
+  isTempOrderPersistEnabled() {
+    if (!this.store.order)
+      return true;
+    return this.store.order.isTempOrderPersistEnabled();
+  }
   ensureTempOrder() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
@@ -561,8 +587,35 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(discountList || []).filter((discount) => !historyIds.has(discount.id))
     ];
   }
+  mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
+    if (!currentDiscountList.length)
+      return discountList;
+    const currentDiscountMap = new Map(
+      currentDiscountList.map((discount) => [discount.id, discount])
+    );
+    return discountList.map((discount) => {
+      const currentDiscount = currentDiscountMap.get(discount.id);
+      if (!currentDiscount)
+        return discount;
+      if (currentDiscount.isManualSelect) {
+        return {
+          ...discount,
+          isSelected: false,
+          isManualSelect: true
+        };
+      }
+      if (currentDiscount.isSelected) {
+        return {
+          ...discount,
+          isSelected: true,
+          isManualSelect: false
+        };
+      }
+      return discount;
+    });
+  }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -573,6 +626,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const customerId = Number(
       (params == null ? void 0 : params.customerId) || tempOrder.customer_id || ((_c = tempOrder.customer) == null ? void 0 : _c.id) || ((_e = (_d = tempOrder._extend) == null ? void 0 : _d.customerSnapshot) == null ? void 0 : _e.id) || ((_g = (_f = tempOrder._extend) == null ? void 0 : _f.customerSnapshot) == null ? void 0 : _g.customer_id) || 0
     );
+    const currentDiscountList = ((_h = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _h.call(discountModule)) || [];
     let preparedDiscountList = [];
     if (customerId && customerId !== 1) {
       preparedDiscountList = await this.store.order.loadDiscountConfig({
@@ -581,21 +635,25 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         orderId: Number(orderId) || void 0,
         apply: false
       });
-      await ((_h = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _h.call(discountModule, preparedDiscountList));
+      await ((_i = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _i.call(discountModule, preparedDiscountList));
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(
-      preparedDiscountList || ((_i = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _i.call(discountModule)) || [],
+      preparedDiscountList || ((_j = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _j.call(discountModule)) || [],
       tempOrder.products || []
     );
+    nextDiscountList = this.mergeCurrentDiscountSelectionState(
+      nextDiscountList,
+      currentDiscountList
+    );
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_j = tempOrder.holder) == null ? void 0 : _j.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      const holders = ((_k = tempOrder.holder) == null ? void 0 : _k.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: !!((_k = tempOrder.holder) == null ? void 0 : _k.type) && tempOrder.holder.type === "form",
-        orderTotalAmount: Number(((_l = orderStore.summary) == null ? void 0 : _l.total_amount) || 0)
+        isFormSubject: !!((_l = tempOrder.holder) == null ? void 0 : _l.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_m = orderStore.summary) == null ? void 0 : _m.total_amount) || 0)
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
         tempOrder.products = result.productList;

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

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

@@ -260,7 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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