@pisell/pisellos 2.2.224 → 2.2.225
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 -0
- package/dist/modules/Order/index.js +11 -2
- package/dist/server/index.d.ts +6 -0
- package/dist/server/index.js +519 -355
- package/dist/solution/BaseSales/utils/cartPromotion.js +3 -1
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.js +1 -1
- package/lib/modules/Order/index.d.ts +1 -0
- package/lib/modules/Order/index.js +6 -1
- package/lib/server/index.d.ts +6 -0
- package/lib/server/index.js +136 -3
- package/lib/solution/BaseSales/utils/cartPromotion.js +4 -1
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.js +1 -1
- package/package.json +1 -1
|
@@ -294,6 +294,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
294
294
|
*/
|
|
295
295
|
updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
|
|
296
296
|
private shouldMergeProductToOrder;
|
|
297
|
+
private hasOrderProductLineNote;
|
|
297
298
|
/**
|
|
298
299
|
* 预约商品加车后的统一收尾:促销、折扣、summary 重算与持久化(批量拆行时只调用一次)。
|
|
299
300
|
*
|
|
@@ -2911,7 +2911,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2911
2911
|
return _shouldMergeProductToOrder.apply(this, arguments);
|
|
2912
2912
|
}
|
|
2913
2913
|
return shouldMergeProductToOrder;
|
|
2914
|
-
}()
|
|
2914
|
+
}()
|
|
2915
|
+
}, {
|
|
2916
|
+
key: "hasOrderProductLineNote",
|
|
2917
|
+
value: function hasOrderProductLineNote(product) {
|
|
2918
|
+
return typeof (product === null || product === void 0 ? void 0 : product.note) === 'string' && product.note.trim().length > 0;
|
|
2919
|
+
}
|
|
2920
|
+
|
|
2921
|
+
// ─── TempOrder: 商品 CRUD ───
|
|
2922
|
+
|
|
2915
2923
|
/**
|
|
2916
2924
|
* 预约商品加车后的统一收尾:促销、折扣、summary 重算与持久化(批量拆行时只调用一次)。
|
|
2917
2925
|
*
|
|
@@ -2976,10 +2984,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
2976
2984
|
normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
|
|
2977
2985
|
normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
|
|
2978
2986
|
hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
|
|
2979
|
-
hasIncomingProductNote =
|
|
2987
|
+
hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
|
|
2980
2988
|
shouldForceNewLine = !!booking || hasIncomingProductNote;
|
|
2981
2989
|
matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
|
|
2982
2990
|
if (_this16.hasGoodPassDiscount(item)) return false;
|
|
2991
|
+
if (_this16.hasOrderProductLineNote(item)) return false;
|
|
2983
2992
|
if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
|
|
2984
2993
|
if (item.product_id !== productToAdd.product_id) return false;
|
|
2985
2994
|
if (item.product_variant_id !== productToAdd.product_variant_id) return false;
|
package/dist/server/index.d.ts
CHANGED
|
@@ -388,6 +388,9 @@ declare class Server {
|
|
|
388
388
|
private taskTimeout;
|
|
389
389
|
private getShortNumberOrDeviceId;
|
|
390
390
|
private buildCheckoutTaskIdempotencyKey;
|
|
391
|
+
private isBlankCheckoutValue;
|
|
392
|
+
private isLocalCheckoutOrderId;
|
|
393
|
+
private normalizeCheckoutSubmitData;
|
|
391
394
|
private ensureCheckoutOrderNumbers;
|
|
392
395
|
private dispatchCheckoutSyncTask;
|
|
393
396
|
private dispatchPrintOtherReceiptTask;
|
|
@@ -453,6 +456,9 @@ declare class Server {
|
|
|
453
456
|
private isMergeableCheckoutOrder;
|
|
454
457
|
private normalizeCheckoutResponse;
|
|
455
458
|
private isCheckoutResponseRejected;
|
|
459
|
+
private getUnknownErrorMessage;
|
|
460
|
+
private normalizeUnknownError;
|
|
461
|
+
private safeJsonClone;
|
|
456
462
|
private extractBackendErrorResponse;
|
|
457
463
|
private isExplicitBackendErrorResponse;
|
|
458
464
|
/**
|