@pisell/pisellos 0.10.49 → 0.10.51

package/dist/modules/Rules/index.js

@@ -191,11 +191,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           unavailableReason: UnavailableReason.AlreadyUsed
         };
       }
+      var scannedEntitlementPassIds = newDiscountList.filter(function (discount) {
+        return isEntitlementPass(discount);
+      }).map(function (discount) {
+        return discount.id;
+      });
+      var scannedEntitlementPassIdSet = new Set(scannedEntitlementPassIds.map(String));
 
-      // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
-      // 保留之前扫码得到的商品券（isScan: true）
+      // 客户次卡必须保留在完整列表中；同一实例以本次扫码数据更新。
+      // 历史折扣不参与试算，商品券继续沿用仅保留扫码来源的规则。
       var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
-        return !discount.isEditMode && (!isFullCoveragePass(discount) || discount.isScan);
+        return !discount.isEditMode && (!isFullCoveragePass(discount) || isEntitlementPass(discount) || discount.isScan) && !scannedEntitlementPassIdSet.has(String(discount.id));
       });
       var mergedDiscountList = uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList)));
       var result = this.calcDiscount({
@@ -205,7 +211,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         holders: holders,
         isFormSubject: isFormSubject
       }, {
-        scan: true
+        scan: true,
+        preferredEntitlementPassIds: scannedEntitlementPassIds
       });
 
       // 检查是否有产品使用了新折扣
@@ -368,6 +375,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         holders = _ref8.holders,
         isFormSubject = _ref8.isFormSubject,
         orderTotalAmount = _ref8.orderTotalAmount;
+      var preferredEntitlementPassIds = new Set(((options === null || options === void 0 ? void 0 : options.preferredEntitlementPassIds) || []).map(String));
       var resolveIsFormSubject = function resolveIsFormSubject(product) {
         return typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
       };
@@ -1179,7 +1187,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config3 = discount.config) !== null && _discount$config3 !== void 0 && _discount$config3.isAvailable && (!isEntitlementPass(discount) || getRemainingEntitlementUses(discount, 0, 1) > 0)) {
-            var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
+            var _discountApplicabilit, _discount$metadata4, _discount$metadata5, _discount$metadata6;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -1206,6 +1214,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
+                encoded: ((_discount$metadata6 = discount.metadata) === null || _discount$metadata6 === void 0 ? void 0 : _discount$metadata6.encoded) || discount.encoded,
                 num: num,
                 discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
               }
@@ -1406,7 +1415,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 用户显式点击某张卡券时，本次选择优先于自动排序和扫码默认选择。
+        // 识别用户本次显式选择的卡券，供次卡和折扣卡各自的优先级使用。
         // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
         var explicitlySelectedDiscount = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
           var discountType = discount.tag || discount.type || '';
@@ -1415,10 +1424,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
         var explicitlySelectedDiscountCard = explicitlySelectedDiscount && !isFullCoveragePass(explicitlySelectedDiscount) ? explicitlySelectedDiscount : undefined;
 
-        // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的折扣卡仍在
+        // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的卡仍在
         // applicableDiscounts 中，就应保留该行选择，避免被自动排序中力度更大的卡替换。
-        var appliedDiscountCardIds = new Set((product.discount_list || []).filter(function (item) {
-          return ['discount_card', 'product_discount_card'].includes((item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 ? void 0 : item.type));
+        var appliedWalletDiscountIds = new Set((product.discount_list || []).filter(function (item) {
+          return ['entitlement_pass', 'discount_card', 'product_discount_card'].includes((item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 ? void 0 : item.type));
         }).map(function (item) {
           var _ref24, _item$discount$resour, _item$discount;
           return (_ref24 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref24 !== void 0 ? _ref24 : item === null || item === void 0 ? void 0 : item.id;
@@ -1427,20 +1436,27 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }).map(String));
         var appliedDiscountCard = options !== null && options !== void 0 && options.scan ? undefined : applicableDiscounts.find(function (discount) {
           var discountType = discount.tag || discount.type || '';
-          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedWalletDiscountIds.has(String(discount.id));
+        });
+        var appliedEntitlementPass = options !== null && options !== void 0 && options.scan || (options === null || options === void 0 ? void 0 : options.preserveEntitlementSelection) === false ? undefined : applicableDiscounts.find(function (discount) {
+          return isEntitlementPass(discount) && discount.isSelected === true && appliedWalletDiscountIds.has(String(discount.id));
         });
 
-        // Entitlement Pass 始终按协议优先级使用；没有新卡时沿用原选择优先级。
+        // 次卡内部按本次手选/扫码、当前行已应用、默认排序选择。
         var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && !isFullCoveragePass(n);
         });
         var selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
-        var highestPriorityEntitlementPass = applicableDiscounts.find(function (discount) {
+        var selectedEntitlementPass = (explicitlySelectedDiscount && isEntitlementPass(explicitlySelectedDiscount) ? explicitlySelectedDiscount : undefined) || applicableDiscounts.find(function (discount) {
+          return isEntitlementPass(discount) && preferredEntitlementPassIds.has(String(discount.id));
+        }) || appliedEntitlementPass || applicableDiscounts.find(function (discount) {
           return isEntitlementPass(discount);
         });
-        var selectedDiscount = highestPriorityEntitlementPass || explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
-        var prioritizedApplicableDiscounts = !highestPriorityEntitlementPass && explicitlySelectedDiscount && isFullCoveragePass(explicitlySelectedDiscount) ? [explicitlySelectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (discount) {
-          return isFullCoveragePass(discount) && String(discount.id) !== String(explicitlySelectedDiscount.id);
+        // 手选优先；普通重算保留当前折扣卡，扫码和最优选择仍使用原有优先级。
+        var selectedDiscount = explicitlySelectedDiscount || ((options === null || options === void 0 ? void 0 : options.preserveEntitlementSelection) !== false && preferredEntitlementPassIds.size === 0 ? appliedDiscountCard : undefined) || selectedEntitlementPass || selectedDiscountCard || applicableDiscounts[0];
+        // 实际次数分配必须使用同一顺序，避免选中状态切换后仍将次数分配给默认卡。
+        var prioritizedApplicableDiscounts = selectedDiscount && isFullCoveragePass(selectedDiscount) ? [selectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (discount) {
+          return isFullCoveragePass(discount) && String(discount.id) !== String(selectedDiscount.id);
         })), _toConsumableArray(applicableDiscounts.filter(function (discount) {
           return !isFullCoveragePass(discount);
         }))) : applicableDiscounts;
@@ -1683,7 +1699,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             count: 1
           }];
           for (var i = 0; i < discountUsageGroups.length; i++) {
-            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
+            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce, _selectedDiscount$met3;
             var _discountUsageGroups$ = discountUsageGroups[i],
               _selectedDiscount = _discountUsageGroups$.discount,
               appliedUseCount = _discountUsageGroups$.count;
@@ -1773,6 +1789,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _num: isFullCoverage ? appliedUseCount : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread(_objectSpread({
+                encoded: ((_selectedDiscount$met3 = _selectedDiscount.metadata) === null || _selectedDiscount$met3 === void 0 ? void 0 : _selectedDiscount$met3.encoded) || _selectedDiscount.encoded,
                 num: isFullCoverage ? appliedUseCount : 1,
                 discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
@@ -1830,7 +1847,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 同一卡实例的本次新增使用合并为一条，metadata.num 记录实际次数。
             for (var _i = 0; _i < fullCoveragePassUsageGroups.length; _i++) {
-              var _selectedDiscount2$me;
+              var _selectedDiscount2$me, _selectedDiscount2$me2;
               var _fullCoveragePassUsag = fullCoveragePassUsageGroups[_i],
                 _selectedDiscount2 = _fullCoveragePassUsag.discount,
                 _appliedUseCount = _fullCoveragePassUsag.count;
@@ -1862,6 +1879,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   discount_product_id: _selectedDiscount2.product_id
                 },
                 metadata: {
+                  encoded: ((_selectedDiscount2$me2 = _selectedDiscount2.metadata) === null || _selectedDiscount2$me2 === void 0 ? void 0 : _selectedDiscount2$me2.encoded) || _selectedDiscount2.encoded,
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
                   discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
@@ -1901,7 +1919,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount3$me, _selectedDiscount3$me2, _reapplyDiscountPerce2, _flatItem$parentProdu9;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _reapplyDiscountPerce2, _selectedDiscount3$me3, _flatItem$parentProdu9;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             markDiscountUsed(_selectedDiscount3);
@@ -1956,6 +1974,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: _selectedDiscount3.product_id
               },
               metadata: _objectSpread({
+                encoded: ((_selectedDiscount3$me3 = _selectedDiscount3.metadata) === null || _selectedDiscount3$me3 === void 0 ? void 0 : _selectedDiscount3$me3.encoded) || _selectedDiscount3.encoded,
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
                 discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
@@ -2133,8 +2152,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 更新主商品自己的 discount_list 中的 num（quantity=1）
               var updatedMainDiscountList = mainProductData.discount_list.map(function (discount) {
-                var _discount$metadata6, _discount$metadata7;
-                if (discount !== null && discount !== void 0 && (_discount$metadata6 = discount.metadata) !== null && _discount$metadata6 !== void 0 && _discount$metadata6.custom_product_bundle_map_id) {
+                var _discount$metadata7, _discount$metadata8;
+                if (discount !== null && discount !== void 0 && (_discount$metadata7 = discount.metadata) !== null && _discount$metadata7 !== void 0 && _discount$metadata7.custom_product_bundle_map_id) {
                   // bundle的discount_list保持不变
                   return discount;
                 }
@@ -2142,7 +2161,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, discount), {}, {
                   // num: 1,
                   metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
-                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata7 = discount.metadata) === null || _discount$metadata7 === void 0 ? void 0 : _discount$metadata7.custom_product_bundle_map_id,
+                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata8 = discount.metadata) === null || _discount$metadata8 === void 0 ? void 0 : _discount$metadata8.custom_product_bundle_map_id,
                     num: 1
                   })
                 });
@@ -2207,8 +2226,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 更新主商品自己的 discount_list 中的 num（quantity=原quantity-1）
                 var updatedMainDiscountListOriginal = mainProductData.discount_list.map(function (discount) {
-                  var _discount$metadata8, _discount$metadata9;
-                  if (discount !== null && discount !== void 0 && (_discount$metadata8 = discount.metadata) !== null && _discount$metadata8 !== void 0 && _discount$metadata8.custom_product_bundle_map_id) {
+                  var _discount$metadata9, _discount$metadata10;
+                  if (discount !== null && discount !== void 0 && (_discount$metadata9 = discount.metadata) !== null && _discount$metadata9 !== void 0 && _discount$metadata9.custom_product_bundle_map_id) {
                     // bundle的discount_list保持不变
                     return discount;
                   }
@@ -2216,7 +2235,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread(_objectSpread({}, discount), {}, {
                     metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                       num: mainProductQuantity - 1,
-                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata9 = discount.metadata) === null || _discount$metadata9 === void 0 ? void 0 : _discount$metadata9.custom_product_bundle_map_id
+                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
                     })
                     // num: mainProductQuantity - 1,
                   });
@@ -2286,11 +2305,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                         var nextBundleSellingPrice = (_ref28 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref28 !== void 0 ? _ref28 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                          var _discount$metadata10;
+                          var _discount$metadata11;
                           return _objectSpread(_objectSpread({}, discount), {}, {
                             metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                               num: item.num,
-                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
+                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata11 = discount.metadata) === null || _discount$metadata11 === void 0 ? void 0 : _discount$metadata11.custom_product_bundle_map_id
                             })
                             // num: item.num, // 使用拆分后的 num
                           });

package/dist/modules/Rules/types.d.ts

@@ -29,6 +29,10 @@ export interface RulesCalcDiscountOptions {
     discountId?: number;
     selectedList?: SetDiscountSelectedParams[];
     scan?: boolean;
+    /** 本次扫码优先使用的次卡实例；普通重算不传，继续保留商品行当前选择。 */
+    preferredEntitlementPassIds?: number[];
+    /** 普通重算保留商品行已应用的次卡；最优选择传 false 恢复自动排序。 */
+    preserveEntitlementSelection?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
 }

package/dist/modules/index.d.ts

@@ -17,6 +17,7 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './FulfillmentTiming';
 export * from './BookingContext';
 export * from './Holder';
 export * from './ResourcePlanner';

package/dist/modules/index.js

@@ -17,6 +17,7 @@ export * from "./Schedule";
 export * from "./Quotation";
 export * from "./ScanOrderLogger";
 export * from "./OpenData";
+export * from "./FulfillmentTiming";
 export * from "./BookingContext";
 export * from "./Holder";
 export * from "./ResourcePlanner";

package/dist/server/modules/order/index.d.ts

@@ -24,6 +24,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private lastRecentSqliteWriteCleanupAtMs;
     /** 最近一次 SSE 全量拉取完成时间 */
     private lastServerFullFetchAtMs;
+    private businessDayRefreshPromise;
     constructor(name?: string, version?: string);
     /**
      * 广播订单变更事件，兼容全量列表订阅并额外携带本次变更订单。
@@ -130,6 +131,13 @@ export declare class OrderModule extends BaseModule implements Module {
     loadOrdersByServer(options?: {
         trigger?: string;
     }): Promise<OrderData[]>;
+    /**
+     * 供展示屏按需补齐当前营业日的订单快照；成功标记复用全量拉取落库逻辑。
+     * 拉取或落库失败时不记录已刷新，下一次调用仍可重试。
+     */
+    refreshOrdersForCurrentBusinessDay(options?: {
+        trigger?: string;
+    }): Promise<void>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
      * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件