@pisell/pisellos 2.2.188 → 2.2.190

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/modules/Order/index.d.ts

@@ -143,6 +143,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
     private extractOrderIdFromSubmitResult;
+    private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;

package/dist/modules/Order/index.js

@@ -1121,15 +1121,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _ref3, _ref4, _ref5, _result$data$order_id, _result$data, _result$data2;
       return (_ref3 = (_ref4 = (_ref5 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref5 !== void 0 ? _ref5 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref4 !== void 0 ? _ref4 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref3 !== void 0 ? _ref3 : null;
     }
+  }, {
+    key: "calculatePaymentEffectiveAmount",
+    value: function calculatePaymentEffectiveAmount(payment) {
+      var amount = new Decimal(payment.amount || 0).minus(new Decimal(payment.service_fee || 0));
+      var rounding = new Decimal(payment.rounding_amount || 0);
+      return amount.minus(rounding);
+    }
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
+      var _this3 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
-        var amount = new Decimal(payment.amount || 0).minus(new Decimal(payment.service_fee || 0));
-        var rounding = new Decimal(payment.rounding_amount || 0);
-        return sum.plus(amount.minus(rounding));
+        return sum.plus(_this3.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -1170,18 +1176,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this3 = this;
+      var _this4 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this3.calculatePaymentServiceFee(paymentRecord))
+          gapPaidAmount: summary.gapPaidAmount.plus(_this4.calculatePaymentEffectiveAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this4.calculatePaymentServiceFee(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
         orderPaidAmount: new Decimal(0),
+        gapPaidAmount: new Decimal(0),
         payServiceChargeAmount: new Decimal(0)
       });
     }
@@ -1565,9 +1573,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this4 = this;
+      var _this5 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this4.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this5.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -1575,12 +1583,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata4,
         _product$metadata5,
-        _this5 = this;
+        _this6 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this5.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this6.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -1623,7 +1631,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
                   summary: createEmptySummary(),
-                  orderPaidAmount: paidPaymentSummary.orderPaidAmount
+                  orderPaidAmount: paidPaymentSummary.gapPaidAmount
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
@@ -1647,7 +1655,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
                   summary: salesSummaryResult,
-                  orderPaidAmount: paidPaymentSummary.orderPaidAmount
+                  orderPaidAmount: paidPaymentSummary.gapPaidAmount
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
@@ -1952,7 +1960,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this6 = this;
+      var _this7 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -1965,7 +1973,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this6.logError('recalculate summary after addOrderPayment failed', {
+        _this7.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -2030,10 +2038,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments) {
-      var _this7 = this;
+      var _this8 = this;
       var tempOrder = this.ensureTempOrder();
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this7.normalizePaymentSource(payment, {
+        return _this8.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       })).filter(function (payment) {
@@ -2048,7 +2056,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this7.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this8.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -2104,12 +2112,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(product, booking) {
-        var _this8 = this;
+        var _this9 = this;
         var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              debugger;
               tempOrder = this.ensureTempOrder();
               linked = booking ? this.createLinkedProductAndBooking({
                 product: product,
@@ -2122,7 +2129,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this8.hasGoodPassDiscount(item)) return false;
+                if (_this9.hasGoodPassDiscount(item)) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
@@ -2131,10 +2138,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(matchedProduct.product_option_item, matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context18.next = 18;
+                _context18.next = 17;
                 break;
               }
-              _context18.next = 15;
+              _context18.next = 14;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -2145,13 +2152,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 booking: booking
               });
-            case 15:
+            case 14:
               _context18.t0 = _context18.sent;
-              _context18.next = 19;
+              _context18.next = 18;
               break;
-            case 18:
+            case 17:
               _context18.t0 = false;
-            case 19:
+            case 18:
               shouldMerge = _context18.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
@@ -2184,18 +2191,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (linked) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
-              _context18.next = 24;
+              _context18.next = 23;
               return this.applyPromotion();
-            case 24:
+            case 23:
               this.applyDiscount();
-              _context18.next = 27;
+              _context18.next = 26;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 27:
+            case 26:
               this.persistTempOrder();
               return _context18.abrupt("return", tempOrder.products);
-            case 29:
+            case 28:
             case "end":
               return _context18.stop();
           }
@@ -2550,7 +2557,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "submitTempOrder",
     value: function () {
       var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _params$cacheId, _this$otherParams;
+        var _params$cacheId, _this$otherParams, _ref23, _params$businessCode, _this$otherParams2, _this$otherParams3;
         var tempOrder, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee21$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -2576,7 +2583,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform),
-                businessCode: params === null || params === void 0 ? void 0 : params.businessCode,
+                businessCode: (_ref23 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _ref23 !== void 0 ? _ref23 : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: params === null || params === void 0 ? void 0 : params.type,
                 enhance: enhancePayload
@@ -2699,10 +2706,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this9 = this;
+        _this10 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this9.isSubmitErrorResponse(candidate);
+        return _this10.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -2762,6 +2769,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 payments: mappedPayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
+                businessCode: params.businessCode,
                 channel: params.channel,
                 enhancePayload: function enhancePayload(payload) {
                   var nextPayload = _objectSpread(_objectSpread({}, payload), {}, {
@@ -3280,7 +3288,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this10 = this;
+      var _this11 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
@@ -3299,7 +3307,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this10.normalizeHydratedOrderProduct(p);
+        return _this11.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
         return _objectSpread(_objectSpread({}, b || {}), {}, {
@@ -3331,7 +3339,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var _product$metadata6, _ref23, _ref24, _existed$origin, _rawProduct$metadata;
+          var _product$metadata6, _ref24, _ref25, _existed$origin, _rawProduct$metadata;
           var _step8$value = _slicedToArray(_step8.value, 2),
             index = _step8$value[0],
             product = _step8$value[1];
@@ -3339,7 +3347,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref23 = (_ref24 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref24 !== void 0 ? _ref24 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref23 !== void 0 ? _ref23 : rawProduct;
+          var origin = (_ref24 = (_ref25 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref25 !== void 0 ? _ref25 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref24 !== void 0 ? _ref24 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -3407,10 +3415,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref25, _optionItem$num, _ref26, _optionItem$price;
-      var rawNum = (_ref25 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref25 !== void 0 ? _ref25 : 1;
+      var _ref26, _optionItem$num, _ref27, _optionItem$price;
+      var rawNum = (_ref26 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref26 !== void 0 ? _ref26 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref26 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref26 !== void 0 ? _ref26 : 0;
+      var rawPrice = (_ref27 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref27 !== void 0 ? _ref27 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -3459,14 +3467,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "resolveHydratedProductOptions",
     value: function resolveHydratedProductOptions(row) {
       var _row$product_sku,
-        _this11 = this;
+        _this12 = this;
       var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.option;
       if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
         return this.mergeHydratedProductOptionDisplayFields(row.product_option_item, skuOptions);
       }
       if (!Array.isArray(skuOptions)) return [];
       return skuOptions.map(function (optionItem) {
-        return _this11.normalizeHydratedProductOptionItem(optionItem || {});
+        return _this12.normalizeHydratedProductOptionItem(optionItem || {});
       });
     }
   }, {
@@ -3566,9 +3574,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step14;
           try {
             for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-              var _ref27, _bundle$num;
+              var _ref28, _bundle$num;
               var bundle = _step14.value;
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref27 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref28 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref28 !== void 0 ? _ref28 : 1) || 1).toNumber();
               var _iterator15 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step15;
               try {

package/dist/modules/Order/types.d.ts

@@ -439,6 +439,7 @@ export interface OrderPaymentMetadata {
     [key: string]: any;
 }
 export interface OrderPaymentData {
+    order_payment_id?: number | string;
     amount: string;
     code: string;
     custom_payment_id: number;
@@ -478,6 +479,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    businessCode?: string;
     channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {

package/dist/modules/Order/utils.js

@@ -825,7 +825,9 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
       metadata[key] = item[key];
     }
   }
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
+    order_payment_id: item.order_payment_id
+  } : {}), {}, {
     amount: String((_item$amount = item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0.00'),
     code: String(item.code || ''),
     custom_payment_id: Number(customPaymentId !== null && customPaymentId !== void 0 ? customPaymentId : 0),