@pisell/pisellos 2.3.174 → 2.3.176
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.
- package/dist/modules/Order/index.d.ts +1 -1
- package/dist/modules/Order/utils.js +1 -0
- package/dist/modules/Product/index.d.ts +1 -1
- package/dist/server/index.js +3 -1
- package/dist/server/modules/order/types.d.ts +2 -0
- package/dist/server/modules/order/utils/filterOrders.js +20 -0
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/lib/modules/Order/index.d.ts +1 -1
- package/lib/modules/Order/utils.js +1 -0
- package/lib/modules/Product/index.d.ts +1 -1
- package/lib/server/index.js +4 -1
- package/lib/server/modules/order/types.d.ts +2 -0
- package/lib/server/modules/order/utils/filterOrders.js +18 -0
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/package.json +1 -1
|
@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
595
595
|
generateIdempotencyToken(): string;
|
|
596
596
|
syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
|
|
597
597
|
createOrder(params: CommitOrderParams['query']): {
|
|
598
|
-
type: "
|
|
598
|
+
type: "virtual" | "appointment_booking";
|
|
599
599
|
platform: string;
|
|
600
600
|
sales_channel: string;
|
|
601
601
|
order_sales_channel: string;
|
|
@@ -1102,6 +1102,7 @@ function normalizeSubmitPlatform(platform) {
|
|
|
1102
1102
|
var lower = value.toLowerCase();
|
|
1103
1103
|
if (lower === 'pc') return 'PC';
|
|
1104
1104
|
if (lower === 'h5') return 'H5';
|
|
1105
|
+
if (lower === 'webpos') return 'pos';
|
|
1105
1106
|
return value;
|
|
1106
1107
|
}
|
|
1107
1108
|
function normalizeSubmitProductionCode(value) {
|
|
@@ -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(): "
|
|
52
|
+
getProductType(): "normal" | "duration" | "session";
|
|
53
53
|
}
|
package/dist/server/index.js
CHANGED
|
@@ -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:
|
|
@@ -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())) {
|
|
@@ -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<"
|
|
378
|
+
getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
|
|
379
379
|
/**
|
|
380
380
|
* 提供给 UI 的方法,减轻 UI 层的计算压力,UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
|
|
381
381
|
*
|
|
@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
595
595
|
generateIdempotencyToken(): string;
|
|
596
596
|
syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
|
|
597
597
|
createOrder(params: CommitOrderParams['query']): {
|
|
598
|
-
type: "
|
|
598
|
+
type: "virtual" | "appointment_booking";
|
|
599
599
|
platform: string;
|
|
600
600
|
sales_channel: string;
|
|
601
601
|
order_sales_channel: string;
|
|
@@ -1124,6 +1124,7 @@ function normalizeSubmitPlatform(platform) {
|
|
|
1124
1124
|
const lower = value.toLowerCase();
|
|
1125
1125
|
if (lower === 'pc') return 'PC';
|
|
1126
1126
|
if (lower === 'h5') return 'H5';
|
|
1127
|
+
if (lower === 'webpos') return 'pos';
|
|
1127
1128
|
return value;
|
|
1128
1129
|
}
|
|
1129
1130
|
function normalizeSubmitProductionCode(value) {
|
|
@@ -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(): "
|
|
52
|
+
getProductType(): "normal" | "duration" | "session";
|
|
53
53
|
}
|
package/lib/server/index.js
CHANGED
|
@@ -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',
|
|
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;
|
|
@@ -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())) {
|
|
@@ -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<"
|
|
378
|
+
getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
|
|
379
379
|
/**
|
|
380
380
|
* 提供给 UI 的方法,减轻 UI 层的计算压力,UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
|
|
381
381
|
*
|