@pisell/pisellos 0.10.88 → 0.10.91

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (227) hide show
  1. package/dist/model/strategy/adapter/itemRule/adapter.d.ts +3 -1
  2. package/dist/model/strategy/adapter/itemRule/adapter.js +74 -7
  3. package/dist/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
  4. package/dist/model/strategy/adapter/itemRule/evaluator.js +13 -0
  5. package/dist/model/strategy/adapter/itemRule/type.d.ts +40 -1
  6. package/dist/model/strategy/adapter/itemRule/type.js +10 -0
  7. package/dist/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
  8. package/dist/model/strategy/adapter/promotion/evaluator.js +103 -112
  9. package/dist/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
  10. package/dist/modules/BookingContext/utils/calendarBooking.js +207 -0
  11. package/dist/modules/BookingContext/utils/index.d.ts +1 -0
  12. package/dist/modules/BookingContext/utils/index.js +1 -0
  13. package/dist/modules/BookingContext/utils/productExtend.d.ts +21 -0
  14. package/dist/modules/BookingContext/utils/productExtend.js +132 -33
  15. package/dist/modules/BookingContext/utils/resources.js +1 -1
  16. package/dist/modules/Cart/index.js +4 -3
  17. package/dist/modules/Cart/types.d.ts +2 -0
  18. package/dist/modules/Cart/utils/cartProduct.d.ts +3 -1
  19. package/dist/modules/Cart/utils/cartProduct.js +59 -32
  20. package/dist/modules/Date/index.d.ts +1 -1
  21. package/dist/modules/Date/index.js +60 -14
  22. package/dist/modules/Date/types.d.ts +5 -0
  23. package/dist/modules/OpenData/salesSettings.js +1 -1
  24. package/dist/modules/OpenData/types.d.ts +9 -0
  25. package/dist/modules/OpenData/utils.d.ts +1 -1
  26. package/dist/modules/OpenData/utils.js +3 -2
  27. package/dist/modules/Order/index.d.ts +22 -7
  28. package/dist/modules/Order/index.js +1565 -1161
  29. package/dist/modules/Order/localEftposState.d.ts +13 -0
  30. package/dist/modules/Order/localEftposState.js +39 -0
  31. package/dist/modules/Order/types.d.ts +33 -11
  32. package/dist/modules/Order/types.js +2 -2
  33. package/dist/modules/Order/unpaidAmountGap.d.ts +6 -0
  34. package/dist/modules/Order/unpaidAmountGap.js +72 -0
  35. package/dist/modules/Order/utils.d.ts +4 -1
  36. package/dist/modules/Order/utils.js +185 -129
  37. package/dist/modules/Payment/walletpass.js +32 -6
  38. package/dist/modules/Product/types.d.ts +16 -0
  39. package/dist/modules/ProductList/index.js +1 -1
  40. package/dist/modules/ResourcePlanner/planner.d.ts +2 -0
  41. package/dist/modules/ResourcePlanner/planner.js +383 -24
  42. package/dist/modules/ResourcePlanner/types.d.ts +42 -0
  43. package/dist/modules/Rules/index.js +86 -54
  44. package/dist/modules/Schedule/index.d.ts +7 -1
  45. package/dist/modules/Schedule/index.js +155 -39
  46. package/dist/modules/Schedule/types.d.ts +2 -0
  47. package/dist/modules/bookingReadValidation.d.ts +6 -0
  48. package/dist/modules/bookingReadValidation.js +72 -0
  49. package/dist/plugins/request.d.ts +2 -0
  50. package/dist/server/index.d.ts +9 -0
  51. package/dist/server/index.js +1928 -1462
  52. package/dist/server/modules/form/index.d.ts +19 -0
  53. package/dist/server/modules/form/index.js +205 -0
  54. package/dist/server/modules/form/types.d.ts +13 -0
  55. package/dist/server/modules/form/types.js +3 -0
  56. package/dist/server/modules/index.d.ts +3 -0
  57. package/dist/server/modules/index.js +4 -0
  58. package/dist/server/modules/order/index.d.ts +21 -0
  59. package/dist/server/modules/order/index.js +1399 -831
  60. package/dist/server/modules/order/types.d.ts +3 -0
  61. package/dist/server/modules/order/utils/filterOrders.js +20 -0
  62. package/dist/server/modules/products/index.d.ts +28 -7
  63. package/dist/server/modules/products/index.js +1295 -769
  64. package/dist/server/modules/products/replication.d.ts +8 -0
  65. package/dist/server/modules/products/replication.js +69 -0
  66. package/dist/server/modules/products/types.d.ts +12 -1
  67. package/dist/server/modules/products/types.js +4 -0
  68. package/dist/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
  69. package/dist/shared/receipt/customerInvoiceLanguages.js +5 -3
  70. package/dist/shared/receipt/small-ticket.d.ts +1 -0
  71. package/dist/shared/receipt/small-ticket.js +58 -26
  72. package/dist/shared/receipt/templateVisibility.d.ts +3 -0
  73. package/dist/shared/receipt/templateVisibility.js +6 -2
  74. package/dist/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
  75. package/dist/solution/BaseSales/fulfillmentItemRules.js +750 -0
  76. package/dist/solution/BaseSales/index.d.ts +22 -6
  77. package/dist/solution/BaseSales/index.js +1881 -1347
  78. package/dist/solution/BaseSales/pickupTiming.d.ts +4 -0
  79. package/dist/solution/BaseSales/pickupTiming.js +35 -8
  80. package/dist/solution/BaseSales/types.d.ts +4 -0
  81. package/dist/solution/BaseSales/types.js +1 -0
  82. package/dist/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
  83. package/dist/solution/BaseSales/utils/posDurationPricing.js +174 -0
  84. package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
  85. package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +8 -8
  86. package/dist/solution/BookingByStep/index.d.ts +19 -3
  87. package/dist/solution/BookingByStep/index.js +681 -361
  88. package/dist/solution/BookingByStep/utils/resources.d.ts +10 -0
  89. package/dist/solution/BookingByStep/utils/resources.js +117 -76
  90. package/dist/solution/BookingTicket/index.d.ts +6 -0
  91. package/dist/solution/BookingTicket/index.js +666 -593
  92. package/dist/solution/BookingTicket/types.d.ts +1 -1
  93. package/dist/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
  94. package/dist/solution/BookingTicket/utils/addProductDecision.js +35 -8
  95. package/dist/solution/BookingTicket/utils/redeemArrival.d.ts +7 -7
  96. package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
  97. package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.js +188 -0
  98. package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +58 -94
  99. package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
  100. package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +33 -62
  101. package/dist/solution/OrderInvoicePreview/index.js +4 -3
  102. package/dist/solution/Sales/index.js +1 -1
  103. package/dist/solution/ScanOrder/index.d.ts +2 -0
  104. package/dist/solution/ScanOrder/index.js +230 -97
  105. package/dist/solution/ScanOrder/menuAvailability.d.ts +24 -0
  106. package/dist/solution/ScanOrder/menuAvailability.js +363 -0
  107. package/dist/solution/ScanOrder/types.d.ts +3 -0
  108. package/dist/solution/UnifiedBookingSales/index.d.ts +42 -10
  109. package/dist/solution/UnifiedBookingSales/index.js +2493 -1496
  110. package/dist/solution/UnifiedBookingSales/salesSettings.js +1 -1
  111. package/dist/solution/UnifiedBookingSales/types.d.ts +20 -5
  112. package/dist/utils/pos-receipt-auto-print.d.ts +4 -0
  113. package/dist/utils/pos-receipt-auto-print.js +14 -0
  114. package/lib/model/strategy/adapter/itemRule/adapter.d.ts +3 -1
  115. package/lib/model/strategy/adapter/itemRule/adapter.js +54 -4
  116. package/lib/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
  117. package/lib/model/strategy/adapter/itemRule/evaluator.js +9 -0
  118. package/lib/model/strategy/adapter/itemRule/type.d.ts +40 -1
  119. package/lib/model/strategy/adapter/itemRule/type.js +10 -0
  120. package/lib/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
  121. package/lib/model/strategy/adapter/promotion/evaluator.js +22 -21
  122. package/lib/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
  123. package/lib/modules/BookingContext/utils/calendarBooking.js +156 -0
  124. package/lib/modules/BookingContext/utils/index.d.ts +1 -0
  125. package/lib/modules/BookingContext/utils/index.js +11 -0
  126. package/lib/modules/BookingContext/utils/productExtend.d.ts +21 -0
  127. package/lib/modules/BookingContext/utils/productExtend.js +104 -5
  128. package/lib/modules/BookingContext/utils/resources.js +1 -1
  129. package/lib/modules/Cart/index.js +4 -2
  130. package/lib/modules/Cart/types.d.ts +2 -0
  131. package/lib/modules/Cart/utils/cartProduct.d.ts +3 -1
  132. package/lib/modules/Cart/utils/cartProduct.js +39 -20
  133. package/lib/modules/Date/index.d.ts +1 -1
  134. package/lib/modules/Date/index.js +28 -5
  135. package/lib/modules/Date/types.d.ts +5 -0
  136. package/lib/modules/OpenData/salesSettings.js +1 -1
  137. package/lib/modules/OpenData/types.d.ts +9 -0
  138. package/lib/modules/OpenData/utils.d.ts +1 -1
  139. package/lib/modules/OpenData/utils.js +3 -2
  140. package/lib/modules/Order/index.d.ts +22 -7
  141. package/lib/modules/Order/index.js +457 -174
  142. package/lib/modules/Order/localEftposState.d.ts +13 -0
  143. package/lib/modules/Order/localEftposState.js +44 -0
  144. package/lib/modules/Order/types.d.ts +33 -11
  145. package/lib/modules/Order/types.js +2 -2
  146. package/lib/modules/Order/unpaidAmountGap.d.ts +6 -0
  147. package/lib/modules/Order/unpaidAmountGap.js +60 -0
  148. package/lib/modules/Order/utils.d.ts +4 -1
  149. package/lib/modules/Order/utils.js +51 -3
  150. package/lib/modules/Payment/walletpass.js +23 -1
  151. package/lib/modules/Product/types.d.ts +16 -0
  152. package/lib/modules/ProductList/index.js +1 -1
  153. package/lib/modules/ResourcePlanner/planner.d.ts +2 -0
  154. package/lib/modules/ResourcePlanner/planner.js +299 -9
  155. package/lib/modules/ResourcePlanner/types.d.ts +42 -0
  156. package/lib/modules/Rules/index.js +32 -3
  157. package/lib/modules/Schedule/index.d.ts +7 -1
  158. package/lib/modules/Schedule/index.js +68 -4
  159. package/lib/modules/Schedule/types.d.ts +2 -0
  160. package/lib/modules/bookingReadValidation.d.ts +6 -0
  161. package/lib/modules/bookingReadValidation.js +56 -0
  162. package/lib/plugins/request.d.ts +2 -0
  163. package/lib/server/index.d.ts +9 -0
  164. package/lib/server/index.js +279 -30
  165. package/lib/server/modules/form/index.d.ts +19 -0
  166. package/lib/server/modules/form/index.js +73 -0
  167. package/lib/server/modules/form/types.d.ts +13 -0
  168. package/lib/server/modules/form/types.js +9 -0
  169. package/lib/server/modules/index.d.ts +3 -0
  170. package/lib/server/modules/index.js +15 -1
  171. package/lib/server/modules/order/index.d.ts +21 -0
  172. package/lib/server/modules/order/index.js +344 -35
  173. package/lib/server/modules/order/types.d.ts +3 -0
  174. package/lib/server/modules/order/utils/filterOrders.js +18 -0
  175. package/lib/server/modules/products/index.d.ts +28 -7
  176. package/lib/server/modules/products/index.js +224 -62
  177. package/lib/server/modules/products/replication.d.ts +8 -0
  178. package/lib/server/modules/products/replication.js +30 -0
  179. package/lib/server/modules/products/types.d.ts +12 -1
  180. package/lib/server/modules/products/types.js +3 -0
  181. package/lib/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
  182. package/lib/shared/receipt/customerInvoiceLanguages.js +5 -3
  183. package/lib/shared/receipt/small-ticket.d.ts +1 -0
  184. package/lib/shared/receipt/small-ticket.js +53 -25
  185. package/lib/shared/receipt/templateVisibility.d.ts +3 -0
  186. package/lib/shared/receipt/templateVisibility.js +6 -2
  187. package/lib/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
  188. package/lib/solution/BaseSales/fulfillmentItemRules.js +259 -0
  189. package/lib/solution/BaseSales/index.d.ts +22 -6
  190. package/lib/solution/BaseSales/index.js +347 -59
  191. package/lib/solution/BaseSales/pickupTiming.d.ts +4 -0
  192. package/lib/solution/BaseSales/pickupTiming.js +24 -3
  193. package/lib/solution/BaseSales/types.d.ts +4 -0
  194. package/lib/solution/BaseSales/types.js +1 -0
  195. package/lib/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
  196. package/lib/solution/BaseSales/utils/posDurationPricing.js +133 -0
  197. package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
  198. package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +1 -1
  199. package/lib/solution/BookingByStep/index.d.ts +19 -3
  200. package/lib/solution/BookingByStep/index.js +229 -17
  201. package/lib/solution/BookingByStep/utils/resources.d.ts +10 -0
  202. package/lib/solution/BookingByStep/utils/resources.js +25 -15
  203. package/lib/solution/BookingTicket/index.d.ts +6 -0
  204. package/lib/solution/BookingTicket/index.js +40 -5
  205. package/lib/solution/BookingTicket/types.d.ts +1 -1
  206. package/lib/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
  207. package/lib/solution/BookingTicket/utils/addProductDecision.js +34 -4
  208. package/lib/solution/BookingTicket/utils/redeemArrival.d.ts +7 -7
  209. package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
  210. package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.js +136 -0
  211. package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +2 -14
  212. package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
  213. package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +17 -34
  214. package/lib/solution/OrderInvoicePreview/index.js +1 -0
  215. package/lib/solution/Sales/index.js +1 -1
  216. package/lib/solution/ScanOrder/index.d.ts +2 -0
  217. package/lib/solution/ScanOrder/index.js +131 -22
  218. package/lib/solution/ScanOrder/menuAvailability.d.ts +24 -0
  219. package/lib/solution/ScanOrder/menuAvailability.js +203 -0
  220. package/lib/solution/ScanOrder/types.d.ts +3 -0
  221. package/lib/solution/UnifiedBookingSales/index.d.ts +42 -10
  222. package/lib/solution/UnifiedBookingSales/index.js +717 -144
  223. package/lib/solution/UnifiedBookingSales/salesSettings.js +1 -1
  224. package/lib/solution/UnifiedBookingSales/types.d.ts +20 -5
  225. package/lib/utils/pos-receipt-auto-print.d.ts +4 -0
  226. package/lib/utils/pos-receipt-auto-print.js +13 -0
  227. package/package.json +1 -1
@@ -269,6 +269,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
269
269
  var productResults = this.evaluateProducts(input);
270
270
 
271
271
  // 2. 收集所有适用的促销(去重)
272
+ // strategyId is metadata and is not guaranteed to be unique. Use the actual
273
+ // configuration as the key so one strategy cannot overwrite another strategy's
274
+ // label/action when their IDs happen to be the same.
272
275
  var promotionMap = new Map();
273
276
  var _iterator3 = _createForOfIteratorHelper(productResults),
274
277
  _step3;
@@ -280,7 +283,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
280
283
  try {
281
284
  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
282
285
  var promo = _step4.value;
283
- var existing = promotionMap.get(promo.strategyId);
286
+ var existing = promotionMap.get(promo.strategyConfig);
284
287
  var product = productResult.product;
285
288
 
286
289
  // 计算促销数量:如果是 bundle 子商品匹配,数量 = 主商品数量 × 子商品数量
@@ -303,7 +306,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
303
306
  // 新促销
304
307
  var productMatchedBundleIndexMap = new Map();
305
308
  productMatchedBundleIndexMap.set(product.id, promo.matchedBundleIndex);
306
- promotionMap.set(promo.strategyId, _objectSpread(_objectSpread({}, promo), {}, {
309
+ promotionMap.set(promo.strategyConfig, _objectSpread(_objectSpread({}, promo), {}, {
307
310
  applicableProducts: [product],
308
311
  totalQuantity: promoQuantity,
309
312
  totalAmount: product.price * product.quantity,
@@ -367,11 +370,13 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
367
370
  var cartResult = this.evaluateCart(input);
368
371
 
369
372
  // 2. 按 action priority 排序促销组(从 strategyConfig 获取 priority)
370
- var sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups, cartResult.applicablePromotions);
373
+ var sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups);
371
374
 
372
375
  // 3. 追踪已处理的商品(避免重复处理)
373
376
  // key: `${product_id}_${product_variant_id}`
374
377
  var processedQuantityMap = new Map();
378
+ // X件Y元处理过的数量仍可作为商品奖励的触发条件。
379
+ var xItemsProcessedQuantityMap = new Map();
375
380
 
376
381
  // 4. 处理每个促销组,收集结果
377
382
  var pricedProducts = [];
@@ -389,7 +394,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
389
394
  var matchedBundleIndexMap = group.productMatchedBundleIndexMap || new Map();
390
395
  if (actionType === PROMOTION_ACTION_TYPES.X_ITEMS_FOR_Y_PRICE) {
391
396
  // X件Y元处理
392
- var result = this.processXItemsForYPrice(group, processedQuantityMap, matchedBundleIndexMap);
397
+ var result = this.processXItemsForYPrice(group, processedQuantityMap, xItemsProcessedQuantityMap, matchedBundleIndexMap);
393
398
  pricedProducts.push.apply(pricedProducts, _toConsumableArray(result.products));
394
399
  totalOriginalAmount = totalOriginalAmount.plus(result.originalAmount);
395
400
  totalFinalAmount = totalFinalAmount.plus(result.finalAmount);
@@ -406,7 +411,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
406
411
  }
407
412
  } else if (actionType === PROMOTION_ACTION_TYPES.ITEM_REWARD) {
408
413
  // 商品奖励处理:条件商品触发,目标商品行享优惠,不自动新增商品
409
- var _result2 = this.processItemReward(group, processedQuantityMap, products, matchedBundleIndexMap);
414
+ var _result2 = this.processItemReward(group, processedQuantityMap, products, xItemsProcessedQuantityMap, matchedBundleIndexMap);
410
415
  pricedProducts.push.apply(pricedProducts, _toConsumableArray(_result2.products));
411
416
  totalOriginalAmount = totalOriginalAmount.plus(_result2.originalAmount);
412
417
  totalFinalAmount = totalFinalAmount.plus(_result2.finalAmount);
@@ -664,30 +669,12 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
664
669
  */
665
670
  }, {
666
671
  key: "sortPromotionGroupsByPriority",
667
- value: function sortPromotionGroupsByPriority(groups, promotions) {
668
- // 创建策略ID到优先级的映射
669
- var priorityMap = new Map();
670
- var _iterator9 = _createForOfIteratorHelper(promotions),
671
- _step9;
672
- try {
673
- for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
674
- var _promo$strategyConfig2, _actions$0$priority, _actions$;
675
- var promo = _step9.value;
676
- var actions = ((_promo$strategyConfig2 = promo.strategyConfig) === null || _promo$strategyConfig2 === void 0 ? void 0 : _promo$strategyConfig2.actions) || [];
677
- var priority = (_actions$0$priority = (_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.priority) !== null && _actions$0$priority !== void 0 ? _actions$0$priority : 999;
678
- priorityMap.set(promo.strategyId, priority);
679
- }
680
-
681
- // 按优先级排序(数值越小优先级越高)
682
- } catch (err) {
683
- _iterator9.e(err);
684
- } finally {
685
- _iterator9.f();
686
- }
672
+ value: function sortPromotionGroupsByPriority(groups) {
673
+ // 按优先级排序(数值越小优先级越高)
687
674
  return _toConsumableArray(groups).sort(function (a, b) {
688
- var _priorityMap$get, _priorityMap$get2;
689
- var priorityA = (_priorityMap$get = priorityMap.get(a.strategyId)) !== null && _priorityMap$get !== void 0 ? _priorityMap$get : 999;
690
- var priorityB = (_priorityMap$get2 = priorityMap.get(b.strategyId)) !== null && _priorityMap$get2 !== void 0 ? _priorityMap$get2 : 999;
675
+ var _a$strategyConfig$act, _a$strategyConfig, _b$strategyConfig$act, _b$strategyConfig;
676
+ var priorityA = (_a$strategyConfig$act = (_a$strategyConfig = a.strategyConfig) === null || _a$strategyConfig === void 0 || (_a$strategyConfig = _a$strategyConfig.actions) === null || _a$strategyConfig === void 0 || (_a$strategyConfig = _a$strategyConfig[0]) === null || _a$strategyConfig === void 0 ? void 0 : _a$strategyConfig.priority) !== null && _a$strategyConfig$act !== void 0 ? _a$strategyConfig$act : 999;
677
+ var priorityB = (_b$strategyConfig$act = (_b$strategyConfig = b.strategyConfig) === null || _b$strategyConfig === void 0 || (_b$strategyConfig = _b$strategyConfig.actions) === null || _b$strategyConfig === void 0 || (_b$strategyConfig = _b$strategyConfig[0]) === null || _b$strategyConfig === void 0 ? void 0 : _b$strategyConfig.priority) !== null && _b$strategyConfig$act !== void 0 ? _b$strategyConfig$act : 999;
691
678
  return priorityA - priorityB;
692
679
  });
693
680
  }
@@ -704,7 +691,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
704
691
  */
705
692
  }, {
706
693
  key: "processXItemsForYPrice",
707
- value: function processXItemsForYPrice(group, processedQuantityMap, matchedBundleIndexMap) {
694
+ value: function processXItemsForYPrice(group, processedQuantityMap, xItemsProcessedQuantityMap, matchedBundleIndexMap) {
708
695
  var strategyId = group.strategyId,
709
696
  strategyMetadata = group.strategyMetadata,
710
697
  actionDetail = group.actionDetail,
@@ -720,11 +707,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
720
707
  // 1. 展开所有商品为单件列表(排除已处理的数量)
721
708
  // 每个单件记录来自哪个原商品(通过 product.id)
722
709
  var unitProducts = [];
723
- var _iterator10 = _createForOfIteratorHelper(groupProducts),
724
- _step10;
710
+ var _iterator9 = _createForOfIteratorHelper(groupProducts),
711
+ _step9;
725
712
  try {
726
- for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
727
- var product = _step10.value;
713
+ for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
714
+ var product = _step9.value;
728
715
  var key = this.getProductKey(product);
729
716
  var processedQty = processedQuantityMap.get(key) || 0;
730
717
  var availableQty = product.quantity - processedQty;
@@ -741,9 +728,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
741
728
  }
742
729
  }
743
730
  } catch (err) {
744
- _iterator10.e(err);
731
+ _iterator9.e(err);
745
732
  } finally {
746
- _iterator10.f();
733
+ _iterator9.f();
747
734
  }
748
735
  if (unitProducts.length === 0) {
749
736
  return {
@@ -775,25 +762,25 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
775
762
 
776
763
  // 5. 按原商品 id 统计参与促销和不参与的数量
777
764
  var promotionQtyByProductId = new Map();
778
- var _iterator11 = _createForOfIteratorHelper(inPromotionUnits),
779
- _step11;
765
+ var _iterator10 = _createForOfIteratorHelper(inPromotionUnits),
766
+ _step10;
780
767
  try {
781
- for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
782
- var _unit = _step11.value;
768
+ for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
769
+ var _unit = _step10.value;
783
770
  var id = _unit.productId;
784
771
  promotionQtyByProductId.set(id, (promotionQtyByProductId.get(id) || 0) + 1);
785
772
  }
786
773
  } catch (err) {
787
- _iterator11.e(err);
774
+ _iterator10.e(err);
788
775
  } finally {
789
- _iterator11.f();
776
+ _iterator10.f();
790
777
  }
791
778
  var remainingQtyByProductId = new Map();
792
- var _iterator12 = _createForOfIteratorHelper(notInPromotionUnits),
793
- _step12;
779
+ var _iterator11 = _createForOfIteratorHelper(notInPromotionUnits),
780
+ _step11;
794
781
  try {
795
- for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
796
- var _unit2 = _step12.value;
782
+ for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
783
+ var _unit2 = _step11.value;
797
784
  var _id = _unit2.productId;
798
785
  remainingQtyByProductId.set(_id, (remainingQtyByProductId.get(_id) || 0) + 1);
799
786
  }
@@ -802,9 +789,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
802
789
  // 按组内原价比例均摊
803
790
  // 记录每个原商品的均摊价格累加(用于后续聚合)
804
791
  } catch (err) {
805
- _iterator12.e(err);
792
+ _iterator11.e(err);
806
793
  } finally {
807
- _iterator12.f();
794
+ _iterator11.f();
808
795
  }
809
796
  var allocatedPricesByProductId = new Map();
810
797
  var expectedPromoTotal = new Decimal(0);
@@ -838,11 +825,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
838
825
  }
839
826
 
840
827
  // 7. 为每个原商品生成结果
841
- var _iterator13 = _createForOfIteratorHelper(groupProducts),
842
- _step13;
828
+ var _iterator12 = _createForOfIteratorHelper(groupProducts),
829
+ _step12;
843
830
  try {
844
- for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
845
- var _product = _step13.value;
831
+ for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
832
+ var _product = _step12.value;
846
833
  var _key = this.getProductKey(_product);
847
834
  var _processedQty = processedQuantityMap.get(_key) || 0;
848
835
  var _availableQty = _product.quantity - _processedQty;
@@ -926,30 +913,31 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
926
913
 
927
914
  // 更新已处理数量
928
915
  processedQuantityMap.set(_key, _processedQty + _availableQty);
916
+ xItemsProcessedQuantityMap.set(_key, (xItemsProcessedQuantityMap.get(_key) || 0) + _availableQty);
929
917
  }
930
918
 
931
919
  // 8. 尾差调整:只补实际组价的舍入差额,不将高于原价的组价补到某一件。
932
920
  } catch (err) {
933
- _iterator13.e(err);
921
+ _iterator12.e(err);
934
922
  } finally {
935
- _iterator13.f();
923
+ _iterator12.f();
936
924
  }
937
925
  if (groupCount > 0) {
938
926
  var promoItems = result.filter(function (p) {
939
927
  return p.inPromotion;
940
928
  });
941
929
  var actualPromoTotal = new Decimal(0);
942
- var _iterator14 = _createForOfIteratorHelper(promoItems),
943
- _step14;
930
+ var _iterator13 = _createForOfIteratorHelper(promoItems),
931
+ _step13;
944
932
  try {
945
- for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
946
- var _p = _step14.value;
933
+ for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
934
+ var _p = _step13.value;
947
935
  actualPromoTotal = actualPromoTotal.plus(new Decimal(_p.finalPrice).mul(_p.quantity));
948
936
  }
949
937
  } catch (err) {
950
- _iterator14.e(err);
938
+ _iterator13.e(err);
951
939
  } finally {
952
- _iterator14.f();
940
+ _iterator13.f();
953
941
  }
954
942
  var roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
955
943
  if (!roundingDiff.eq(0)) {
@@ -980,17 +968,17 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
980
968
 
981
969
  // 重新计算 finalAmount
982
970
  finalAmount = new Decimal(0);
983
- var _iterator15 = _createForOfIteratorHelper(result),
984
- _step15;
971
+ var _iterator14 = _createForOfIteratorHelper(result),
972
+ _step14;
985
973
  try {
986
- for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
987
- var p = _step15.value;
974
+ for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
975
+ var p = _step14.value;
988
976
  finalAmount = finalAmount.plus(new Decimal(p.finalPrice).mul(p.quantity));
989
977
  }
990
978
  } catch (err) {
991
- _iterator15.e(err);
979
+ _iterator14.e(err);
992
980
  } finally {
993
- _iterator15.f();
981
+ _iterator14.f();
994
982
  }
995
983
  }
996
984
  }
@@ -1028,11 +1016,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1028
1016
  // 对于 bundle 子商品匹配,促销数量 = 主商品数量 × bundle子商品数量
1029
1017
  var totalPromoQty = 0;
1030
1018
  var productInfoMap = new Map();
1031
- var _iterator16 = _createForOfIteratorHelper(groupProducts),
1032
- _step16;
1019
+ var _iterator15 = _createForOfIteratorHelper(groupProducts),
1020
+ _step15;
1033
1021
  try {
1034
- for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
1035
- var product = _step16.value;
1022
+ for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
1023
+ var product = _step15.value;
1036
1024
  var key = this.getProductKey(product);
1037
1025
  var processedQty = processedQuantityMap.get(key) || 0;
1038
1026
  var availableQty = product.quantity - processedQty;
@@ -1058,18 +1046,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1058
1046
 
1059
1047
  // 2. 判断是否满足促销条件
1060
1048
  } catch (err) {
1061
- _iterator16.e(err);
1049
+ _iterator15.e(err);
1062
1050
  } finally {
1063
- _iterator16.f();
1051
+ _iterator15.f();
1064
1052
  }
1065
1053
  var isFulfilled = totalPromoQty >= buyQuantity;
1066
1054
 
1067
1055
  // 3. 生成商品结果(第二次遍历)
1068
- var _iterator17 = _createForOfIteratorHelper(groupProducts),
1069
- _step17;
1056
+ var _iterator16 = _createForOfIteratorHelper(groupProducts),
1057
+ _step16;
1070
1058
  try {
1071
- for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
1072
- var _product2 = _step17.value;
1059
+ for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
1060
+ var _product2 = _step16.value;
1073
1061
  var _key2 = this.getProductKey(_product2);
1074
1062
  var info = productInfoMap.get(_key2);
1075
1063
  if (!info || info.availableQty <= 0) continue;
@@ -1097,9 +1085,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1097
1085
 
1098
1086
  // 4. 计算赠品数量(使用促销数量)
1099
1087
  } catch (err) {
1100
- _iterator17.e(err);
1088
+ _iterator16.e(err);
1101
1089
  } finally {
1102
- _iterator17.f();
1090
+ _iterator16.f();
1103
1091
  }
1104
1092
  var giftCount = 0;
1105
1093
  if (isFulfilled) {
@@ -1132,7 +1120,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1132
1120
  */
1133
1121
  }, {
1134
1122
  key: "processItemReward",
1135
- value: function processItemReward(group, processedQuantityMap, allProducts, matchedBundleIndexMap) {
1123
+ value: function processItemReward(group, processedQuantityMap, allProducts, xItemsProcessedQuantityMap, matchedBundleIndexMap) {
1136
1124
  var _this4 = this;
1137
1125
  var strategyId = group.strategyId,
1138
1126
  strategyMetadata = group.strategyMetadata,
@@ -1141,7 +1129,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1141
1129
  var detail = actionDetail;
1142
1130
  var triggerQuantity = this.normalizePositiveInteger(detail.triggerQuantity, 1);
1143
1131
  var rewardQuantity = this.normalizePositiveInteger(detail.rewardQuantity, 1);
1144
- var conditionQuantity = this.getAvailablePromotionQuantity(triggerProducts, processedQuantityMap, matchedBundleIndexMap);
1132
+ var conditionQuantity = this.getItemRewardTriggerQuantity(triggerProducts, processedQuantityMap, xItemsProcessedQuantityMap, matchedBundleIndexMap);
1145
1133
  if (conditionQuantity < triggerQuantity) {
1146
1134
  return {
1147
1135
  products: [],
@@ -1174,11 +1162,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1174
1162
  return b.originalPrice.minus(a.originalPrice).toNumber();
1175
1163
  }).slice(0, rewardLimit);
1176
1164
  var selectedByProductId = new Map();
1177
- var _iterator18 = _createForOfIteratorHelper(selectedUnits),
1178
- _step18;
1165
+ var _iterator17 = _createForOfIteratorHelper(selectedUnits),
1166
+ _step17;
1179
1167
  try {
1180
- for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
1181
- var unit = _step18.value;
1168
+ for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
1169
+ var unit = _step17.value;
1182
1170
  var existing = selectedByProductId.get(unit.product.id);
1183
1171
  if (existing) {
1184
1172
  existing.quantity += 1;
@@ -1191,18 +1179,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1191
1179
  }
1192
1180
  }
1193
1181
  } catch (err) {
1194
- _iterator18.e(err);
1182
+ _iterator17.e(err);
1195
1183
  } finally {
1196
- _iterator18.f();
1184
+ _iterator17.f();
1197
1185
  }
1198
1186
  var result = [];
1199
1187
  var originalAmount = new Decimal(0);
1200
1188
  var finalAmount = new Decimal(0);
1201
- var _iterator19 = _createForOfIteratorHelper(targetProducts),
1202
- _step19;
1189
+ var _iterator18 = _createForOfIteratorHelper(targetProducts),
1190
+ _step18;
1203
1191
  try {
1204
- for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
1205
- var product = _step19.value;
1192
+ for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
1193
+ var product = _step18.value;
1206
1194
  var key = this.getProductKey(product);
1207
1195
  var processedQty = processedQuantityMap.get(key) || 0;
1208
1196
  var availableQty = product.quantity - processedQty;
@@ -1241,9 +1229,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1241
1229
  processedQuantityMap.set(key, processedQty + availableQty);
1242
1230
  }
1243
1231
  } catch (err) {
1244
- _iterator19.e(err);
1232
+ _iterator18.e(err);
1245
1233
  } finally {
1246
- _iterator19.f();
1234
+ _iterator18.f();
1247
1235
  }
1248
1236
  return {
1249
1237
  products: result,
@@ -1257,18 +1245,21 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1257
1245
  var n = Math.floor(Number(value));
1258
1246
  return Number.isFinite(n) && n > 0 ? n : fallback;
1259
1247
  }
1248
+
1249
+ /** 仅放开 X件Y元处理过的触发数量,奖励目标仍按全部已处理数量互斥。 */
1260
1250
  }, {
1261
- key: "getAvailablePromotionQuantity",
1262
- value: function getAvailablePromotionQuantity(products, processedQuantityMap, matchedBundleIndexMap) {
1251
+ key: "getItemRewardTriggerQuantity",
1252
+ value: function getItemRewardTriggerQuantity(products, processedQuantityMap, xItemsProcessedQuantityMap, matchedBundleIndexMap) {
1263
1253
  var total = 0;
1264
- var _iterator20 = _createForOfIteratorHelper(products),
1265
- _step20;
1254
+ var _iterator19 = _createForOfIteratorHelper(products),
1255
+ _step19;
1266
1256
  try {
1267
- for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
1268
- var product = _step20.value;
1257
+ for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
1258
+ var product = _step19.value;
1269
1259
  var key = this.getProductKey(product);
1270
1260
  var processedQty = processedQuantityMap.get(key) || 0;
1271
- var availableQty = product.quantity - processedQty;
1261
+ var xItemsProcessedQty = xItemsProcessedQuantityMap.get(key) || 0;
1262
+ var availableQty = product.quantity - processedQty + xItemsProcessedQty;
1272
1263
  if (availableQty <= 0) continue;
1273
1264
  var matchedBundleIndex = matchedBundleIndexMap === null || matchedBundleIndexMap === void 0 ? void 0 : matchedBundleIndexMap.get(product.id);
1274
1265
  if (matchedBundleIndex !== undefined && product.bundle) {
@@ -1279,9 +1270,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1279
1270
  }
1280
1271
  }
1281
1272
  } catch (err) {
1282
- _iterator20.e(err);
1273
+ _iterator19.e(err);
1283
1274
  } finally {
1284
- _iterator20.f();
1275
+ _iterator19.f();
1285
1276
  }
1286
1277
  return total;
1287
1278
  }
@@ -1289,11 +1280,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1289
1280
  key: "buildItemRewardTargetUnits",
1290
1281
  value: function buildItemRewardTargetUnits(products, processedQuantityMap, detail) {
1291
1282
  var units = [];
1292
- var _iterator21 = _createForOfIteratorHelper(products),
1293
- _step21;
1283
+ var _iterator20 = _createForOfIteratorHelper(products),
1284
+ _step20;
1294
1285
  try {
1295
- for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
1296
- var product = _step21.value;
1286
+ for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
1287
+ var product = _step20.value;
1297
1288
  var key = this.getProductKey(product);
1298
1289
  var processedQty = processedQuantityMap.get(key) || 0;
1299
1290
  var availableQty = product.quantity - processedQty;
@@ -1312,9 +1303,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1312
1303
  }
1313
1304
  }
1314
1305
  } catch (err) {
1315
- _iterator21.e(err);
1306
+ _iterator20.e(err);
1316
1307
  } finally {
1317
- _iterator21.f();
1308
+ _iterator20.f();
1318
1309
  }
1319
1310
  return units;
1320
1311
  }
@@ -1370,11 +1361,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1370
1361
  key: "getRemainingProducts",
1371
1362
  value: function getRemainingProducts(allProducts, processedQuantityMap) {
1372
1363
  var result = [];
1373
- var _iterator22 = _createForOfIteratorHelper(allProducts),
1374
- _step22;
1364
+ var _iterator21 = _createForOfIteratorHelper(allProducts),
1365
+ _step21;
1375
1366
  try {
1376
- for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
1377
- var product = _step22.value;
1367
+ for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
1368
+ var product = _step21.value;
1378
1369
  var key = this.getProductKey(product);
1379
1370
  var processedQty = processedQuantityMap.get(key) || 0;
1380
1371
  var remainingQty = product.quantity - processedQty;
@@ -1389,9 +1380,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
1389
1380
  }
1390
1381
  }
1391
1382
  } catch (err) {
1392
- _iterator22.e(err);
1383
+ _iterator21.e(err);
1393
1384
  } finally {
1394
- _iterator22.f();
1385
+ _iterator21.f();
1395
1386
  }
1396
1387
  return result;
1397
1388
  }
@@ -0,0 +1,15 @@
1
+ import dayjs from 'dayjs';
2
+ import type { BookingCalcContext } from './productExtend';
3
+ export declare function isManualBookingProduct(product: any): boolean;
4
+ export declare function getCalendarBookingRange(product: any, ctx?: BookingCalcContext): {
5
+ startAt: string;
6
+ endAt: string;
7
+ duration: number;
8
+ startDate: dayjs.Dayjs;
9
+ endDate: dayjs.Dayjs;
10
+ } | undefined;
11
+ /** A prepared calendar cache is reused after SKU input; no availability-driven replacement is allowed. */
12
+ export declare function prepareCalendarBookingCacheItem(cacheItem: any, ctx: BookingCalcContext): any;
13
+ export declare function calendarBookingEntryKey(ctx: BookingCalcContext): string;
14
+ export declare function calendarBookingNeedsInput(cacheItem: any): boolean;
15
+ export declare function calendarBookingPreparationKey(cacheItem: any, ctx: BookingCalcContext): string;