@pisell/pisellos 2.2.320 → 2.2.322

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.
@@ -0,0 +1,9 @@
1
+ // 导出评估器
2
+ export { PromotionEvaluator } from "./evaluator";
3
+
4
+ // 导出适配器
5
+ export { PromotionAdapter } from "./adapter";
6
+ export { default } from "./adapter";
7
+
8
+ // 导出策略配置示例常量
9
+ export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
49
49
  getCategories(): ProductCategory[];
50
50
  setOtherParams(key: string, value: any): void;
51
51
  getOtherParams(): any;
52
- getProductType(): "duration" | "normal" | "session";
52
+ getProductType(): "normal" | "duration" | "session";
53
53
  }
@@ -4873,7 +4873,9 @@ var Server = /*#__PURE__*/function () {
4873
4873
  case 3:
4874
4874
  _context52.prev = 3;
4875
4875
  _context52.next = 6;
4876
- return this.app.request.post('/shop/order/v2/list', data, {
4876
+ return this.app.request.post('/shop/order/v2/list', _objectSpread(_objectSpread({}, data), {}, {
4877
+ with: _toConsumableArray(new Set([].concat(_toConsumableArray(Array.isArray(data.with) ? data.with : []), ['buzzer'])))
4878
+ }), {
4877
4879
  isShopApi: true
4878
4880
  });
4879
4881
  case 6:
@@ -541,7 +541,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
541
541
  continue;
542
542
  }
543
543
 
544
- // 远端商品成员或 Holder 关系确实变化时必须落库,避免被回声窗口跳过。
544
+ // 远端商品成员、Holder 关系或预约数据确实变化时必须落库,避免被回声窗口跳过。
545
545
  if (forceWriteStorageKeys.has(storageKey)) {
546
546
  toWrite.push(order);
547
547
  continue;
@@ -3045,7 +3045,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
3045
3045
  mergedStorageKey = this.getOrderStorageKey(mergedOrder);
3046
3046
  if (mergedStorageKey) forceWriteStorageKeys.add(mergedStorageKey);
3047
3047
  }
3048
- if (nextStorageKey && !isEqual(existingOrder.holder_relations, mergedOrder.holder_relations)) {
3048
+ if (nextStorageKey && (!isEqual(existingOrder.holder_relations, mergedOrder.holder_relations) || !isEqual(existingOrder.bookings, mergedOrder.bookings))) {
3049
3049
  forceWriteStorageKeys.add(nextStorageKey);
3050
3050
  }
3051
3051
  // 合并后身份字段可能新增(如挂单拿到 order_id),同步登记到索引,
@@ -519,6 +519,8 @@ export interface OrderFilters {
519
519
  max_total_amount?: number;
520
520
  tag_ids?: (string | number)[];
521
521
  shipping_type?: string[];
522
+ /** 交付方式,精确匹配 metadata.shop_service_data.service_type;多选之间为 OR */
523
+ service_type?: string[];
522
524
  delivery_zone_name?: string;
523
525
  location_id?: string | number;
524
526
  shipping_order_number?: string;
@@ -1,3 +1,4 @@
1
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
1
2
  import dayjs from 'dayjs';
2
3
  /** 从订单 payments 提取支付方式 code,与 UI 筛选选项及 filterBookings 一致 */
3
4
  function getOrderPaymentCodes(order) {
@@ -248,6 +249,25 @@ export function filterOrders(orders, filters) {
248
249
  }
249
250
  }
250
251
 
252
+ // service_type - 交付方式(同组多选 OR,与其他条件 AND)
253
+ if (Array.isArray(safeFilters.service_type) && safeFilters.service_type.length > 0) {
254
+ var _order$metadata;
255
+ var shopServiceData = (_order$metadata = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata.shop_service_data;
256
+ var serviceType = shopServiceData && _typeof(shopServiceData) === 'object' ? shopServiceData.service_type : undefined;
257
+ if (typeof serviceType !== 'string' || !safeFilters.service_type.includes(serviceType)) {
258
+ rejected.push({
259
+ order_id: order.order_id,
260
+ order_number: order.order_number,
261
+ reason: {
262
+ field: 'service_type',
263
+ actual: serviceType,
264
+ expected: safeFilters.service_type
265
+ }
266
+ });
267
+ return false;
268
+ }
269
+ }
270
+
251
271
  // delivery_zone_name - 配送区域(模糊匹配)
252
272
  if (safeFilters.delivery_zone_name !== undefined && safeFilters.delivery_zone_name !== null && safeFilters.delivery_zone_name !== '') {
253
273
  if (!order.delivery_zone_name || !order.delivery_zone_name.toLowerCase().includes(safeFilters.delivery_zone_name.toLowerCase())) {
@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
328
328
  date: string;
329
329
  status: string;
330
330
  week: string;
331
- weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
331
+ weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
332
332
  }[]>;
333
333
  submitTimeSlot(timeSlots: TimeSliceItem): void;
334
334
  private getScheduleDataByIds;
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
375
375
  };
376
376
  setOtherData(key: string, value: any): void;
377
377
  getOtherData(key: string): any;
378
- getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
378
+ getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
379
379
  /**
380
380
  * 提供给 UI 的方法,减轻 UI 层的计算压力,UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
381
381
  *
@@ -1 +1,46 @@
1
- "use strict";
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
7
+ enumerable: true,
8
+ get: function () {
9
+ return _examples.BUY_X_GET_Y_FREE_STRATEGY;
10
+ }
11
+ });
12
+ Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
13
+ enumerable: true,
14
+ get: function () {
15
+ return _examples.ITEM_REWARD_STRATEGY;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "PromotionAdapter", {
19
+ enumerable: true,
20
+ get: function () {
21
+ return _adapter.PromotionAdapter;
22
+ }
23
+ });
24
+ Object.defineProperty(exports, "PromotionEvaluator", {
25
+ enumerable: true,
26
+ get: function () {
27
+ return _evaluator.PromotionEvaluator;
28
+ }
29
+ });
30
+ Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
31
+ enumerable: true,
32
+ get: function () {
33
+ return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
34
+ }
35
+ });
36
+ Object.defineProperty(exports, "default", {
37
+ enumerable: true,
38
+ get: function () {
39
+ return _adapter.default;
40
+ }
41
+ });
42
+ var _evaluator = require("./evaluator");
43
+ var _adapter = _interopRequireWildcard(require("./adapter"));
44
+ var _examples = require("./examples");
45
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
46
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
49
49
  getCategories(): ProductCategory[];
50
50
  setOtherParams(key: string, value: any): void;
51
51
  getOtherParams(): any;
52
- getProductType(): "duration" | "normal" | "session";
52
+ getProductType(): "normal" | "duration" | "session";
53
53
  }
@@ -2475,7 +2475,10 @@ class Server {
2475
2475
  };
2476
2476
  }
2477
2477
  try {
2478
- const response = await this.app.request.post('/shop/order/v2/list', data, {
2478
+ const response = await this.app.request.post('/shop/order/v2/list', {
2479
+ ...data,
2480
+ with: [...new Set([...(Array.isArray(data.with) ? data.with : []), 'buzzer'])]
2481
+ }, {
2479
2482
  isShopApi: true
2480
2483
  });
2481
2484
  const payload = response?.data ?? response;
@@ -366,7 +366,7 @@ class OrderModule extends _BaseModule.BaseModule {
366
366
  continue;
367
367
  }
368
368
 
369
- // 远端商品成员或 Holder 关系确实变化时必须落库,避免被回声窗口跳过。
369
+ // 远端商品成员、Holder 关系或预约数据确实变化时必须落库,避免被回声窗口跳过。
370
370
  if (forceWriteStorageKeys.has(storageKey)) {
371
371
  toWrite.push(order);
372
372
  continue;
@@ -1841,7 +1841,7 @@ class OrderModule extends _BaseModule.BaseModule {
1841
1841
  const mergedStorageKey = this.getOrderStorageKey(mergedOrder);
1842
1842
  if (mergedStorageKey) forceWriteStorageKeys.add(mergedStorageKey);
1843
1843
  }
1844
- if (nextStorageKey && !(0, _lodashEs.isEqual)(existingOrder.holder_relations, mergedOrder.holder_relations)) {
1844
+ if (nextStorageKey && (!(0, _lodashEs.isEqual)(existingOrder.holder_relations, mergedOrder.holder_relations) || !(0, _lodashEs.isEqual)(existingOrder.bookings, mergedOrder.bookings))) {
1845
1845
  forceWriteStorageKeys.add(nextStorageKey);
1846
1846
  }
1847
1847
  // 合并后身份字段可能新增(如挂单拿到 order_id),同步登记到索引,
@@ -519,6 +519,8 @@ export interface OrderFilters {
519
519
  max_total_amount?: number;
520
520
  tag_ids?: (string | number)[];
521
521
  shipping_type?: string[];
522
+ /** 交付方式,精确匹配 metadata.shop_service_data.service_type;多选之间为 OR */
523
+ service_type?: string[];
522
524
  delivery_zone_name?: string;
523
525
  location_id?: string | number;
524
526
  shipping_order_number?: string;
@@ -247,6 +247,24 @@ function filterOrders(orders, filters) {
247
247
  }
248
248
  }
249
249
 
250
+ // service_type - 交付方式(同组多选 OR,与其他条件 AND)
251
+ if (Array.isArray(safeFilters.service_type) && safeFilters.service_type.length > 0) {
252
+ const shopServiceData = order.metadata?.shop_service_data;
253
+ const serviceType = shopServiceData && typeof shopServiceData === 'object' ? shopServiceData.service_type : undefined;
254
+ if (typeof serviceType !== 'string' || !safeFilters.service_type.includes(serviceType)) {
255
+ rejected.push({
256
+ order_id: order.order_id,
257
+ order_number: order.order_number,
258
+ reason: {
259
+ field: 'service_type',
260
+ actual: serviceType,
261
+ expected: safeFilters.service_type
262
+ }
263
+ });
264
+ return false;
265
+ }
266
+ }
267
+
250
268
  // delivery_zone_name - 配送区域(模糊匹配)
251
269
  if (safeFilters.delivery_zone_name !== undefined && safeFilters.delivery_zone_name !== null && safeFilters.delivery_zone_name !== '') {
252
270
  if (!order.delivery_zone_name || !order.delivery_zone_name.toLowerCase().includes(safeFilters.delivery_zone_name.toLowerCase())) {
@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
328
328
  date: string;
329
329
  status: string;
330
330
  week: string;
331
- weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
331
+ weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
332
332
  }[]>;
333
333
  submitTimeSlot(timeSlots: TimeSliceItem): void;
334
334
  private getScheduleDataByIds;
@@ -375,7 +375,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
375
375
  };
376
376
  setOtherData(key: string, value: any): void;
377
377
  getOtherData(key: string): any;
378
- getProductTypeById(id: number): Promise<"duration" | "normal" | "session">;
378
+ getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
379
379
  /**
380
380
  * 提供给 UI 的方法,减轻 UI 层的计算压力,UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
381
381
  *
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "@pisell/pisellos",
4
- "version": "2.2.320",
4
+ "version": "2.2.322",
5
5
  "description": "一个可扩展的前端模块化SDK框架,支持插件系统",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",