@pisell/pisellos 2.3.74 → 2.3.75

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 (276) hide show
  1. package/dist/core/index.js +6 -10
  2. package/dist/model/strategy/adapter/promotion/index.js +9 -0
  3. package/dist/model/strategy/adapter/walletPass/example.js +3 -26
  4. package/dist/model/strategy/strategy-example.js +5 -19
  5. package/dist/modules/Cart/index.js +0 -3
  6. package/dist/modules/Cart/utils/cartProduct.js +0 -1
  7. package/dist/modules/Date/index.js +1 -5
  8. package/dist/modules/Discount/index.js +2 -4
  9. package/dist/modules/OpenData/index.js +0 -2
  10. package/dist/modules/Order/index.js +36 -64
  11. package/dist/modules/Payment/index.js +97 -162
  12. package/dist/modules/Rules/index.js +1 -4
  13. package/dist/modules/Schedule/index.js +0 -1
  14. package/dist/modules/Schedule/utils.js +0 -1
  15. package/dist/modules/Step/index.js +0 -1
  16. package/dist/plugins/request.js +1 -4
  17. package/dist/plugins/window.js +2 -6
  18. package/dist/server/index.js +97 -129
  19. package/dist/server/modules/menu/index.js +32 -41
  20. package/dist/server/modules/order/index.js +2 -4
  21. package/dist/server/modules/products/index.js +24 -42
  22. package/dist/server/modules/quotation/index.js +29 -38
  23. package/dist/server/modules/resource/index.js +3 -4
  24. package/dist/server/modules/schedule/index.js +27 -35
  25. package/dist/server/utils/product.js +0 -1
  26. package/dist/solution/BaseSales/index.js +38 -41
  27. package/dist/solution/BookingByStep/index.js +7 -59
  28. package/dist/solution/BookingByStep/utils/capacity.js +1 -11
  29. package/dist/solution/BookingByStep/utils/resources.js +1 -3
  30. package/dist/solution/BookingByStep/utils/timeslots.js +2 -43
  31. package/dist/solution/BookingTicket/index.js +0 -2
  32. package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +6 -7
  33. package/dist/solution/BookingTicket/utils/scan/handleScan.js +25 -31
  34. package/dist/solution/BookingTicket/utils/scan/index.js +6 -10
  35. package/dist/solution/BuyTickets/index.js +9 -12
  36. package/dist/solution/Checkout/index.js +177 -252
  37. package/dist/solution/Checkout/utils/index.js +4 -16
  38. package/dist/solution/RegisterAndLogin/index.js +30 -76
  39. package/dist/solution/ScanOrder/index.js +50 -60
  40. package/dist/solution/ShopDiscount/index.js +2 -7
  41. package/dist/solution/VenueBooking/index.js +45 -55
  42. package/dist/utils/task.js +15 -18
  43. package/dist/utils/watch.js +0 -1
  44. package/lib/apis/picoding.js +2 -0
  45. package/lib/core/index.js +134 -134
  46. package/lib/effects/index.js +46 -57
  47. package/lib/index.js +82 -49
  48. package/lib/model/index.js +14 -21
  49. package/lib/model/strategy/adapter/dataVariant/adapter.js +38 -50
  50. package/lib/model/strategy/adapter/dataVariant/evaluator.js +162 -236
  51. package/lib/model/strategy/adapter/dataVariant/examples.js +229 -237
  52. package/lib/model/strategy/adapter/dataVariant/index.js +39 -34
  53. package/lib/model/strategy/adapter/dataVariant/type.js +57 -28
  54. package/lib/model/strategy/adapter/index.js +100 -64
  55. package/lib/model/strategy/adapter/itemRule/adapter.js +156 -144
  56. package/lib/model/strategy/adapter/itemRule/evaluator.js +36 -48
  57. package/lib/model/strategy/adapter/itemRule/examples.js +295 -225
  58. package/lib/model/strategy/adapter/itemRule/index.js +83 -57
  59. package/lib/model/strategy/adapter/itemRule/type.js +97 -36
  60. package/lib/model/strategy/adapter/promotion/adapter.js +91 -69
  61. package/lib/model/strategy/adapter/promotion/evaluator.js +444 -310
  62. package/lib/model/strategy/adapter/promotion/examples.js +222 -234
  63. package/lib/model/strategy/adapter/promotion/index.js +1 -0
  64. package/lib/model/strategy/adapter/promotion/type.js +243 -36
  65. package/lib/model/strategy/adapter/type.js +4 -16
  66. package/lib/model/strategy/adapter/walletPass/evaluator.js +180 -150
  67. package/lib/model/strategy/adapter/walletPass/example.js +217 -190
  68. package/lib/model/strategy/adapter/walletPass/index.js +75 -51
  69. package/lib/model/strategy/adapter/walletPass/locales.js +36 -58
  70. package/lib/model/strategy/adapter/walletPass/type.js +4 -16
  71. package/lib/model/strategy/adapter/walletPass/utils.js +588 -378
  72. package/lib/model/strategy/engine.js +270 -168
  73. package/lib/model/strategy/index.js +49 -34
  74. package/lib/model/strategy/strategy-example.js +243 -239
  75. package/lib/model/strategy/type.js +100 -40
  76. package/lib/modules/Account/index.js +39 -53
  77. package/lib/modules/Account/types.js +20 -33
  78. package/lib/modules/AccountList/index.js +116 -154
  79. package/lib/modules/AccountList/types.js +30 -31
  80. package/lib/modules/AccountList/utils.js +18 -30
  81. package/lib/modules/BaseModule.js +23 -42
  82. package/lib/modules/BookingContext/index.js +158 -136
  83. package/lib/modules/BookingContext/types.js +46 -32
  84. package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +138 -146
  85. package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +78 -83
  86. package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js +170 -150
  87. package/lib/modules/BookingContext/utils/flexible.js +38 -55
  88. package/lib/modules/BookingContext/utils/formatResourceList.js +19 -34
  89. package/lib/modules/BookingContext/utils/index.js +124 -41
  90. package/lib/modules/BookingContext/utils/noResource.js +58 -70
  91. package/lib/modules/BookingContext/utils/orderLineDisplay.js +14 -41
  92. package/lib/modules/BookingContext/utils/productExtend.js +202 -155
  93. package/lib/modules/BookingContext/utils/resourceErrors.js +53 -53
  94. package/lib/modules/BookingContext/utils/resourceSelection.js +19 -41
  95. package/lib/modules/BookingContext/utils/resources.js +209 -167
  96. package/lib/modules/BookingContext/utils/serviceTimes.js +115 -116
  97. package/lib/modules/BookingContext/utils/timeSlices.js +76 -86
  98. package/lib/modules/Cart/index.js +170 -124
  99. package/lib/modules/Cart/types.js +46 -51
  100. package/lib/modules/Cart/utils/cartAccount.js +40 -39
  101. package/lib/modules/Cart/utils/cartDate.js +56 -61
  102. package/lib/modules/Cart/utils/cartDiscount.js +28 -33
  103. package/lib/modules/Cart/utils/cartNote.js +27 -32
  104. package/lib/modules/Cart/utils/cartProduct.js +321 -251
  105. package/lib/modules/Cart/utils/cartRelationForms.js +29 -35
  106. package/lib/modules/Cart/utils/cartResource.js +70 -78
  107. package/lib/modules/Cart/utils/changePrice.js +22 -50
  108. package/lib/modules/Cart/utils/index.js +106 -48
  109. package/lib/modules/Customer/constants.js +13 -34
  110. package/lib/modules/Customer/index.js +235 -172
  111. package/lib/modules/Customer/types.js +38 -35
  112. package/lib/modules/Date/index.js +116 -115
  113. package/lib/modules/Date/types.js +16 -28
  114. package/lib/modules/Date/utils.js +174 -123
  115. package/lib/modules/Discount/index.js +122 -127
  116. package/lib/modules/Discount/types.js +9 -31
  117. package/lib/modules/Guests/index.js +30 -56
  118. package/lib/modules/Guests/types.js +23 -33
  119. package/lib/modules/Holder/index.js +209 -189
  120. package/lib/modules/Holder/types.js +4 -16
  121. package/lib/modules/Holder/utils.js +20 -49
  122. package/lib/modules/OpenData/index.js +70 -76
  123. package/lib/modules/OpenData/types.js +4 -16
  124. package/lib/modules/OpenData/utils.js +44 -78
  125. package/lib/modules/Order/index.js +1713 -2118
  126. package/lib/modules/Order/payment-utils.js +77 -120
  127. package/lib/modules/Order/types.js +88 -35
  128. package/lib/modules/Order/utils/bundleDiscountHydration.js +41 -74
  129. package/lib/modules/Order/utils/discountProductLineIdentity.js +142 -100
  130. package/lib/modules/Order/utils/manualProductDiscount.js +124 -123
  131. package/lib/modules/Order/utils/orderCollectionIdentity.js +184 -244
  132. package/lib/modules/Order/utils.js +814 -647
  133. package/lib/modules/Payment/cash.js +20 -33
  134. package/lib/modules/Payment/cashRecommendationAlgorithm.js +145 -76
  135. package/lib/modules/Payment/eftpos.js +16 -30
  136. package/lib/modules/Payment/index.js +532 -399
  137. package/lib/modules/Payment/mx51.js +1 -0
  138. package/lib/modules/Payment/types.js +230 -108
  139. package/lib/modules/Payment/utils.js +52 -51
  140. package/lib/modules/Payment/walletpass.js +485 -660
  141. package/lib/modules/Product/index.js +51 -46
  142. package/lib/modules/Product/types.js +4 -16
  143. package/lib/modules/Product/utils.js +32 -33
  144. package/lib/modules/ProductList/index.js +113 -123
  145. package/lib/modules/ProductList/types.js +9 -31
  146. package/lib/modules/Quotation/index.js +81 -118
  147. package/lib/modules/Quotation/types.js +4 -16
  148. package/lib/modules/Resource/index.js +27 -59
  149. package/lib/modules/Resource/types.js +22 -32
  150. package/lib/modules/Resource/utils.js +30 -38
  151. package/lib/modules/ResourcePlanner/index.js +25 -23
  152. package/lib/modules/ResourcePlanner/localClock.js +54 -119
  153. package/lib/modules/ResourcePlanner/planner.js +589 -770
  154. package/lib/modules/ResourcePlanner/types.js +10 -29
  155. package/lib/modules/Rules/index.js +1218 -959
  156. package/lib/modules/Rules/types.js +17 -40
  157. package/lib/modules/SalesSummary/index.js +85 -90
  158. package/lib/modules/SalesSummary/types.js +4 -16
  159. package/lib/modules/SalesSummary/utils.js +355 -430
  160. package/lib/modules/ScanOrderLogger/index.js +59 -79
  161. package/lib/modules/ScanOrderLogger/providers/feishu.js +54 -78
  162. package/lib/modules/ScanOrderLogger/providers/grafana.js +13 -36
  163. package/lib/modules/ScanOrderLogger/types.js +4 -16
  164. package/lib/modules/Schedule/getDateIsInSchedule.js +334 -163
  165. package/lib/modules/Schedule/index.js +100 -114
  166. package/lib/modules/Schedule/type.js +4 -16
  167. package/lib/modules/Schedule/types.js +4 -16
  168. package/lib/modules/Schedule/utils.js +433 -291
  169. package/lib/modules/Step/index.js +40 -52
  170. package/lib/modules/Step/tyeps.js +4 -16
  171. package/lib/modules/Summary/index.js +66 -71
  172. package/lib/modules/Summary/types.js +4 -16
  173. package/lib/modules/Summary/utils.js +773 -418
  174. package/lib/modules/SurchargeList/index.js +46 -60
  175. package/lib/modules/SurchargeList/types.js +4 -16
  176. package/lib/modules/index.js +245 -63
  177. package/lib/plugins/app.js +4 -16
  178. package/lib/plugins/index.js +36 -25
  179. package/lib/plugins/request.js +137 -126
  180. package/lib/plugins/shopStore.js +4 -16
  181. package/lib/plugins/user.js +4 -16
  182. package/lib/plugins/window.js +171 -179
  183. package/lib/server/index.js +3050 -2665
  184. package/lib/server/modules/floor-plan/index.js +118 -134
  185. package/lib/server/modules/floor-plan/types.js +15 -30
  186. package/lib/server/modules/index.js +106 -68
  187. package/lib/server/modules/menu/index.js +142 -122
  188. package/lib/server/modules/menu/types.js +18 -31
  189. package/lib/server/modules/order/index.js +784 -1002
  190. package/lib/server/modules/order/types.js +122 -33
  191. package/lib/server/modules/order/utils/filterBookings.js +219 -194
  192. package/lib/server/modules/order/utils/filterOrders.js +118 -92
  193. package/lib/server/modules/payment/index.js +59 -83
  194. package/lib/server/modules/payment/types.js +4 -16
  195. package/lib/server/modules/products/index.js +583 -471
  196. package/lib/server/modules/products/types.js +44 -34
  197. package/lib/server/modules/quotation/index.js +137 -172
  198. package/lib/server/modules/quotation/types.js +21 -31
  199. package/lib/server/modules/resource/index.js +220 -186
  200. package/lib/server/modules/resource/types.js +42 -33
  201. package/lib/server/modules/schedule/index.js +135 -123
  202. package/lib/server/modules/schedule/types.js +14 -21
  203. package/lib/server/modules/schedule/utils.js +334 -163
  204. package/lib/server/types.js +4 -16
  205. package/lib/server/utils/index.js +25 -23
  206. package/lib/server/utils/product.js +196 -139
  207. package/lib/server/utils/schedule.js +34 -41
  208. package/lib/server/utils/small-ticket.js +479 -456
  209. package/lib/server/utils/time.js +40 -49
  210. package/lib/solution/BaseSales/index.js +1186 -1410
  211. package/lib/solution/BaseSales/types.js +42 -38
  212. package/lib/solution/BaseSales/utils/cartPromotion.js +642 -498
  213. package/lib/solution/BaseSales/utils/parseSalesResponse.js +85 -105
  214. package/lib/solution/BaseSales/utils/quotationPrice.js +56 -114
  215. package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +108 -145
  216. package/lib/solution/BaseSales/utils.js +158 -143
  217. package/lib/solution/BookingByStep/index.js +1527 -1340
  218. package/lib/solution/BookingByStep/types.js +40 -99
  219. package/lib/solution/BookingByStep/utils/capacity.js +192 -160
  220. package/lib/solution/BookingByStep/utils/products.js +42 -52
  221. package/lib/solution/BookingByStep/utils/resources.js +527 -330
  222. package/lib/solution/BookingByStep/utils/stock.js +65 -44
  223. package/lib/solution/BookingByStep/utils/timeslots.js +129 -131
  224. package/lib/solution/BookingTicket/index.js +607 -522
  225. package/lib/solution/BookingTicket/types.js +99 -77
  226. package/lib/solution/BookingTicket/utils/addProductDecision.js +226 -189
  227. package/lib/solution/BookingTicket/utils/addTimeAvailability.js +58 -89
  228. package/lib/solution/BookingTicket/utils/bookingStatus.js +107 -78
  229. package/lib/solution/BookingTicket/utils/cartView.js +114 -99
  230. package/lib/solution/BookingTicket/utils/exampleData.js +185 -0
  231. package/lib/solution/BookingTicket/utils/orderCustomer.js +18 -41
  232. package/lib/solution/BookingTicket/utils/resolveBestAddTimePlan.js +219 -86
  233. package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +168 -116
  234. package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +79 -91
  235. package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js +54 -41
  236. package/lib/solution/BookingTicket/utils/scan/handleScan.js +84 -81
  237. package/lib/solution/BookingTicket/utils/scan/index.js +98 -104
  238. package/lib/solution/BookingTicket/utils/scan/scanCache.js +90 -43
  239. package/lib/solution/BookingTicket/utils/scan/scanProductValues.js +52 -64
  240. package/lib/solution/BookingTicket/utils/sessionCatalogStale.js +56 -58
  241. package/lib/solution/BookingTicket/utils/weighingProductSku.js +34 -48
  242. package/lib/solution/BuyTickets/index.js +67 -70
  243. package/lib/solution/BuyTickets/types.js +22 -38
  244. package/lib/solution/Checkout/index.js +1451 -1158
  245. package/lib/solution/Checkout/types.js +91 -61
  246. package/lib/solution/Checkout/utils/index.js +228 -156
  247. package/lib/solution/PlaceOrder/index.js +55 -0
  248. package/lib/solution/RegisterAndLogin/config.js +493 -460
  249. package/lib/solution/RegisterAndLogin/index.js +633 -630
  250. package/lib/solution/RegisterAndLogin/types.js +189 -76
  251. package/lib/solution/RegisterAndLogin/utils.js +183 -125
  252. package/lib/solution/Sales/index.js +328 -324
  253. package/lib/solution/Sales/types.js +27 -33
  254. package/lib/solution/ScanOrder/index.js +832 -864
  255. package/lib/solution/ScanOrder/types.js +33 -34
  256. package/lib/solution/ScanOrder/utils.js +409 -374
  257. package/lib/solution/ShopDiscount/index.js +226 -232
  258. package/lib/solution/ShopDiscount/types.js +15 -37
  259. package/lib/solution/ShopDiscount/utils.js +300 -172
  260. package/lib/solution/UnifiedBookingSales/index.js +1035 -1201
  261. package/lib/solution/UnifiedBookingSales/remoteOccupancyCache.js +99 -159
  262. package/lib/solution/UnifiedBookingSales/types.js +10 -32
  263. package/lib/solution/VenueBooking/index.js +811 -879
  264. package/lib/solution/VenueBooking/types.js +19 -39
  265. package/lib/solution/VenueBooking/utils/dateSummary.js +27 -56
  266. package/lib/solution/VenueBooking/utils/resource.js +31 -54
  267. package/lib/solution/VenueBooking/utils/slotMerge.js +94 -107
  268. package/lib/solution/VenueBooking/utils/timeSlot.js +132 -132
  269. package/lib/solution/VenueBooking/utils.js +130 -67
  270. package/lib/solution/index.js +124 -41
  271. package/lib/store/createStore.js +32 -29
  272. package/lib/types/index.js +4 -16
  273. package/lib/utils/payment-number.js +26 -46
  274. package/lib/utils/task.js +36 -36
  275. package/lib/utils/watch.js +81 -47
  276. package/package.json +2 -1
@@ -1,27 +1,27 @@
1
- var __defProp = Object.defineProperty;
2
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
- var __getOwnPropNames = Object.getOwnPropertyNames;
4
- var __hasOwnProp = Object.prototype.hasOwnProperty;
5
- var __export = (target, all) => {
6
- for (var name in all)
7
- __defProp(target, name, { get: all[name], enumerable: true });
8
- };
9
- var __copyProps = (to, from, except, desc) => {
10
- if (from && typeof from === "object" || typeof from === "function") {
11
- for (let key of __getOwnPropNames(from))
12
- if (!__hasOwnProp.call(to, key) && key !== except)
13
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
- }
15
- return to;
16
- };
17
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
1
+ "use strict";
18
2
 
19
- // src/solution/BookingByStep/utils/stock.ts
20
- var stock_exports = {};
21
- __export(stock_exports, {
22
- checkProductStock: () => checkProductStock
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
23
5
  });
24
- module.exports = __toCommonJS(stock_exports);
6
+ exports.checkProductStock = checkProductStock;
7
+ /**
8
+ * 检测商品库存是否足够
9
+ *
10
+ * 只有同时满足以下条件时才会进行库存检测:
11
+ * - is_track 开启(值为 1 或 true)
12
+ * - over_sold 为 0(不允许超卖)
13
+ *
14
+ * 对于多规格商品:
15
+ * - 如果有 product_variant_id,则从 productData.variant 数组中查找对应规格
16
+ * - 使用规格的 is_track, over_sold, stock_quantity 而不是主商品的
17
+ *
18
+ * @param productData 商品数据(需包含 is_track, over_sold, stock_quantity 字段,多规格商品需包含 variant 数组)
19
+ * @param product_variant_id 商品变体ID,如果存在则为多规格商品
20
+ * @param quantity 需要添加的数量
21
+ * @param bundle 套餐配置(子商品需包含 is_track, over_sold, stock_quantity 字段)
22
+ * @param currentCartItems 当前购物车商品列表
23
+ * @returns 库存检测结果
24
+ */
25
25
  function checkProductStock({
26
26
  productData,
27
27
  product_variant_id,
@@ -29,20 +29,24 @@ function checkProductStock({
29
29
  bundle,
30
30
  currentCartItems
31
31
  }) {
32
+ // 1. 检测主商品库存
33
+ // 处理多规格商品:如果有product_variant_id,则从variant数组中查找对应的规格配置
32
34
  let mainProductConfig = productData;
33
35
  if (product_variant_id && productData.variant && Array.isArray(productData.variant)) {
34
- const variant = productData.variant.find((v) => v.id === product_variant_id);
36
+ const variant = productData.variant.find(v => v.id === product_variant_id);
35
37
  if (variant) {
36
- mainProductConfig = variant;
38
+ mainProductConfig = variant; // 使用规格的配置替换主商品配置
37
39
  }
38
40
  }
41
+
42
+ // 只有开启库存控制且不允许超卖时才需要检测主商品库存
39
43
  const isMainProductTrackingEnabled = mainProductConfig.is_track === 1 || mainProductConfig.is_track === true;
40
44
  const isMainProductOverSoldDisabled = mainProductConfig.over_sold === 0;
41
45
  if (isMainProductTrackingEnabled && isMainProductOverSoldDisabled) {
42
46
  const existingQuantity = currentCartItems.reduce((total, cartItem) => {
43
- var _a, _b, _c;
44
- const isSameProduct = ((_a = cartItem._productOrigin) == null ? void 0 : _a.id) === productData.id;
45
- const isSameVariant = !product_variant_id && !((_b = cartItem._productOrigin) == null ? void 0 : _b.product_variant_id) || ((_c = cartItem._productOrigin) == null ? void 0 : _c.product_variant_id) === product_variant_id;
47
+ // 检查是否为相同商品(比较商品ID和变体ID)
48
+ const isSameProduct = cartItem._productOrigin?.id === productData.id;
49
+ const isSameVariant = !product_variant_id && !cartItem._productOrigin?.product_variant_id || cartItem._productOrigin?.product_variant_id === product_variant_id;
46
50
  if (isSameProduct && isSameVariant) {
47
51
  return total + (cartItem.num || 0);
48
52
  }
@@ -50,25 +54,39 @@ function checkProductStock({
50
54
  }, 0);
51
55
  const totalQuantity = existingQuantity + quantity;
52
56
  const stockQuantity = mainProductConfig.stock_quantity;
53
- if (stockQuantity !== void 0 && stockQuantity !== null && totalQuantity > stockQuantity) {
54
- return { success: false, errorCode: "not_enough_stock" };
57
+
58
+ // 检查主商品库存是否足够
59
+ if (stockQuantity !== undefined && stockQuantity !== null && totalQuantity > stockQuantity) {
60
+ return {
61
+ success: false,
62
+ errorCode: 'not_enough_stock'
63
+ };
55
64
  }
56
65
  }
66
+
67
+ // 2. 检测套餐商品库存
57
68
  if (bundle && Array.isArray(bundle)) {
69
+ // 直接遍历套餐商品数组
58
70
  for (const bundleItem of bundle) {
59
71
  const bundleProductId = bundleItem.bundle_product_id;
60
72
  const bundleStockQuantity = bundleItem.stock_quantity;
61
- const bundleRequiredQuantity = (bundleItem.num || 1) * quantity;
73
+ const bundleRequiredQuantity = (bundleItem.num || 1) * quantity; // 子商品需求数量 = 子商品配置数量 * 主商品购买数量
74
+
75
+ // 检查套餐子商品是否需要进行库存控制
62
76
  const isBundleTrackingEnabled = bundleItem.is_track === 1 || bundleItem.is_track === true;
63
77
  const isBundleOverSoldDisabled = bundleItem.over_sold === 0;
64
- if (!isBundleTrackingEnabled || !isBundleOverSoldDisabled)
65
- continue;
66
- if (bundleStockQuantity === void 0 || bundleStockQuantity === null)
67
- continue;
78
+
79
+ // 跳过没有开启库存控制或允许超卖的子商品
80
+ if (!isBundleTrackingEnabled || !isBundleOverSoldDisabled) continue;
81
+
82
+ // 跳过没有库存配置的子商品
83
+ if (bundleStockQuantity === undefined || bundleStockQuantity === null) continue;
84
+
85
+ // 计算购物车中已有的相同子商品数量
68
86
  const existingBundleQuantity = currentCartItems.reduce((total, cartItem) => {
69
- if (!cartItem._bundleOrigin || !Array.isArray(cartItem._bundleOrigin))
70
- return total;
71
- cartItem._bundleOrigin.forEach((cartBundleItem) => {
87
+ // 检查购物车中商品的套餐配置
88
+ if (!cartItem._bundleOrigin || !Array.isArray(cartItem._bundleOrigin)) return total;
89
+ cartItem._bundleOrigin.forEach(cartBundleItem => {
72
90
  if (cartBundleItem.bundle_product_id === bundleProductId) {
73
91
  total += (cartBundleItem.num || 1) * (cartItem.num || 1);
74
92
  }
@@ -76,14 +94,17 @@ function checkProductStock({
76
94
  return total;
77
95
  }, 0);
78
96
  const totalBundleQuantity = existingBundleQuantity + bundleRequiredQuantity;
97
+
98
+ // 检查子商品库存是否足够
79
99
  if (totalBundleQuantity > bundleStockQuantity) {
80
- return { success: false, errorCode: "not_enough_stock" };
100
+ return {
101
+ success: false,
102
+ errorCode: 'not_enough_stock'
103
+ };
81
104
  }
82
105
  }
83
106
  }
84
- return { success: true };
85
- }
86
- // Annotate the CommonJS export names for ESM import in node:
87
- 0 && (module.exports = {
88
- checkProductStock
89
- });
107
+ return {
108
+ success: true
109
+ };
110
+ }
@@ -1,79 +1,85 @@
1
- var __create = Object.create;
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
- var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
8
- for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
-
29
- // src/solution/BookingByStep/utils/timeslots.ts
30
- var timeslots_exports = {};
31
- __export(timeslots_exports, {
32
- calculateResourceAvailableTime: () => calculateResourceAvailableTime,
33
- filterConditionTimeSlots: () => filterConditionTimeSlots,
34
- findFastestAvailableResource: () => findFastestAvailableResource
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
35
5
  });
36
- module.exports = __toCommonJS(timeslots_exports);
37
- var import_dayjs = __toESM(require("dayjs"));
6
+ exports.calculateResourceAvailableTime = calculateResourceAvailableTime;
7
+ exports.filterConditionTimeSlots = filterConditionTimeSlots;
8
+ exports.findFastestAvailableResource = findFastestAvailableResource;
9
+ var _dayjs = _interopRequireDefault(require("dayjs"));
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
+ /**
12
+ * 计算资源在指定时间段内的总可用时间(以分钟为单位)
13
+ * @param resource 需要计算可用时间的资源
14
+ * @param timeSlots 要检查可用性的时间段
15
+ * @param currentCapacity 当前预约所需的容量
16
+ * @returns 总可用时间(分钟)
17
+ */
38
18
  function calculateResourceAvailableTime({
39
19
  resource,
40
20
  timeSlots,
41
21
  currentCapacity = 1
42
22
  }) {
43
- const matchingTimes = resource.times.filter((time) => {
44
- return (0, import_dayjs.default)(time.start_at).isSame((0, import_dayjs.default)(timeSlots.start_at), "day");
23
+ // 过滤出与给定日期相同的资源时间
24
+ const matchingTimes = resource.times.filter(time => {
25
+ return (0, _dayjs.default)(time.start_at).isSame((0, _dayjs.default)(timeSlots.start_at), 'day');
45
26
  });
46
- if (matchingTimes.length === 0)
47
- return 0;
27
+ if (matchingTimes.length === 0) return 0;
28
+
29
+ // 计算所有时间段与目标时间槽的重叠部分
48
30
  const overlaps = [];
49
31
  for (const time of matchingTimes) {
50
- const overlapStart = (0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) ? (0, import_dayjs.default)(time.start_at) : (0, import_dayjs.default)(timeSlots.start_at);
51
- const overlapEnd = (0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at)) ? (0, import_dayjs.default)(time.end_at) : (0, import_dayjs.default)(timeSlots.end_at);
32
+ // 计算实际重叠的时间段
33
+ const overlapStart = (0, _dayjs.default)(time.start_at).isAfter((0, _dayjs.default)(timeSlots.start_at)) ? (0, _dayjs.default)(time.start_at) : (0, _dayjs.default)(timeSlots.start_at);
34
+ const overlapEnd = (0, _dayjs.default)(time.end_at).isBefore((0, _dayjs.default)(timeSlots.end_at)) ? (0, _dayjs.default)(time.end_at) : (0, _dayjs.default)(timeSlots.end_at);
35
+
36
+ // 只有当重叠时间段有效时才添加
52
37
  if (overlapStart.isBefore(overlapEnd)) {
53
- overlaps.push({ start: overlapStart, end: overlapEnd });
38
+ overlaps.push({
39
+ start: overlapStart,
40
+ end: overlapEnd
41
+ });
54
42
  }
55
43
  }
56
- if (overlaps.length === 0)
57
- return 0;
44
+
45
+ // 合并重叠的时间段,计算并集
46
+ if (overlaps.length === 0) return 0;
47
+
48
+ // 按开始时间排序
58
49
  overlaps.sort((a, b) => a.start.diff(b.start));
50
+
51
+ // 合并重叠的时间段
59
52
  const merged = [];
60
53
  let current = overlaps[0];
61
54
  for (let i = 1; i < overlaps.length; i++) {
62
55
  const next = overlaps[i];
56
+
57
+ // 如果当前时间段与下一个时间段重叠或相邻,则合并
63
58
  if (current.end.isSameOrAfter(next.start)) {
64
59
  current.end = current.end.isAfter(next.end) ? current.end : next.end;
65
60
  } else {
61
+ // 不重叠,添加当前时间段到结果中,开始处理下一个
66
62
  merged.push(current);
67
63
  current = next;
68
64
  }
69
65
  }
70
66
  merged.push(current);
67
+
68
+ // 计算所有合并后时间段的总时长
71
69
  let totalAvailableMinutes = 0;
72
70
  for (const segment of merged) {
73
- totalAvailableMinutes += segment.end.diff(segment.start, "minute");
71
+ totalAvailableMinutes += segment.end.diff(segment.start, 'minute');
74
72
  }
75
73
  return totalAvailableMinutes;
76
74
  }
75
+
76
+ /**
77
+ * 查找最快可用的资源,如果有多个资源在相同时间点可用,则选择空闲时间最长的资源
78
+ * @param resources 资源列表
79
+ * @param currentCapacity 当前预约所需的容量
80
+ * @param countMap 已预约数量映射
81
+ * @returns 最快可用的资源
82
+ */
77
83
  function findFastestAvailableResource({
78
84
  resources,
79
85
  currentCapacity = 1,
@@ -81,148 +87,140 @@ function findFastestAvailableResource({
81
87
  targetDate,
82
88
  durationMinutes = 30
83
89
  }) {
84
- var _a, _b, _c;
85
- const currentTime = (0, import_dayjs.default)();
90
+ const currentTime = (0, _dayjs.default)();
86
91
  const resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
87
- const targetDay = targetDate ? (0, import_dayjs.default)(targetDate) : currentTime;
88
- const isTargetDayToday = targetDay.isSame(currentTime, "day");
92
+ const targetDay = targetDate ? (0, _dayjs.default)(targetDate) : currentTime;
93
+ const isTargetDayToday = targetDay.isSame(currentTime, 'day');
89
94
  let fastestTime = null;
90
95
  let fastestResources = [];
91
- console.log("[TimeslotUtils] 查找最快可用资源:", {
92
- currentTime: currentTime.format("YYYY-MM-DD HH:mm:ss"),
93
- resourceCount: resources.length,
94
- currentCapacity,
95
- countMap
96
- });
96
+ // 遍历所有资源,找到最快可用的时间点
97
97
  for (const resource of resources) {
98
- const targetDayTimes = resource.times.filter((time) => {
99
- const isSameTargetDay = (0, import_dayjs.default)(time.start_at).isSame(targetDay, "day");
100
- if (!isSameTargetDay)
101
- return false;
102
- if (!isTargetDayToday)
103
- return true;
104
- return (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
98
+ // 获取资源在目标日期且还在工作时间内的时间段
99
+ const targetDayTimes = resource.times.filter(time => {
100
+ const isSameTargetDay = (0, _dayjs.default)(time.start_at).isSame(targetDay, 'day');
101
+ if (!isSameTargetDay) return false;
102
+ if (!isTargetDayToday) return true;
103
+ return (0, _dayjs.default)(time.end_at).isAfter(currentTime);
105
104
  });
106
105
  if (targetDayTimes.length === 0) {
107
- console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
108
106
  continue;
109
107
  }
110
108
  for (const time of targetDayTimes) {
111
- const workStartTime = (0, import_dayjs.default)(time.start_at);
112
- const workEndTime = (0, import_dayjs.default)(time.end_at);
109
+ const workStartTime = (0, _dayjs.default)(time.start_at);
110
+ const workEndTime = (0, _dayjs.default)(time.end_at);
111
+
112
+ // 确定检查的起始时间(当前时间 vs 工作开始时间)
113
113
  let nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
114
- console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
115
- workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
116
- checkStartTime: nextAvailableTime.format("HH:mm:ss"),
117
- eventCount: ((_a = time.event_list) == null ? void 0 : _a.length) || 0
118
- });
119
- const relevantEvents = ((_b = time.event_list) == null ? void 0 : _b.filter((event) => {
120
- const eventEnd = (0, import_dayjs.default)(event.end_at);
114
+ // 获取所有影响的预约事件(当前时间之后的)
115
+ const relevantEvents = time.event_list?.filter(event => {
116
+ const eventEnd = (0, _dayjs.default)(event.end_at);
121
117
  return eventEnd.isAfter(nextAvailableTime);
122
- })) || [];
123
- relevantEvents.sort(
124
- (a, b) => (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at))
125
- );
118
+ }) || [];
119
+
120
+ // 按开始时间排序
121
+ relevantEvents.sort((a, b) => (0, _dayjs.default)(a.start_at).diff((0, _dayjs.default)(b.start_at)));
122
+
123
+ // 检查从 nextAvailableTime 开始的可用性
126
124
  let finalAvailableTime = nextAvailableTime;
127
125
  for (const event of relevantEvents) {
128
- const eventStart = (0, import_dayjs.default)(event.start_at);
129
- const eventEnd = (0, import_dayjs.default)(event.end_at);
130
- console.log(`[TimeslotUtils] 检查事件冲突:`, {
131
- resourceId: resource.id,
132
- eventTime: `${eventStart.format("HH:mm")}-${eventEnd.format("HH:mm")}`,
133
- checkTime: finalAvailableTime.format("HH:mm:ss"),
134
- pax: event.pax || 1
135
- });
136
- if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
137
- if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
126
+ const eventStart = (0, _dayjs.default)(event.start_at);
127
+ const eventEnd = (0, _dayjs.default)(event.end_at);
128
+ // 检查资源类型和容量
129
+ if (resource.resourceType === 'single' || (resource.capacity || 1) === 1) {
130
+ // 单人预约资源:检查时间冲突
131
+ if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
132
+ // 有冲突,使用事件结束时间
138
133
  finalAvailableTime = eventEnd;
139
- console.log(`[TimeslotUtils] 发现时间冲突,调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
140
134
  }
141
135
  } else {
136
+ // 多人预约资源:检查容量
142
137
  const totalCapacity = resource.capacity || 0;
143
138
  const currentUsedCapacity = countMap[resource.id] || 0;
144
139
  const eventUsedCapacity = event.pax || 1;
145
- if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
140
+
141
+ // 如果在事件时间范围内,检查容量是否足够
142
+ if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
146
143
  const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
147
144
  if (totalRequiredCapacity > totalCapacity) {
145
+ // 容量不足,使用事件结束时间
148
146
  finalAvailableTime = eventEnd;
149
- console.log(`[TimeslotUtils] 容量不足,调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
150
147
  }
151
148
  }
152
149
  }
153
150
  }
154
- if (finalAvailableTime.add(resolvedDuration, "minute").isAfter(workEndTime)) {
155
- console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间,跳过`);
151
+
152
+ // 确保可用时间在工作时间内
153
+ if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
156
154
  continue;
157
155
  }
158
- console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 最快可用时间: ${finalAvailableTime.format("HH:mm:ss")}`);
156
+ // 更新最快可用时间和资源
159
157
  if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
160
158
  fastestTime = finalAvailableTime;
161
159
  fastestResources = [resource];
162
- console.log(`[TimeslotUtils] 更新最快时间: ${fastestTime.format("HH:mm:ss")}, 资源: ${resource.main_field}`);
163
160
  } else if (finalAvailableTime.isSame(fastestTime)) {
164
161
  fastestResources.push(resource);
165
- console.log(`[TimeslotUtils] 添加相同时间资源: ${resource.main_field}`);
166
162
  }
167
- break;
163
+ break; // 每个资源只需要计算一次
168
164
  }
169
165
  }
166
+
167
+ // 如果没有找到可用资源,返回null
170
168
  if (!fastestTime || fastestResources.length === 0) {
171
- console.log("[TimeslotUtils] 未找到可用资源");
172
169
  return null;
173
170
  }
174
- console.log(`[TimeslotUtils] 找到 ${fastestResources.length} 个最快可用资源,时间: ${fastestTime.format("HH:mm:ss")}`);
171
+ // 如果只有一个最快可用的资源,直接返回
175
172
  if (fastestResources.length === 1) {
176
- console.log(`[TimeslotUtils] 返回唯一最快资源: ${fastestResources[0].main_field}`);
177
173
  return fastestResources[0];
178
174
  }
175
+
176
+ // 如果有多个最快可用的资源,选择空闲时间最长的资源
179
177
  let selectedResource = fastestResources[0];
180
178
  let maxIdleTime = 0;
181
- console.log(`[TimeslotUtils] 比较 ${fastestResources.length} 个资源的空闲时间:`);
182
179
  for (const resource of fastestResources) {
183
- const workingTime = resource.times.find((time) => {
184
- const isToday = (0, import_dayjs.default)(time.start_at).isSame(fastestTime, "day");
185
- const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(fastestTime);
180
+ // 找到该资源当天且还在工作的时间段
181
+ const workingTime = resource.times.find(time => {
182
+ const isToday = (0, _dayjs.default)(time.start_at).isSame(fastestTime, 'day');
183
+ const isStillWorking = (0, _dayjs.default)(time.end_at).isAfter(fastestTime);
186
184
  return isToday && isStillWorking;
187
185
  });
188
- if (!workingTime)
189
- continue;
190
- const workEndTime = (0, import_dayjs.default)(workingTime.end_at);
191
- let totalIdleTime = workEndTime.diff(fastestTime, "minute");
192
- const relevantEvents = ((_c = workingTime.event_list) == null ? void 0 : _c.filter((event) => {
193
- const eventStart = (0, import_dayjs.default)(event.start_at);
194
- const eventEnd = (0, import_dayjs.default)(event.end_at);
186
+ if (!workingTime) continue;
187
+ const workEndTime = (0, _dayjs.default)(workingTime.end_at);
188
+
189
+ // 计算从最快可用时间到工作结束时间的空闲时长(分钟)
190
+ let totalIdleTime = workEndTime.diff(fastestTime, 'minute');
191
+
192
+ // 减去已有预约占用的时间
193
+ const relevantEvents = workingTime.event_list?.filter(event => {
194
+ const eventStart = (0, _dayjs.default)(event.start_at);
195
+ const eventEnd = (0, _dayjs.default)(event.end_at);
196
+ // 只计算在最快可用时间之后的预约
195
197
  return eventEnd.isAfter(fastestTime) && eventStart.isAfter(fastestTime);
196
- })) || [];
198
+ }) || [];
197
199
  for (const event of relevantEvents) {
198
- const eventStart = (0, import_dayjs.default)(event.start_at);
199
- const eventEnd = (0, import_dayjs.default)(event.end_at);
200
- const eventDuration = eventEnd.diff(eventStart, "minute");
200
+ const eventStart = (0, _dayjs.default)(event.start_at);
201
+ const eventEnd = (0, _dayjs.default)(event.end_at);
202
+ const eventDuration = eventEnd.diff(eventStart, 'minute');
201
203
  totalIdleTime -= eventDuration;
202
204
  }
203
- console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}):`, {
204
- 工作结束时间: workEndTime.format("HH:mm"),
205
- 总工作时长: workEndTime.diff(fastestTime, "minute") + "分钟",
206
- 预约占用时长: workEndTime.diff(fastestTime, "minute") - totalIdleTime + "分钟",
207
- 实际空闲时长: totalIdleTime + "分钟"
208
- });
209
205
  if (totalIdleTime > maxIdleTime) {
210
206
  maxIdleTime = totalIdleTime;
211
207
  selectedResource = resource;
212
- console.log(`[TimeslotUtils] 更新最佳选择: ${resource.main_field} (空闲${totalIdleTime}分钟)`);
213
208
  }
214
209
  }
215
- console.log(`[TimeslotUtils] 最终选择资源: ${selectedResource.main_field} (最长空闲${maxIdleTime}分钟)`);
216
210
  return selectedResource;
217
211
  }
212
+
213
+ /**
214
+ * 给定一个时间列表,通过开始和结束时间过滤出符合条件的时间段
215
+ *
216
+ * @export
217
+ * @param {TimeSliceItem[]} times
218
+ * @param {Dayjs} startTime
219
+ * @param {Dayjs} endTime
220
+ * @return {*}
221
+ */
218
222
  function filterConditionTimeSlots(times, startTime, endTime) {
219
- return times.filter((n) => {
220
- return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(endTime));
223
+ return times.filter(n => {
224
+ return !(0, _dayjs.default)(n.start_at).isAfter((0, _dayjs.default)(startTime)) && !(0, _dayjs.default)(n.end_at).isBefore((0, _dayjs.default)(endTime));
221
225
  });
222
- }
223
- // Annotate the CommonJS export names for ESM import in node:
224
- 0 && (module.exports = {
225
- calculateResourceAvailableTime,
226
- filterConditionTimeSlots,
227
- findFastestAvailableResource
228
- });
226
+ }