@pisell/pisellos 2.2.290 → 2.2.292

package/dist/model/strategy/adapter/dataVariant/evaluator.js

@@ -322,8 +322,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       if (!(appliedInfo !== null && appliedInfo !== void 0 && (_appliedInfo$appliedF = appliedInfo.appliedFields) !== null && _appliedInfo$appliedF !== void 0 && _appliedInfo$appliedF.length)) {
         return originalItem;
       }
+
+      // 套餐加价/减价使用配置价；仅商品原价模式跟随子商品的 Data Variant 价格。
+      var isOriginalPriceBundleItem = originalItem.price_type === 'markup' && originalItem.price_type_ext === 'product_price';
+      var appliedFields = appliedInfo.appliedFields.filter(function (field) {
+        return field !== 'price' || isOriginalPriceBundleItem;
+      });
+      if (!appliedFields.length) {
+        return originalItem;
+      }
       var result = _objectSpread({}, originalItem);
-      var _iterator6 = _createForOfIteratorHelper(appliedInfo.appliedFields),
+      var _iterator6 = _createForOfIteratorHelper(appliedFields),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -337,7 +346,9 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       } finally {
         _iterator6.f();
       }
-      result._dataVariant = appliedInfo;
+      result._dataVariant = _objectSpread(_objectSpread({}, appliedInfo), {}, {
+        appliedFields: appliedFields
+      });
       return result;
     }
   }, {

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

@@ -179,6 +179,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private normalizeDepositFlag;
+    private getHistoricalDepositSnapshot;
     private getLastOrderDepositSnapshot;
     private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;

package/dist/modules/Order/index.js

@@ -1534,21 +1534,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
     }
   }, {
-    key: "getLastOrderDepositSnapshot",
-    value: function getLastOrderDepositSnapshot() {
-      var _lastOrderInfo$deposi, _lastOrderInfo$summar;
-      var lastOrderInfo = this.store.lastOrderInfo;
-      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return null;
-      var rawDepositAmount = (_lastOrderInfo$deposi = lastOrderInfo.deposit_amount) !== null && _lastOrderInfo$deposi !== void 0 ? _lastOrderInfo$deposi : (_lastOrderInfo$summar = lastOrderInfo.summary) === null || _lastOrderInfo$summar === void 0 ? void 0 : _lastOrderInfo$summar.deposit_amount;
+    key: "normalizeDepositFlag",
+    value: function normalizeDepositFlag(value) {
+      if (value === 0 || value === '0') return 0;
+      if (value === 1 || value === '1') return 1;
+      return null;
+    }
+  }, {
+    key: "getHistoricalDepositSnapshot",
+    value: function getHistoricalDepositSnapshot(source) {
+      var _record$deposit_amoun, _record$summary, _this$normalizeDeposi;
+      if (!source || _typeof(source) !== 'object') return null;
+      var record = source;
+      var rawDepositAmount = (_record$deposit_amoun = record.deposit_amount) !== null && _record$deposit_amoun !== void 0 ? _record$deposit_amoun : (_record$summary = record.summary) === null || _record$summary === void 0 ? void 0 : _record$summary.deposit_amount;
       var depositAmount = this.normalizeDepositAmount(rawDepositAmount !== null && rawDepositAmount !== void 0 ? rawDepositAmount : 0);
-      var hasDepositAmount = new Decimal(depositAmount).gt(0);
-      var isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
-      if (!isDeposit || !hasDepositAmount) return null;
+      if (!new Decimal(depositAmount).gt(0)) return null;
       return {
-        isDeposit: 1,
+        // 兼容历史数据：旧快照缺少 is_deposit 时，沿用正定金金额的推导规则。
+        isDeposit: (_this$normalizeDeposi = this.normalizeDepositFlag(record.is_deposit)) !== null && _this$normalizeDeposi !== void 0 ? _this$normalizeDeposi : 1,
         depositAmount: depositAmount
       };
     }
+  }, {
+    key: "getLastOrderDepositSnapshot",
+    value: function getLastOrderDepositSnapshot() {
+      return this.getHistoricalDepositSnapshot(this.store.lastOrderInfo);
+    }
   }, {
     key: "getLastOrderSubmitSnapshot",
     value: function getLastOrderSubmitSnapshot() {
@@ -1595,7 +1606,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         })
       });
       tempOrder.deposit_amount = snapshot.depositAmount;
-      tempOrder.is_deposit = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+      tempOrder.is_deposit = snapshot.isDeposit;
       return nextSummary;
     }
   }, {
@@ -2305,6 +2316,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
     value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
+      var _historicalDepositSna;
       // merge hydrate 的商品集合包含本地未提交行，但 summary 仍来自远端旧订单，不能复用。
       if (snapshot.requiresFullSummaryRecalculation === true) return null;
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
@@ -2316,10 +2328,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
       var shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+      var historicalDepositSnapshot = this.getHistoricalDepositSnapshot(snapshot);
       if (shouldUseManualDepositOverride) {
         summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
-      } else if (manualDepositOverride) {
-        this.clearManualDepositOverride(tempOrder);
+      } else {
+        if (manualDepositOverride) {
+          this.clearManualDepositOverride(tempOrder);
+        }
+        if (historicalDepositSnapshot) {
+          summary = this.applyDepositAmountToSummary(tempOrder, summary, historicalDepositSnapshot.depositAmount);
+          tempOrder.is_deposit = historicalDepositSnapshot.isDeposit;
+        }
       }
       var isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
       if (!isPayableAmountUnchanged) return null;
@@ -2336,8 +2355,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         tempOrder.surcharges = cloneDeep(snapshot.surcharges);
       }
       tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
-      tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-      tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+      tempOrder.deposit_amount = this.normalizeDepositAmount(summary.deposit_amount || 0);
+      tempOrder.is_deposit = shouldUseManualDepositOverride ? new Decimal(tempOrder.deposit_amount).gt(0) ? 1 : 0 : (_historicalDepositSna = historicalDepositSnapshot === null || historicalDepositSnapshot === void 0 ? void 0 : historicalDepositSnapshot.isDeposit) !== null && _historicalDepositSna !== void 0 ? _historicalDepositSna : new Decimal(tempOrder.deposit_amount).gt(0) ? 1 : 0;
       var previousSummary = this.store.summary;
       this.store.summary = summary;
       this.updateTempOrderPaymentStatus(tempOrder, {
@@ -2998,7 +3017,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var isExistingDepositDisabled = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0);
       tempOrder.deposit_amount = depositAmount;
       tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
-      return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
+      return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
     }
   }, {
     key: "recalculateSummary",
@@ -6022,7 +6041,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(record, options) {
         var _sourceRaw$_extend, _this$store$discount22;
-        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
+        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, historicalDepositSnapshot, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
         return _regeneratorRuntime().wrap(function _callee42$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
             case 0:
@@ -6106,6 +6125,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 externalSaleNumber: nextTempOrder.external_sale_number
               };
               rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
+              historicalDepositSnapshot = this.getHistoricalDepositSnapshot(sourceLastOrderInfo);
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
               }) : cloneDeep(nextTempOrder.surcharges || []);
@@ -6113,7 +6133,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 surcharges: summarySurcharges
               });
               nextTempOrder._extend = _objectSpread(_objectSpread({}, nextTempOrder._extend || {}), {}, {
-                originalSalesSnapshot: _objectSpread({
+                originalSalesSnapshot: _objectSpread(_objectSpread({
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
                   bookings: cloneDeep(nextTempOrder.bookings || []),
@@ -6121,7 +6141,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
                   shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
-                }, isMergedSalesDetailHydrate ? {
+                }, historicalDepositSnapshot ? {
+                  is_deposit: historicalDepositSnapshot.isDeposit,
+                  deposit_amount: historicalDepositSnapshot.depositAmount
+                } : {}), isMergedSalesDetailHydrate ? {
                   requiresFullSummaryRecalculation: true
                 } : {})
               });
@@ -6144,28 +6167,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context45.next = 53;
+                _context45.next = 54;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context45.next = 51;
+              _context45.next = 52;
               return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList(nextDiscounts);
-            case 51:
-              _context45.next = 53;
+            case 52:
+              _context45.next = 54;
               return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setDiscountList(nextDiscounts);
-            case 53:
+            case 54:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context45.next = 56;
+                _context45.next = 57;
                 break;
               }
-              _context45.next = 56;
+              _context45.next = 57;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 56:
+            case 57:
               this.persistTempOrder();
               return _context45.abrupt("return", nextTempOrder);
-            case 58:
+            case 59:
             case "end":
               return _context45.stop();
           }

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

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

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

@@ -334,7 +334,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/dist/solution/Sales/index.d.ts

@@ -90,6 +90,13 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+    private sortUnpaidBookings;
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+    private buildUnpaidBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）

package/dist/solution/Sales/index.js

@@ -485,6 +485,64 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
     }
 
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+  }, {
+    key: "sortUnpaidBookings",
+    value: function sortUnpaidBookings(bookings, currentBookings) {
+      var _this4 = this;
+      var currentOrderIndexes = new Map(currentBookings.map(function (booking, index) {
+        return [String(booking.order.order_id), index];
+      }));
+      return _toConsumableArray(bookings).sort(function (left, right) {
+        var leftIndex = currentOrderIndexes.get(String(left.order.order_id));
+        var rightIndex = currentOrderIndexes.get(String(right.order.order_id));
+        if (leftIndex !== undefined || rightIndex !== undefined) {
+          if (leftIndex === undefined) return 1;
+          if (rightIndex === undefined) return -1;
+          return leftIndex - rightIndex;
+        }
+        var leftStartAt = _this4.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this4.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        return rightStartAt - leftStartAt;
+      });
+    }
+
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+  }, {
+    key: "buildUnpaidBookings",
+    value: function buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, currentBookings) {
+      var _this5 = this;
+      var legacyPrioritizedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+        includeAllFuture: true
+      });
+      var allBookings = this.sortMatchedBookings(unpaidBookingList.map(function (booking) {
+        var normalized = _this5.normalizeMatchedBooking(current, deviceCurrent, booking, {
+          includeCompleted: true
+        });
+        if (normalized) return normalized;
+        var appointmentStatus = _this5.getBookingAppointmentStatus(booking);
+        var status = appointmentStatus === 'started' ? 'occupied' : appointmentStatus === 'completed' ? 'completed' : 'reserved';
+        return _objectSpread(_objectSpread({}, booking), {}, {
+          status: status,
+          isTimeout: false,
+          timeoutTime: undefined,
+          progressPercent: undefined,
+          lateTime: undefined,
+          reserved_status: undefined,
+          remainingReserveTime: undefined
+        });
+      }));
+      var legacyOrderIds = new Set(legacyPrioritizedBookings.map(function (booking) {
+        return String(booking.order.order_id);
+      }));
+      return this.sortUnpaidBookings([].concat(_toConsumableArray(legacyPrioritizedBookings), _toConsumableArray(allBookings.filter(function (booking) {
+        return !legacyOrderIds.has(String(booking.order.order_id));
+      }))), currentBookings);
+    }
+
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -496,7 +554,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this4 = this;
+      var _this6 = this;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (bookings.length === 0) return [];
       var _this$getOperatingDay = this.getOperatingDayRange(current),
@@ -505,17 +563,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this6.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return startAt.isBefore(operatingDayEndExclusive) && _this4.isSameOrAfter(endAt, operatingDayStart);
+        return startAt.isBefore(operatingDayEndExclusive) && _this6.isSameOrAfter(endAt, operatingDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
         if (selectedBookings.length === 0) return selectedBookings;
         if (options.includeAllFuture) {
           var allFutureBookings = dayScopedBookings.filter(function (booking) {
-            var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+            var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
             return startAt.isValid() && startAt.isAfter(current);
           });
           return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(allFutureBookings));
@@ -525,21 +583,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this6.toBookingDateTime(booking.start_date, booking.start_time);
         }).filter(function (startAt) {
           return startAt.isValid();
         }).map(function (startAt) {
           return startAt.valueOf();
         }));
         var futureCandidates = dayScopedBookings.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           if (!startAt.isValid()) return false;
           return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
         });
         if (futureCandidates.length === 0) return selectedBookings;
-        var nextStartAt = _this4.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this6.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -551,10 +609,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this6.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this4.isSameOrAfter(current, startAt) && _this4.isSameOrBefore(current, endAt);
+        return _this6.isSameOrAfter(current, startAt) && _this6.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -566,14 +624,14 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current);
       });
       if (upcoming.length > 0) {
         if (options.includeAllFuture) return upcoming;
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -626,10 +684,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceBookings",
     value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
-      var _this5 = this;
+      var _this7 = this;
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var normalizedBookings = bookingList.map(function (booking) {
-        return _this5.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+        return _this7.normalizeMatchedBooking(current, deviceCurrent, booking, options);
       }).filter(function (booking) {
         return Boolean(booking);
       }).filter(function (booking) {
@@ -759,7 +817,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this6 = this;
+          _this8 = this;
         var bookingList,
           deviceTime,
           current,
@@ -815,16 +873,16 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               rawBookingMap = this.groupBookingsByResource(bookingList);
               bookingMap = this.groupBookingsByResource(normalizedBookings); // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this6.getResourceId(resource);
+                var resourceId = _this8.getResourceId(resource);
                 var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
                 var statsBookings = rawMatchedBookings.filter(function (booking) {
-                  return _this6.isBookingIncludedInStats(booking);
+                  return _this8.isBookingIncludedInStats(booking);
                 });
-                var orderCount = _this6.countBookingOrders(statsBookings);
+                var orderCount = _this8.countBookingOrders(statsBookings);
                 var bookingCount = statsBookings.length;
-                var compeleteBookingCount = _this6.countCompletedBookings(statsBookings);
-                var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
+                var compeleteBookingCount = _this8.countCompletedBookings(statsBookings);
+                var bookings = _this8.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
                   orderCount: orderCount,
@@ -861,7 +919,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
-          _this7 = this,
+          _this9 = this,
           _params$bookingList;
         var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, statsBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
@@ -901,7 +959,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
-                return String(_this7.getResourceId(resource)) === String(params.resourceId);
+                return String(_this9.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
                 _context6.next = 15;
@@ -911,18 +969,18 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
-                return _this7.isBookingMatchedResource(booking, resourceId);
+                return _this9.isBookingMatchedResource(booking, resourceId);
               });
               statsBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isBookingIncludedInStats(booking);
+                return _this9.isBookingIncludedInStats(booking);
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.getBookingAppointmentStatus(booking) === 'completed';
+                return _this9.getBookingAppointmentStatus(booking) === 'completed';
               }); // const unpaidBookingList = matchedBookingList.filter(
               //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
               // );
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isUnpaidBooking(booking);
+                return _this9.isUnpaidBooking(booking);
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
                 includeAllFuture: true
@@ -938,9 +996,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   remainingReserveTime: undefined
                 });
               });
-              unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
-                includeAllFuture: true
-              });
+              unpaidBookings = this.buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, bookings);
               orderCount = this.countBookingOrders(statsBookingList);
               bookingCount = statsBookingList.length;
               compeleteBookingCount = this.countCompletedBookings(statsBookingList);

package/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -234,15 +234,25 @@ class DataVariantEvaluator {
     if (!appliedInfo?.appliedFields?.length) {
       return originalItem;
     }
+
+    // 套餐加价/减价使用配置价；仅商品原价模式跟随子商品的 Data Variant 价格。
+    const isOriginalPriceBundleItem = originalItem.price_type === 'markup' && originalItem.price_type_ext === 'product_price';
+    const appliedFields = appliedInfo.appliedFields.filter(field => field !== 'price' || isOriginalPriceBundleItem);
+    if (!appliedFields.length) {
+      return originalItem;
+    }
     const result = {
       ...originalItem
     };
-    for (const field of appliedInfo.appliedFields) {
+    for (const field of appliedFields) {
       if (resolvedItem[field] !== undefined) {
         result[field] = resolvedItem[field];
       }
     }
-    result._dataVariant = appliedInfo;
+    result._dataVariant = {
+      ...appliedInfo,
+      appliedFields
+    };
     return result;
   }
   evaluateProductRules(rule, product, businessData, menuScopeMap) {

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

@@ -179,6 +179,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private normalizeDepositFlag;
+    private getHistoricalDepositSnapshot;
     private getLastOrderDepositSnapshot;
     private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;

package/lib/modules/Order/index.js

@@ -1006,19 +1006,26 @@ class OrderModule extends _BaseModule.BaseModule {
   normalizeDepositAmount(amount) {
     return _decimal.default.max(new _decimal.default(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
   }
-  getLastOrderDepositSnapshot() {
-    const lastOrderInfo = this.store.lastOrderInfo;
-    if (!lastOrderInfo || typeof lastOrderInfo !== 'object') return null;
-    const rawDepositAmount = lastOrderInfo.deposit_amount ?? lastOrderInfo.summary?.deposit_amount;
+  normalizeDepositFlag(value) {
+    if (value === 0 || value === '0') return 0;
+    if (value === 1 || value === '1') return 1;
+    return null;
+  }
+  getHistoricalDepositSnapshot(source) {
+    if (!source || typeof source !== 'object') return null;
+    const record = source;
+    const rawDepositAmount = record.deposit_amount ?? record.summary?.deposit_amount;
     const depositAmount = this.normalizeDepositAmount(rawDepositAmount ?? 0);
-    const hasDepositAmount = new _decimal.default(depositAmount).gt(0);
-    const isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
-    if (!isDeposit || !hasDepositAmount) return null;
+    if (!new _decimal.default(depositAmount).gt(0)) return null;
     return {
-      isDeposit: 1,
+      // 兼容历史数据：旧快照缺少 is_deposit 时，沿用正定金金额的推导规则。
+      isDeposit: this.normalizeDepositFlag(record.is_deposit) ?? 1,
       depositAmount
     };
   }
+  getLastOrderDepositSnapshot() {
+    return this.getHistoricalDepositSnapshot(this.store.lastOrderInfo);
+  }
   getLastOrderSubmitSnapshot() {
     const lastOrderInfo = this.store.lastOrderInfo;
     if (!lastOrderInfo || typeof lastOrderInfo !== 'object') return {};
@@ -1066,7 +1073,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     };
     tempOrder.deposit_amount = snapshot.depositAmount;
-    tempOrder.is_deposit = tempOrder.is_deposit === 0 && new _decimal.default(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+    tempOrder.is_deposit = snapshot.isDeposit;
     return nextSummary;
   }
   isDepositOrder(tempOrder, depositAmount) {
@@ -1603,10 +1610,17 @@ class OrderModule extends _BaseModule.BaseModule {
       ...(0, _lodashEs.cloneDeep)(snapshot.summary || {})
     };
     const shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+    const historicalDepositSnapshot = this.getHistoricalDepositSnapshot(snapshot);
     if (shouldUseManualDepositOverride) {
       summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
-    } else if (manualDepositOverride) {
-      this.clearManualDepositOverride(tempOrder);
+    } else {
+      if (manualDepositOverride) {
+        this.clearManualDepositOverride(tempOrder);
+      }
+      if (historicalDepositSnapshot) {
+        summary = this.applyDepositAmountToSummary(tempOrder, summary, historicalDepositSnapshot.depositAmount);
+        tempOrder.is_deposit = historicalDepositSnapshot.isDeposit;
+      }
     }
     const isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
     if (!isPayableAmountUnchanged) return null;
@@ -1623,8 +1637,8 @@ class OrderModule extends _BaseModule.BaseModule {
       tempOrder.surcharges = (0, _lodashEs.cloneDeep)(snapshot.surcharges);
     }
     tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
-    tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-    tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+    tempOrder.deposit_amount = this.normalizeDepositAmount(summary.deposit_amount || 0);
+    tempOrder.is_deposit = shouldUseManualDepositOverride ? new _decimal.default(tempOrder.deposit_amount).gt(0) ? 1 : 0 : historicalDepositSnapshot?.isDeposit ?? (new _decimal.default(tempOrder.deposit_amount).gt(0) ? 1 : 0);
     const previousSummary = this.store.summary;
     this.store.summary = summary;
     this.updateTempOrderPaymentStatus(tempOrder, {
@@ -2081,7 +2095,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const isExistingDepositDisabled = tempOrder.is_deposit === 0 && new _decimal.default(tempOrder.deposit_amount || 0).gt(0);
     tempOrder.deposit_amount = depositAmount;
     tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
-    return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
+    return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
     const tempOrder = options?.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
@@ -4187,6 +4201,7 @@ class OrderModule extends _BaseModule.BaseModule {
       externalSaleNumber: nextTempOrder.external_sale_number
     };
     const rawSummary = raw.summary && typeof raw.summary === 'object' ? raw.summary : {};
+    const historicalDepositSnapshot = this.getHistoricalDepositSnapshot(sourceLastOrderInfo);
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(s => ({
       ...(s || {})
     })) : (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []);
@@ -4205,6 +4220,10 @@ class OrderModule extends _BaseModule.BaseModule {
         surcharges: (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []),
         shop_discount: nextTempOrder.shop_discount || '0.00',
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || []),
+        ...(historicalDepositSnapshot ? {
+          is_deposit: historicalDepositSnapshot.isDeposit,
+          deposit_amount: historicalDepositSnapshot.depositAmount
+        } : {}),
         // merged record 的 summary 仍是远端旧值，保留快照仅用于完整重算的价格清理基线。
         ...(isMergedSalesDetailHydrate ? {
           requiresFullSummaryRecalculation: true

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

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

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

@@ -334,7 +334,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/lib/solution/Sales/index.d.ts

@@ -90,6 +90,13 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+    private sortUnpaidBookings;
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+    private buildUnpaidBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）

package/lib/solution/Sales/index.js

@@ -340,6 +340,53 @@ class SalesImpl extends _BaseModule.BaseModule {
     });
   }
 
+  /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+  sortUnpaidBookings(bookings, currentBookings) {
+    const currentOrderIndexes = new Map(currentBookings.map((booking, index) => [String(booking.order.order_id), index]));
+    return [...bookings].sort((left, right) => {
+      const leftIndex = currentOrderIndexes.get(String(left.order.order_id));
+      const rightIndex = currentOrderIndexes.get(String(right.order.order_id));
+      if (leftIndex !== undefined || rightIndex !== undefined) {
+        if (leftIndex === undefined) return 1;
+        if (rightIndex === undefined) return -1;
+        return leftIndex - rightIndex;
+      }
+      const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
+      const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
+      return rightStartAt - leftStartAt;
+    });
+  }
+
+  /**
+   * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+   * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+   */
+  buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, currentBookings) {
+    const legacyPrioritizedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+      includeAllFuture: true
+    });
+    const allBookings = this.sortMatchedBookings(unpaidBookingList.map(booking => {
+      const normalized = this.normalizeMatchedBooking(current, deviceCurrent, booking, {
+        includeCompleted: true
+      });
+      if (normalized) return normalized;
+      const appointmentStatus = this.getBookingAppointmentStatus(booking);
+      const status = appointmentStatus === 'started' ? 'occupied' : appointmentStatus === 'completed' ? 'completed' : 'reserved';
+      return {
+        ...booking,
+        status,
+        isTimeout: false,
+        timeoutTime: undefined,
+        progressPercent: undefined,
+        lateTime: undefined,
+        reserved_status: undefined,
+        remainingReserveTime: undefined
+      };
+    }));
+    const legacyOrderIds = new Set(legacyPrioritizedBookings.map(booking => String(booking.order.order_id)));
+    return this.sortUnpaidBookings([...legacyPrioritizedBookings, ...allBookings.filter(booking => !legacyOrderIds.has(String(booking.order.order_id)))], currentBookings);
+  }
+
   /**
    * 资源下 bookings 的返回裁剪策略：
    * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -679,9 +726,7 @@ class SalesImpl extends _BaseModule.BaseModule {
         remainingReserveTime: undefined
       };
     });
-    const unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
-      includeAllFuture: true
-    });
+    const unpaidBookings = this.buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, bookings);
     const orderCount = this.countBookingOrders(statsBookingList);
     const bookingCount = statsBookingList.length;
     const compeleteBookingCount = this.countCompletedBookings(statsBookingList);

package/package.json

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