@pisell/pisellos 2.3.154 → 2.3.156

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

@@ -1,9 +0,0 @@
-// 导出评估器
-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, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -31,6 +31,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { loadSalesOrderSnapshot } from "../../shared/sales/loadSalesOrderSnapshot";
+import { PAYMENT_REFRESH_MESSAGE, requiresLocalPaymentRefresh, stripLocalEftposState } from "./localEftposState";
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
 import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, collectPointCardSnapshotCodeCandidates, mergePointCardSnapshotCodes as _mergePointCardSnapshotCodes, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
@@ -4545,6 +4546,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           identity,
           matchMode,
           matchedPayment,
+          _this$logger,
+          _this$logger$addLog,
           updatedPayment,
           summary,
           payments,
@@ -4558,11 +4561,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchMode = options.matchBy === 'compat' || options.matchBy === 'legacy' ? 'compat' : 'payment_number';
               matchedPayment = resolveOrderPaymentIdentity(tempOrder.payments || [], identity, matchMode);
               if (matchedPayment) {
-                _context22.next = 7;
+                _context22.next = 8;
                 break;
               }
+              try {
+                void Promise.resolve((_this$logger = this.logger) === null || _this$logger === void 0 || (_this$logger$addLog = _this$logger.addLog) === null || _this$logger$addLog === void 0 ? void 0 : _this$logger$addLog.call(_this$logger, {
+                  type: 'warning',
+                  title: '[PaymentTrace] payment-missing',
+                  metadata: {
+                    moduleName: this.name,
+                    saleId: tempOrder.external_sale_number,
+                    paymentNumber: identity,
+                    currentPaymentNumbers: (tempOrder.payments || []).map(function (p) {
+                      return p.payment_number;
+                    })
+                  }
+                })).catch(function () {});
+              } catch (_unused4) {/* 日志失败不影响原异常。 */}
               throw new Error("\u672A\u627E\u5230\u652F\u4ED8\u9879: ".concat(identity));
-            case 7:
+            case 8:
               updatedPayment = null;
               tempOrder.payments = (tempOrder.payments || []).map(function (payment, index) {
                 if (index !== matchedPayment.index) return payment;
@@ -4573,11 +4590,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return nextPayment;
               });
               this.persistTempOrder();
-              _context22.next = 12;
+              _context22.next = 13;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 12:
+            case 13:
               summary = _context22.sent;
               this.persistTempOrder();
               payments = tempOrder.payments;
@@ -4587,7 +4604,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 payments: payments,
                 summary: summary
               });
-            case 16:
+            case 17:
             case "end":
               return _context22.stop();
           }
@@ -6808,6 +6825,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              if (!requiresLocalPaymentRefresh(tempOrder)) {
+                _context40.next = 3;
+                break;
+              }
+              throw new Error(PAYMENT_REFRESH_MESSAGE);
+            case 3:
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isOnlineStorePlatform = this.isOnlineStorePlatform();
               shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
@@ -6829,25 +6852,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.persistTempOrder();
-              _context40.next = 10;
+              _context40.next = 12;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 10:
+            case 12:
               _context40.t1 = _context40.sent;
               if (_context40.t1) {
-                _context40.next = 13;
+                _context40.next = 15;
                 break;
               }
               _context40.t1 = this.store.summary;
-            case 13:
+            case 15:
               _context40.t0 = _context40.t1;
               if (_context40.t0) {
-                _context40.next = 16;
+                _context40.next = 18;
                 break;
               }
               _context40.t0 = createEmptySummary();
-            case 16:
+            case 18:
               latestSummary = _context40.t0;
               effectiveCacheId = (_params$cacheId3 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId3 !== void 0 ? _params$cacheId3 : this.cacheId;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
@@ -6884,10 +6907,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context40.next = 28;
+              _context40.next = 30;
               return this.saveDraft();
-            case 28:
-              _context40.prev = 28;
+            case 30:
+              _context40.prev = 30;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -6897,26 +6920,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context40.next = 32;
+              _context40.next = 34;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 32:
+            case 34:
               result = _context40.sent;
-              _context40.next = 45;
+              _context40.next = 47;
               break;
-            case 35:
-              _context40.prev = 35;
-              _context40.t2 = _context40["catch"](28);
+            case 37:
+              _context40.prev = 37;
+              _context40.t2 = _context40["catch"](30);
               backendErrorResponse = this.extractSubmitErrorResponse(_context40.t2);
               if (!backendErrorResponse) {
-                _context40.next = 42;
+                _context40.next = 44;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context40.abrupt("return", backendErrorResponse);
-            case 42:
+            case 44:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context40.t2 instanceof Error ? _context40.t2.message : String(_context40.t2),
@@ -6926,15 +6949,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context40.t2;
-            case 45:
+            case 47:
               if (!this.isSubmitResponseRejected(result)) {
-                _context40.next = 49;
+                _context40.next = 51;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context40.abrupt("return", result);
-            case 49:
+            case 51:
               isLocalPendingSubmit = this.isLocalPendingSubmitResult(result); // need_sync=1 仅表示已进入本地同步队列，不能视为远端已确认 Notes。
               if (Object.prototype.hasOwnProperty.call(payload, 'notes') && !isLocalPendingSubmit) {
                 salesNotesState = this.ensureSalesNotesRuntimeState(tempOrder);
@@ -6949,25 +6972,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context40.next = 58;
+                _context40.next = 60;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context40.next = 58;
+              _context40.next = 60;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 58:
+            case 60:
               if (isLocalPendingSubmit) {
                 this.store.syncState = 'local';
               } else if (submittedOrderId === null || submittedOrderId === undefined) {
                 this.store.syncState = 'submitted';
               }
               return _context40.abrupt("return", result);
-            case 60:
+            case 62:
             case "end":
               return _context40.stop();
           }
-        }, _callee37, this, [[28, 35]]);
+        }, _callee37, this, [[30, 37]]);
       }));
       function runSubmitTempOrder(_x43) {
         return _runSubmitTempOrder.apply(this, arguments);
@@ -7512,7 +7535,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripOsPrivatePayloadFields(query);
+              requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripLocalEftposState(stripOsPrivatePayloadFields(query));
               return _context47.abrupt("return", this.request.post(fetchUrl, requestQuery, {
                 osServer: true,
                 customToast: function customToast() {}

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

@@ -0,0 +1,13 @@
+/** Local reconciliation state; never part of a cloud checkout payload. */
+export declare const LOCAL_EFTPOS_REFRESH_REQUIRED = "_local_eftpos_refresh_required";
+export declare const LOCAL_EFTPOS_FINALIZED = "_local_eftpos_finalized";
+export declare const PAYMENT_REFRESH_MESSAGE = "\u8BA2\u5355\u9700\u8981\u5237\u65B0\uFF0C\u8BF7\u8054\u7F51\u5237\u65B0\u8BA2\u5355\u540E\u518D\u4ED8\u6B3E";
+export interface LocalEftposFinalization {
+    saleId: string | number;
+    paymentNumber: string;
+    result: 'failed' | 'not_started';
+    failedTransactionNumbers: string[];
+}
+export declare function requiresLocalPaymentRefresh(order: any): boolean;
+export declare function isLocalFinalizedPayment(payment: any): boolean;
+export declare function stripLocalEftposState<T extends Record<string, any>>(order: T): T;

package/dist/modules/Order/localEftposState.js

@@ -0,0 +1,39 @@
+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); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/** Local reconciliation state; never part of a cloud checkout payload. */
+export var LOCAL_EFTPOS_REFRESH_REQUIRED = '_local_eftpos_refresh_required';
+export var LOCAL_EFTPOS_FINALIZED = '_local_eftpos_finalized';
+export var PAYMENT_REFRESH_MESSAGE = '订单需要刷新，请联网刷新订单后再付款';
+export function requiresLocalPaymentRefresh(order) {
+  var _order$metadata;
+  return (order === null || order === void 0 || (_order$metadata = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata[LOCAL_EFTPOS_REFRESH_REQUIRED]) === true;
+}
+export function isLocalFinalizedPayment(payment) {
+  var _payment$metadata;
+  return (payment === null || payment === void 0 ? void 0 : payment.status) === 'voided' && (payment === null || payment === void 0 || (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata[LOCAL_EFTPOS_FINALIZED]) === true;
+}
+export function stripLocalEftposState(order) {
+  var result = _objectSpread({}, order);
+  if (order.metadata) {
+    result.metadata = _objectSpread({}, order.metadata);
+    delete result.metadata[LOCAL_EFTPOS_REFRESH_REQUIRED];
+  }
+  if (Array.isArray(order.payments)) {
+    result.payments = order.payments.filter(function (payment) {
+      return !isLocalFinalizedPayment(payment);
+    }).map(function (payment) {
+      var _payment$metadata2;
+      if (!((_payment$metadata2 = payment.metadata) !== null && _payment$metadata2 !== void 0 && _payment$metadata2[LOCAL_EFTPOS_FINALIZED])) return payment;
+      var metadata = _objectSpread({}, payment.metadata);
+      delete metadata[LOCAL_EFTPOS_FINALIZED];
+      return _objectSpread(_objectSpread({}, payment), {}, {
+        metadata: metadata
+      });
+    });
+  }
+  return result;
+}

package/dist/server/index.d.ts

@@ -499,6 +499,7 @@ declare class Server {
     private buildLocalPaymentSurchargeUpdate;
     private handleGetLocalPayment;
     private handleUpdateLocalPayment;
+    private handleFinalizeLocalEftposPayment;
     private runLocalPaymentUpdateInQueue;
     private processLocalPaymentUpdate;
     private processSuccessfulLocalPayment;