@pisell/pisellos 2.3.22 → 2.3.23

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

@@ -276,6 +276,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private shouldKeepCustomerBoundDiscountAfterCustomerChange;
     private productHasCustomerBoundDiscount;
     private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
@@ -463,7 +464,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/dist/modules/Order/index.js

@@ -492,7 +492,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
+        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentEditDiscounts, currentScanDiscounts, currentScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -511,30 +511,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               discountList = _context3.sent;
               if (!discountList) {
-                _context3.next = 13;
+                _context3.next = 16;
                 break;
               }
-              currentEditDiscounts = (((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || []).filter(function (discount) {
+              currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
+              currentEditDiscounts = currentDiscountList.filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
               });
+              currentScanDiscounts = currentDiscountList.filter(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.isScan;
+              });
+              currentScanDiscountIds = new Set(currentScanDiscounts.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }));
               runtimeDiscountIds = new Set();
               runtimeDiscounts = discountList.filter(function (discount) {
+                if (currentScanDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
                 if (runtimeDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
                 runtimeDiscountIds.add(discount === null || discount === void 0 ? void 0 : discount.id);
                 return true;
               });
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(runtimeDiscounts));
-              _context3.next = 11;
+              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(currentScanDiscounts), _toConsumableArray(runtimeDiscounts));
+              _context3.next = 14;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 11:
-              _context3.next = 13;
+            case 14:
+              _context3.next = 16;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 13:
+            case 16:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 15:
+            case 18:
             case "end":
               return _context3.stop();
           }
@@ -2962,6 +2970,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var type = (_discount$type5 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type5 !== void 0 ? _discount$type5 : discount === null || discount === void 0 ? void 0 : discount.tag;
       return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
     }
+  }, {
+    key: "shouldKeepCustomerBoundDiscountAfterCustomerChange",
+    value: function shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
+      return Boolean((discount === null || discount === void 0 ? void 0 : discount.isScan) || (discount === null || discount === void 0 ? void 0 : discount.isEditMode));
+    }
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
@@ -3029,11 +3042,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
+        if (_this18.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
         return !_this18.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (discount !== null && discount !== void 0 && discount.isEditMode) return true;
+        if (_this18.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
         return !_this18.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));

package/dist/modules/Order/utils.d.ts

@@ -67,8 +67,8 @@ export declare function sumOptionUnitPrice(options?: Array<{
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
     productsByUid?: Record<string, Record<string, any>>;

package/dist/modules/Order/utils.js

@@ -252,8 +252,8 @@ function getOrderProductDeposit(product, runtimeOrigin) {
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export function calculateOrderProductsDeposit() {
   var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -273,30 +273,18 @@ export function calculateOrderProductsDeposit() {
       product.deposit = deposit;
       if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
       total = total.plus(deposit.total);
-      var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+      var _iterator4 = _createForOfIteratorHelper(deposit.protocols || []),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var discount = _step4.value;
-          total = total.minus((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+          var protocol = _step4.value;
+          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
         }
       } catch (err) {
         _iterator4.e(err);
       } finally {
         _iterator4.f();
       }
-      var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var protocol = _step5.value;
-          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
       hasDeposit = true;
     }
   } catch (err) {
@@ -460,19 +448,19 @@ function resolveSubmitBundleMapId(bundle) {
 }
 function collectSubmitProductDiscountList(product) {
   var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
-  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
-    _step6;
+  var _iterator5 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+    _step5;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var bundle = _step6.value;
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var bundle = _step5.value;
       if (!bundle || _typeof(bundle) !== 'object') continue;
       var bundleMapId = resolveSubmitBundleMapId(bundle);
       var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
-      var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
-        _step7;
+      var _iterator6 = _createForOfIteratorHelper(bundleDiscountList),
+        _step6;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var discount = _step7.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var discount = _step6.value;
           if (!discount || _typeof(discount) !== 'object') continue;
           var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
           var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
@@ -483,15 +471,15 @@ function collectSubmitProductDiscountList(product) {
           } : {}));
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator7.f();
+        _iterator6.f();
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator5.e(err);
   } finally {
-    _iterator6.f();
+    _iterator5.f();
   }
   return normalizeOrderProductDiscountList(submitDiscountList);
 }
@@ -961,19 +949,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator8 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step8;
+  var _iterator7 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step7;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var key = _step8.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var key = _step7.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator8.f();
+    _iterator7.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -1286,25 +1274,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator9 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step9;
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step8;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var product = _step9.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var product = _step8.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator9.f();
+    _iterator8.f();
   }
-  var _iterator10 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step10;
+  var _iterator9 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step9;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var booking = _step10.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var booking = _step9.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1315,9 +1303,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator10.f();
+    _iterator9.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -52,6 +52,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private salesDetailLoadInFlight;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
+    private serverOrderChangeSyncEnabled;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -73,6 +74,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     private logError;
     private isCurrentSalesOrderRecord;
+    setServerOrderChangeSyncEnabled(enabled: boolean): void;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;

package/dist/solution/BaseSales/index.js

@@ -187,6 +187,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "salesDetailLoadInFlight", false);
     _defineProperty(_assertThisInitialized(_this), "serverOrderChangeUnsubscribe", null);
     _defineProperty(_assertThisInitialized(_this), "serverOrderChangeHydrateInFlight", null);
+    _defineProperty(_assertThisInitialized(_this), "serverOrderChangeSyncEnabled", false);
     return _this;
   }
 
@@ -276,6 +277,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return isSameBaseSalesOrderRecord(record, order);
       });
     }
+  }, {
+    key: "setServerOrderChangeSyncEnabled",
+    value: function setServerOrderChangeSyncEnabled(enabled) {
+      this.serverOrderChangeSyncEnabled = enabled;
+    }
   }, {
     key: "syncCurrentSalesDetailFromServerOrderChange",
     value: function () {
@@ -286,7 +292,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload === null || payload === void 0 ? void 0 : payload.changedOrders) ? payload.changedOrders : payload !== null && payload !== void 0 && payload.data && _typeof(payload.data) === 'object' ? [payload.data] : [];
-              if (!(this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)) {
+              if (!(!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)) {
                 _context2.next = 3;
                 break;
               }

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

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

@@ -1,49 +0,0 @@
-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

@@ -276,6 +276,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private shouldKeepCustomerBoundDiscountAfterCustomerChange;
     private productHasCustomerBoundDiscount;
     private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
@@ -463,7 +464,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

@@ -445,9 +445,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...orderId ? { order_id: orderId } : {}
     }));
     if (discountList) {
-      const currentEditDiscounts = (((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || []).filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentDiscountList = ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || [];
+      const currentEditDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentScanDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isScan);
+      const currentScanDiscountIds = new Set(
+        currentScanDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+      );
       const runtimeDiscountIds = /* @__PURE__ */ new Set();
       const runtimeDiscounts = discountList.filter((discount) => {
+        if (currentScanDiscountIds.has(discount == null ? void 0 : discount.id))
+          return false;
         if (runtimeDiscountIds.has(discount == null ? void 0 : discount.id))
           return false;
         runtimeDiscountIds.add(discount == null ? void 0 : discount.id);
@@ -455,6 +462,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       const mergedDiscountList = [
         ...currentEditDiscounts,
+        ...currentScanDiscounts,
         ...runtimeDiscounts
       ];
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
@@ -2214,6 +2222,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
     return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
   }
+  shouldKeepCustomerBoundDiscountAfterCustomerChange(discount) {
+    return Boolean((discount == null ? void 0 : discount.isScan) || (discount == null ? void 0 : discount.isEditMode));
+  }
   productHasCustomerBoundDiscount(product) {
     if (((product == null ? void 0 : product.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))) {
       return true;
@@ -2269,12 +2280,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const currentDiscounts = ((_a = discountModule.getDiscountList) == null ? void 0 : _a.call(discountModule)) || [];
     const currentOriginalDiscounts = ((_b = discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
     const nextDiscounts = currentDiscounts.filter((discount) => {
-      if (discount == null ? void 0 : discount.isEditMode)
+      if (this.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount))
         return true;
       return !this.isCustomerBoundDiscount(discount);
     });
     const nextOriginalDiscounts = currentOriginalDiscounts.filter((discount) => {
-      if (discount == null ? void 0 : discount.isEditMode)
+      if (this.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount))
         return true;
       return !this.isCustomerBoundDiscount(discount);
     });

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

@@ -67,8 +67,8 @@ export declare function sumOptionUnitPrice(options?: Array<{
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
     productsByUid?: Record<string, Record<string, any>>;

package/lib/modules/Order/utils.js

@@ -286,9 +286,6 @@ function calculateOrderProductsDeposit(products = [], options) {
     if (!(deposit == null ? void 0 : deposit.total) || Number(deposit.total) <= 0)
       continue;
     total = total.plus(deposit.total);
-    for (const discount of product.discount_list || []) {
-      total = total.minus((discount == null ? void 0 : discount.amount) || 0);
-    }
     for (const protocol of deposit.protocols || []) {
       if (!protocolMap.has(protocol.id))
         protocolMap.set(protocol.id, protocol);

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -52,6 +52,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private salesDetailLoadInFlight;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
+    private serverOrderChangeSyncEnabled;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -73,6 +74,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     private logError;
     private isCurrentSalesOrderRecord;
+    setServerOrderChangeSyncEnabled(enabled: boolean): void;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;

package/lib/solution/BaseSales/index.js

@@ -193,6 +193,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.salesDetailLoadInFlight = false;
     this.serverOrderChangeUnsubscribe = null;
     this.serverOrderChangeHydrateInFlight = null;
+    this.serverOrderChangeSyncEnabled = false;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -266,9 +267,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     ].filter(Boolean);
     return currentRecords.some((record) => isSameBaseSalesOrderRecord(record, order));
   }
+  setServerOrderChangeSyncEnabled(enabled) {
+    this.serverOrderChangeSyncEnabled = enabled;
+  }
   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)
+    if (!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
       return;
     const changedOrder = changedOrders.find(
       (order) => this.isCurrentSalesOrderRecord(order)

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

package/package.json

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