@pisell/pisellos 2.3.17 → 2.3.19

package/lib/modules/SurchargeList/index.js

@@ -25,15 +25,17 @@ __export(SurchargeList_exports, {
 module.exports = __toCommonJS(SurchargeList_exports);
 var import_BaseModule = require("../BaseModule");
 __reExport(SurchargeList_exports, require("./types"), module.exports);
+var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SurchargeListModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "surchargeList";
     this.defaultVersion = "1.0.0";
-    this.loadingPromise = null;
+    this.loadingPromises = /* @__PURE__ */ new Map();
+    this.requestVersion = 0;
   }
   async initialize(core, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
@@ -41,44 +43,62 @@ var SurchargeListModule = class extends import_BaseModule.BaseModule {
       (_a = options.initialState) == null ? void 0 : _a.surchargeList
     );
     this.store.surchargeList = hasInitialSurchargeList ? (_b = options.initialState) == null ? void 0 : _b.surchargeList : [];
-    this.store.isLoaded = Boolean((_c = options.initialState) == null ? void 0 : _c.isLoaded) || hasInitialSurchargeList;
+    this.store.channel = ((_c = options.initialState) == null ? void 0 : _c.channel) || ((_d = options.otherParams) == null ? void 0 : _d.channel) || DEFAULT_SURCHARGE_CHANNEL;
+    this.store.isLoaded = Boolean((_e = options.initialState) == null ? void 0 : _e.isLoaded) || hasInitialSurchargeList;
     if (!this.request) {
       throw new Error("SurchargeListModule 需要 request 插件支持");
     }
   }
-  async getSurchargeList() {
-    if (this.store.isLoaded)
+  resolveChannel(query) {
+    return (query == null ? void 0 : query.channel) || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    if (this.store.isLoaded && this.store.channel === channel) {
       return this.store.surchargeList;
-    if (this.loadingPromise)
-      return this.loadingPromise;
-    this.loadingPromise = this.loadSurchargeList();
-    return this.loadingPromise;
+    }
+    const loadingPromise = this.loadingPromises.get(channel);
+    if (loadingPromise)
+      return loadingPromise;
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
   }
-  async refreshSurchargeList() {
-    this.loadingPromise = this.loadSurchargeList();
-    return this.loadingPromise;
+  async refreshSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
   }
-  async loadSurchargeList() {
+  async loadSurchargeList(channel) {
+    const currentRequestVersion = ++this.requestVersion;
     try {
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          channel: "online-store",
+          channel,
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
           with: ["relationSchedule"]
         }
       );
-      this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
-      this.store.isLoaded = true;
-      return this.store.surchargeList;
+      const nextSurchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = nextSurchargeList;
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return nextSurchargeList;
     } catch (error) {
       console.warn("[SurchargeListModule] 加载附加费配置失败", error);
-      this.store.surchargeList = [];
-      this.store.isLoaded = true;
-      return this.store.surchargeList;
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = [];
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return [];
     } finally {
-      this.loadingPromise = null;
+      this.loadingPromises.delete(channel);
     }
   }
 };

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

@@ -4,8 +4,12 @@ export interface SurchargeListItem {
 export interface SurchargeListState {
     surchargeList: SurchargeListItem[];
     isLoaded: boolean;
+    channel?: string;
+}
+export interface SurchargeListQuery {
+    channel?: string;
 }
 export interface SurchargeListModuleAPI {
-    getSurchargeList(): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
 }

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

@@ -308,12 +308,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
   }
   updateCreateStore() {
-    var _a;
     const appPlugin = this.core.getPlugin("app");
     const app = appPlugin == null ? void 0 : appPlugin.getApp();
     if (app) {
       const coreData = app.data.store.getStore().getDataByModel("core");
-      if (!((_a = this.store.createdAtQuery) == null ? void 0 : _a.sales_time_between) && (coreData == null ? void 0 : coreData.core)) {
+      if (coreData == null ? void 0 : coreData.core) {
         const today = (0, import_dayjs.default)();
         if (coreData == null ? void 0 : coreData.core.operating_day_boundary) {
           const operatingDayBoundary = coreData.core.operating_day_boundary;

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

@@ -49,6 +49,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queuedAutoPaymentSync;
     private autoPaymentSyncFlushing;
     private autoPaymentSyncTimer;
+    private salesDetailLoadInFlight;
+    private serverOrderChangeUnsubscribe;
+    private serverOrderChangeHydrateInFlight;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -69,6 +72,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 记录错误日志
      */
     private logError;
+    private isCurrentSalesOrderRecord;
+    private syncCurrentSalesDetailFromServerOrderChange;
+    private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;

package/lib/solution/BaseSales/index.js

@@ -45,6 +45,7 @@ __reExport(BaseSales_exports, require("./types"), module.exports);
 var import_Quotation = require("../../modules/Quotation");
 var import_transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var import_quotationPrice = require("./utils/quotationPrice");
+var SERVER_ORDER_CHANGED_EVENT = "order:onOrdersChanged";
 function isBaseSalesManualProductDiscountProduct(product) {
   var _a, _b;
   return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
@@ -82,6 +83,18 @@ function getBaseSalesUniqueArrayMetadataKey(key) {
     return "unique_payment_number";
   return null;
 }
+function isSameBaseSalesOrderRecord(left, right) {
+  if (!left || !right || typeof left !== "object" || typeof right !== "object")
+    return false;
+  const leftIdentities = new Set(
+    [left.order_id, left.id, left.external_sale_number, left.order_number].filter((value) => value !== void 0 && value !== null && value !== "").map(String)
+  );
+  if (leftIdentities.size === 0)
+    return false;
+  return [right.order_id, right.id, right.external_sale_number, right.order_number].some(
+    (value) => value !== void 0 && value !== null && value !== "" && leftIdentities.has(String(value))
+  );
+}
 function getBaseSalesMetadataUid(item, metadataKey) {
   var _a;
   const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a[metadataKey]) ?? (item == null ? void 0 : item[metadataKey]);
@@ -159,6 +172,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.queuedAutoPaymentSync = false;
     this.autoPaymentSyncFlushing = false;
     this.autoPaymentSyncTimer = null;
+    this.salesDetailLoadInFlight = false;
+    this.serverOrderChangeUnsubscribe = null;
+    this.serverOrderChangeHydrateInFlight = null;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -223,6 +239,53 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  isCurrentSalesOrderRecord(order) {
+    var _a, _b;
+    const currentTempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
+    const currentRecords = [
+      currentTempOrder,
+      this.currentSalesDetail
+    ].filter(Boolean);
+    return currentRecords.some((record) => isSameBaseSalesOrderRecord(record, order));
+  }
+  async syncCurrentSalesDetailFromServerOrderChange(payload) {
+    const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload == null ? void 0 : payload.changedOrders) ? payload.changedOrders : (payload == null ? void 0 : payload.data) && typeof payload.data === "object" ? [payload.data] : [];
+    if (this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
+      return;
+    const changedOrder = changedOrders.find(
+      (order) => this.isCurrentSalesOrderRecord(order)
+    );
+    if (!changedOrder)
+      return;
+    if (!this.store.order)
+      return;
+    this.serverOrderChangeHydrateInFlight = (async () => {
+      const sales = await this.store.order.hydrateTempOrderFromRecord(changedOrder, {
+        recalcOnHydrate: false
+      });
+      this.currentSalesDetail = sales;
+      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
+    })();
+    try {
+      await this.serverOrderChangeHydrateInFlight;
+    } finally {
+      this.serverOrderChangeHydrateInFlight = null;
+    }
+  }
+  registerServerOrderChangeSync() {
+    var _a, _b;
+    (_a = this.serverOrderChangeUnsubscribe) == null ? void 0 : _a.call(this);
+    const effects = (_b = this.core) == null ? void 0 : _b.effects;
+    if (!effects || typeof effects.on !== "function")
+      return;
+    this.serverOrderChangeUnsubscribe = effects.on(SERVER_ORDER_CHANGED_EVENT, (payload) => {
+      void this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
+        this.logError("sync sales detail from server order change failed", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+    });
+  }
   hydrateOrderPaymentNames(payments) {
     if (!payments.length)
       return [];
@@ -637,9 +700,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       );
     }
     await this.getPaymentMethodsAsync();
+    this.registerServerOrderChangeSync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
+    var _a;
+    (_a = this.serverOrderChangeUnsubscribe) == null ? void 0 : _a.call(this);
+    this.serverOrderChangeUnsubscribe = null;
     Object.keys(this.store).forEach((key) => {
       if (this.reusedSharedSubModuleNames.has(key))
         return;
@@ -666,30 +733,35 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async loadSalesDetail(orderIdOrParams) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
-    const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-    const preloadedSalesDetail = params.preloadedSalesDetail;
-    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
-    if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
-      throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
-    }
-    const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
-      lookup,
-      forceRemote: params.forceRemote
-    });
-    if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
-      const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
-      throw new Error(message);
-    }
-    const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
-    const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-    const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
-    const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-      recalcOnHydrate: false
-    });
-    this.currentSalesDetail = sales;
-    await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
-    return sales;
+    this.salesDetailLoadInFlight = true;
+    try {
+      const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
+      const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
+      const preloadedSalesDetail = params.preloadedSalesDetail;
+      const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
+      if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
+        throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
+      }
+      const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
+        lookup,
+        forceRemote: params.forceRemote
+      });
+      if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
+        const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
+        throw new Error(message);
+      }
+      const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
+      const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
+      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
+      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
+        recalcOnHydrate: false
+      });
+      this.currentSalesDetail = sales;
+      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
+      return sales;
+    } finally {
+      this.salesDetailLoadInFlight = false;
+    }
   }
   /** 获取当前已加载的销售详情（只读快照）。未加载过则返回 null。 */
   getSalesOrder() {
@@ -1696,15 +1768,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.discardPendingVoucherPayments();
   }
   getWalletProductList() {
-    var _a, _b, _c;
+    var _a, _b;
     const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
-    const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
-    const walletProducts = products.map((product) => {
+    const walletProducts = tempOrder == null ? void 0 : tempOrder.products.map((product) => {
       const metadata = product.metadata || {};
+      const rawHolderId = product.holder_id ?? metadata.holder_id;
+      const holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
+      const holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : void 0;
       return {
-        product_id: product.product_id,
+        product_id: product.product_id || 0,
         product_variant_id: String(product.product_variant_id ?? ""),
         quantity: product.num || 1,
         is_price_include_tax: tempOrder.is_price_include_tax,
@@ -1712,7 +1786,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         tax_fee: product.tax_fee,
         selling_price: Number(product.selling_price || 0),
         discount_list: product.discount_list || [],
-        holder_id: product.holder_id ?? metadata.holder_id,
+        holder_id,
         original_price: product.original_price,
         main_product_original_price: metadata.main_product_original_price ?? product.original_price,
         main_product_selling_price: metadata.main_product_selling_price ?? product.selling_price,

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

@@ -88,7 +88,8 @@ function normalizeBundleItems(bundleItems, preferPriceField = false) {
       price: bundleItem.price ?? unitStr,
       bundle_selling_price: unitStr,
       original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
-      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     };
     normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
     if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {

package/package.json

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