@pisell/pisellos 2.2.258 → 2.2.259

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

@@ -66,7 +66,8 @@ function normalizeBundleItems(bundleItems) {
       price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
       original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
-      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     });
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
     normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);

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

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

@@ -322,7 +322,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 客户状态
@@ -555,7 +555,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     handlePrintWristband(params: {
         voucher_ids: number[];
     }): Promise<void>;
-    handleCheckIn(params: {
+    handleRedeem(params: {
         voucher_ids: number[];
         is_checkin: boolean;
     }): Promise<any>;

package/dist/solution/BookingTicket/index.js

@@ -2657,45 +2657,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _handlePrintWristband.apply(this, arguments);
       }
       return handlePrintWristband;
-    }() // 触发 checkIn
+    }() // 触发核销
   }, {
-    key: "handleCheckIn",
+    key: "handleRedeem",
     value: function () {
-      var _handleCheckIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+      var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
         var _this$store$order5, _this$store$order5$ge, _this$store$order6, _ref20, _tempOrder$order_id2;
-        var voucherIds, voucherIdSet, tempOrder, vouchers, batchMetadata, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
+        var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
+              voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
+              status = params.is_checkin ? 'used' : 'unused';
               this.logger.addLog({
                 type: 'info',
-                title: '[BookingTicket] handleCheckIn',
+                title: '[BookingTicket] handleRedeem',
                 metadata: {
-                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids],
-                  is_checkin: params.is_checkin
+                  voucher_ids: voucherIds,
+                  status: status
                 }
               });
-              voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
               voucherIdSet = new Set(voucherIds);
               tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getTempOrder) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
               vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getVouchers()) || [];
-              batchMetadata = [];
               hasUpdatedVoucher = false;
               nextVouchers = vouchers.map(function (voucher) {
-                var _voucher$metadata;
                 if (!voucherIdSet.has(voucher.voucher_id)) return voucher;
                 hasUpdatedVoucher = true;
-                var metadata = _objectSpread(_objectSpread({}, voucher.metadata || {}), {}, {
-                  ticket: _objectSpread(_objectSpread({}, ((_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.ticket) || {}), {}, {
-                    is_checkin: params.is_checkin
-                  })
-                });
-                batchMetadata.push({
-                  voucher_id: voucher.voucher_id,
-                  metadata: metadata
-                });
                 return _objectSpread(_objectSpread({}, voucher), {}, {
-                  metadata: metadata
+                  status: status
                 });
               });
               if (!(tempOrder && hasUpdatedVoucher)) {
@@ -2708,7 +2698,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }));
             case 11:
               this.core.effects.emit("".concat(this.name, ":onVouchersChange"), {});
-              if (!(batchMetadata.length === 0)) {
+              if (!(voucherIds.length === 0)) {
                 _context33.next = 14;
                 break;
               }
@@ -2723,8 +2713,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               externalSaleNumber = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) || undefined;
               orderId = (_ref20 = (_tempOrder$order_id2 = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _ref20 !== void 0 ? _ref20 : undefined;
               orderLookup = externalSaleNumber || orderId || (identity === null || identity === void 0 ? void 0 : identity.orderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopOrderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopFullOrderNumber) || undefined;
-              return _context33.abrupt("return", this.request.post('/machinecode/batch-metadata', {
-                data: batchMetadata,
+              return _context33.abrupt("return", this.request.post('/machinecode/batch', {
+                ids: voucherIds,
+                status: status,
                 order_lookup: orderLookup,
                 order_id: orderId,
                 external_sale_number: externalSaleNumber
@@ -2737,10 +2728,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee33, this);
       }));
-      function handleCheckIn(_x24) {
-        return _handleCheckIn.apply(this, arguments);
+      function handleRedeem(_x24) {
+        return _handleRedeem.apply(this, arguments);
       }
-      return handleCheckIn;
+      return handleRedeem;
     }()
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -197,6 +197,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;
@@ -230,6 +231,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * const ids = this.collectBookingHolderRecords(booking);
      */
     private collectBookingHolderRecords;
+    private setProductHolderFromBooking;
+    private syncLinkedBookingHoldersToProducts;
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
      *
@@ -458,7 +461,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -544,6 +544,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
       return;
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
     delete tempOrder.discount_list;
     const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
     const shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
@@ -1469,10 +1470,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return currentAmountGap === snapshotAmountGap;
   }
-  restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
-    const snapshot = this.getOriginalSalesSnapshot(tempOrder);
-    if (!snapshot)
-      return null;
+  hasShopDiscountChangedFromSnapshot(tempOrder, snapshot) {
+    const snapshotSummary = snapshot.summary && typeof snapshot.summary === "object" ? snapshot.summary : {};
+    const snapshotShopDiscount = snapshot.shop_discount ?? snapshotSummary.shop_discount;
+    if (snapshotShopDiscount === void 0 || snapshotShopDiscount === null || snapshotShopDiscount === "") {
+      return !new import_decimal.default(tempOrder.shop_discount || 0).equals(0);
+    }
+    return !new import_decimal.default(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
+  }
+  restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
     const currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
     if (currentFingerprint !== snapshot.productFingerprint) {
       const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
@@ -1787,6 +1793,47 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const records = Array.isArray(source) ? source : [source];
     return records.filter((record) => record !== void 0 && record !== null && record !== "");
   }
+  setProductHolderFromBooking(product, booking) {
+    if (!product || !booking)
+      return;
+    const holderRecords = this.collectBookingHolderRecords(booking);
+    if (!product.metadata || typeof product.metadata !== "object") {
+      product.metadata = {};
+    }
+    product.metadata.holder_id = holderRecords.length > 0 ? holderRecords : null;
+  }
+  syncLinkedBookingHoldersToProducts(tempOrder) {
+    const bookings = tempOrder.bookings || [];
+    const products = tempOrder.products || [];
+    if (!bookings.length || !products.length)
+      return;
+    const bookingByProductUid = /* @__PURE__ */ new Map();
+    const bookingByBookingUid = /* @__PURE__ */ new Map();
+    bookings.forEach((booking) => {
+      var _a, _b;
+      if (!booking || typeof booking !== "object")
+        return;
+      const productUid = booking.product_uid || ((_a = booking.metadata) == null ? void 0 : _a.product_uid);
+      if (productUid !== void 0 && productUid !== null && String(productUid) !== "") {
+        bookingByProductUid.set(String(productUid), booking);
+      }
+      const bookingUid = ((_b = booking.metadata) == null ? void 0 : _b.unique_identification_number) || booking.booking_uid;
+      if (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "") {
+        bookingByBookingUid.set(String(bookingUid), booking);
+      }
+    });
+    products.forEach((product) => {
+      var _a, _b;
+      if (!product || typeof product !== "object")
+        return;
+      const productUid = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) || product.unique_identification_number;
+      const bookingUid = product.booking_uid || ((_b = product.metadata) == null ? void 0 : _b.booking_uid);
+      const linkedBooking = (productUid !== void 0 && productUid !== null && String(productUid) !== "" ? bookingByProductUid.get(String(productUid)) : void 0) || (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "" ? bookingByBookingUid.get(String(bookingUid)) : void 0);
+      if (linkedBooking) {
+        this.setProductHolderFromBooking(product, linkedBooking);
+      }
+    });
+  }
   /**
    * 按 form_record 顺序读取 booking holder 的主字段名称。
    *
@@ -1866,6 +1913,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (nextHolder || hasHolderSource || bookings.length === 0) {
       tempOrder.holder = nextHolder;
     }
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
   }
   getBookingUniqueIdentificationNumber(booking) {
     var _a;
@@ -1931,14 +1979,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
+    var _a;
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder)
       return null;
     this.sanitizeTempOrderProducts(tempOrder);
-    const snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+    const originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
+    const hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
+    const shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
+    const snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
     if (snapshotSummary)
       return snapshotSummary;
-    const shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+    const shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
     const summaryProducts = shouldFullRecalculateFromSnapshot ? (0, import_lodash_es.cloneDeep)(tempOrder.products || []) : tempOrder.products;
     if (shouldFullRecalculateFromSnapshot) {
       this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
@@ -1985,7 +2037,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const salesSummaryResult = await salesSummary.getSummary({
       products: summaryProducts,
       isPriceIncludeTax: tempOrder.is_price_include_tax,
-      shopDiscount: tempOrder.shop_discount
+      shopDiscount: tempOrder.shop_discount,
+      ...((_a = this.otherParams) == null ? void 0 : _a.channel) ? { channel: this.otherParams.channel } : {}
     });
     if (shouldFullRecalculateFromSnapshot) {
       tempOrder.products = summaryProducts;
@@ -3904,6 +3957,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         products: (0, import_lodash_es.cloneDeep)(nextTempOrder.products || []),
         payments: (0, import_lodash_es.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []),
+        shop_discount: nextTempOrder.shop_discount || "0.00",
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
       }
     };
@@ -4069,6 +4123,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product.booking_uid = linkedBookingUid;
       product.metadata.booking_uid = linkedBookingUid;
     });
+    this.syncLinkedBookingHoldersToProducts(tempOrder);
   }
   pickHydratedDisplayText(value) {
     if (value === void 0 || value === null)

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

@@ -9,16 +9,19 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private store;
     private request;
     private surchargeListModuleName;
+    private otherParams;
+    private surchargeListChannel;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
-     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
      *
      * @example
-     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
      */
     updateOtherParams(params: Record<string, any>): Promise<void>;
-    getSurchargeList(): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(channel?: string): Promise<void>;
     private getAppData;
     private getTaxConfig;
     getSummary(params: {
@@ -26,6 +29,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

package/lib/modules/SalesSummary/index.js

@@ -33,12 +33,15 @@ var salesSummaryDataKeys = {
   taxTitle: "tax_title",
   taxCountryCode: "tax_country_code"
 };
+var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "salesSummary";
     this.defaultVersion = "1.0.0";
     this.surchargeListModuleName = "surchargeList";
+    this.otherParams = {};
+    this.surchargeListChannel = DEFAULT_SURCHARGE_CHANNEL;
   }
   async initialize(core, options) {
     var _a, _b, _c;
@@ -46,9 +49,10 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.appPlugin = this.core.getPlugin("app");
     this.request = this.core.getPlugin("request");
+    this.otherParams = options.otherParams || {};
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
-    this.surchargeListModuleName = ((_c = options.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
+    this.surchargeListModuleName = ((_c = this.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
     if (!this.appPlugin) {
       throw new Error("SalesSummaryModule 需要 app 插件支持");
     }
@@ -58,41 +62,50 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     await this.getSurchargeList();
   }
   /**
-   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
    *
    * @example
-   * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+   * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
    */
   async updateOtherParams(params) {
+    const previousChannel = this.resolveChannel();
     const nextSurchargeListModuleName = (params == null ? void 0 : params.surchargeListModuleName) || "surchargeList";
-    if (nextSurchargeListModuleName === this.surchargeListModuleName)
-      return;
+    const nextChannel = this.resolveChannel(params);
+    const shouldReload = nextSurchargeListModuleName !== this.surchargeListModuleName || nextChannel !== previousChannel;
+    this.otherParams = params || {};
     this.surchargeListModuleName = nextSurchargeListModuleName;
-    await this.getSurchargeList();
+    if (shouldReload) {
+      await this.getSurchargeList(nextChannel);
+    }
   }
-  async getSurchargeList() {
+  resolveChannel(params = this.otherParams) {
+    return (params == null ? void 0 : params.channel) || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(channel = this.resolveChannel()) {
     try {
       const surchargeListModule = this.core.getModule(
         this.surchargeListModuleName
       );
       if (surchargeListModule == null ? void 0 : surchargeListModule.getSurchargeList) {
-        this.store.surchargeList = await surchargeListModule.getSurchargeList();
+        this.store.surchargeList = await surchargeListModule.getSurchargeList({ channel });
+        this.surchargeListChannel = channel;
         return;
       }
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          // TODO 真实的渠道
-          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.surchargeListChannel = channel;
     } catch (error) {
       console.warn("[SalesSummaryModule] 加载附加费配置失败", error);
       this.store.surchargeList = [];
+      this.surchargeListChannel = channel;
     }
   }
   getAppData(key) {
@@ -114,7 +127,11 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   }
   async getSummary(params) {
     var _a, _b;
-    const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
+    const { products = [], isPriceIncludeTax, taxRate, shopDiscount, channel } = params;
+    const summaryChannel = channel || this.resolveChannel();
+    if (summaryChannel !== this.surchargeListChannel) {
+      await this.getSurchargeList(summaryChannel);
+    }
     const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`

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

@@ -63,5 +63,6 @@ export interface SalesSummaryModuleAPI {
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<SalesSummaryData>;
 }

package/lib/modules/SalesSummary/utils.js

@@ -308,6 +308,8 @@ function getFallbackAllProductSurchargeIds(surchargeList) {
       return ids;
     if (Number(config.is_all ?? 0) !== 1)
       return ids;
+    if (Number(config.open_schedule ?? 0) === 1 && config.schedule_type !== "all")
+      return ids;
     ids.push(id);
     return ids;
   }, []);

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

@@ -1,16 +1,18 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { SurchargeListItem, SurchargeListModuleAPI } from './types';
+import { SurchargeListItem, SurchargeListModuleAPI, SurchargeListQuery } from './types';
 export * from './types';
 export declare class SurchargeListModule extends BaseModule implements Module, SurchargeListModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private request;
     private store;
-    private loadingPromise;
+    private loadingPromises;
+    private requestVersion;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    getSurchargeList(): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    private resolveChannel;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
     private loadSurchargeList;
 }

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/index.d.ts

@@ -431,9 +431,9 @@ declare class Server {
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
-    private handleMachinecodeBatchMetadata;
+    private handleMachinecodeBatchMeta;
     private resolveMachinecodeBatchMetadataLookup;
-    private syncMachinecodeBatchMetadataToLocalOrder;
+    private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;