@pisell/pisellos 2.3.36 → 2.3.37

package/dist/server/index.js

@@ -4924,12 +4924,9 @@ var Server = /*#__PURE__*/function () {
             case 10:
               this.logInfo('processSuccessfulLocalPayment: BaseSales 初始化完成', recoveryContext);
               _context50.next = 13;
-              return baseSales.loadSalesDetail({
-                externalSaleNumber: String(params.saleId),
-                preloadedSalesDetail: order
-              });
+              return baseSales.replaceTempOrder(order);
             case 13:
-              this.logInfo('processSuccessfulLocalPayment: 本地订单 hydrate 完成', recoveryContext);
+              this.logInfo('processSuccessfulLocalPayment: 本地订单 tempOrder 恢复完成', recoveryContext);
               this.logInfo('processSuccessfulLocalPayment: 开始更新支付项并提交', _objectSpread(_objectSpread({}, recoveryContext), {}, {
                 incoming_payment_update: params.paymentUpdate
               }));
@@ -7400,6 +7397,12 @@ var Server = /*#__PURE__*/function () {
 
               // 使用 filterOrders 进行过滤、排序、分页
               result = filterOrders(rawList, data);
+              result.list.forEach(function (order) {
+                var _order$payments;
+                order.payments = (_order$payments = order.payments) === null || _order$payments === void 0 ? void 0 : _order$payments.filter(function (payment) {
+                  return !isPendingOrderPayment(payment);
+                });
+              });
               this.logInfo('computeOrderQueryResult: 过滤结果', {
                 rawCount: rawList.length,
                 filteredCount: result.count,
@@ -7413,7 +7416,7 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 10:
+            case 11:
             case "end":
               return _context71.stop();
           }

package/dist/solution/BaseSales/index.js

@@ -37,7 +37,7 @@ import Decimal from 'decimal.js';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import { createModule } from "../BookingByStep/types";
 import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, resolveIsFormSubject, sumOptionUnitPrice } from "../../modules/Order/utils";
-import { ensureOrderPaymentNumber, isIdentifiedPendingOrderPayment, mergeOrderPaymentListsByIdentity, resolveOrderPaymentIdentity } from "../../modules/Order/payment-utils";
+import { ensureOrderPaymentNumber, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity, resolveOrderPaymentIdentity } from "../../modules/Order/payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollection, normalizeOrderCollections, setOrderCollectionUid } from "../../modules/Order/utils/orderCollectionIdentity";
 import dayjs from 'dayjs';
@@ -269,6 +269,22 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   delete mergedRecord.request_unique_idempotency_token;
   return normalizeBaseSalesRecordCollections(applyOrderCollectionUidRemaps(mergedRecord, uidRemaps));
 }
+function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
+  if (!sourceRecord || _typeof(sourceRecord) !== 'object') return sourceRecord;
+  var record = _objectSpread({}, sourceRecord);
+  if (Array.isArray(sourceRecord.payments)) {
+    record.payments = sourceRecord.payments.filter(function (payment) {
+      return !isPendingOrderPayment(payment);
+    });
+  }
+  // 兼容少量历史详情数据使用的单数 payment 字段。
+  if (Array.isArray(sourceRecord.payment)) {
+    record.payment = sourceRecord.payment.filter(function (payment) {
+      return !isPendingOrderPayment(payment);
+    });
+  }
+  return record;
+}
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
   var _super = _createSuper(BaseSalesImpl);
@@ -1323,7 +1339,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderIdOrParams) {
-        var loadSequence, _ref17, _ref18, _ref19, _ref20, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record;
+        var loadSequence, _ref17, _ref18, _ref19, _ref20, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, mergedRecord, record;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1372,39 +1388,40 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
               throw new Error(message);
             case 22:
-              remoteRecord = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data;
+              remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data);
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
-              _context13.next = 27;
+              mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
+              record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
+              _context13.next = 28;
               return this.hydrateLatestLoadedSalesDetail(record, loadSequence);
-            case 27:
-              return _context13.abrupt("return", _context13.sent);
             case 28:
-              _context13.prev = 28;
+              return _context13.abrupt("return", _context13.sent);
+            case 29:
+              _context13.prev = 29;
               this.salesDetailLoadInFlightCount = Math.max(0, this.salesDetailLoadInFlightCount - 1);
               if (!(this.salesDetailLoadInFlightCount === 0)) {
-                _context13.next = 39;
+                _context13.next = 40;
                 break;
               }
-              _context13.prev = 31;
-              _context13.next = 34;
+              _context13.prev = 32;
+              _context13.next = 35;
               return this.drainQueuedServerOrderChanges();
-            case 34:
-              _context13.next = 39;
+            case 35:
+              _context13.next = 40;
               break;
-            case 36:
-              _context13.prev = 36;
-              _context13.t1 = _context13["catch"](31);
+            case 37:
+              _context13.prev = 37;
+              _context13.t1 = _context13["catch"](32);
               this.logError('drain queued server order changes failed', {
                 error: _context13.t1 instanceof Error ? _context13.t1.message : String(_context13.t1)
               });
-            case 39:
-              return _context13.finish(28);
             case 40:
+              return _context13.finish(29);
+            case 41:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[4,, 28, 40], [31, 36]]);
+        }, _callee13, this, [[4,, 29, 41], [32, 37]]);
       }));
       function loadSalesDetail(_x11) {
         return _loadSalesDetail.apply(this, arguments);

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

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/server/index.js

@@ -3197,11 +3197,8 @@ var Server = class {
         }
       });
       this.logInfo("processSuccessfulLocalPayment: BaseSales 初始化完成", recoveryContext);
-      await baseSales.loadSalesDetail({
-        externalSaleNumber: String(params.saleId),
-        preloadedSalesDetail: order
-      });
-      this.logInfo("processSuccessfulLocalPayment: 本地订单 hydrate 完成", recoveryContext);
+      await baseSales.replaceTempOrder(order);
+      this.logInfo("processSuccessfulLocalPayment: 本地订单 tempOrder 恢复完成", recoveryContext);
       this.logInfo("processSuccessfulLocalPayment: 开始更新支付项并提交", {
         ...recoveryContext,
         incoming_payment_update: params.paymentUpdate
@@ -4843,6 +4840,10 @@ var Server = class {
     const rawList = this.order.getOrders();
     this.logInfo("computeOrderQueryResult: 本地订单数量", { rawCount: rawList.length });
     const result = (0, import_filterOrders.filterOrders)(rawList, data);
+    result.list.forEach((order) => {
+      var _a;
+      order.payments = (_a = order.payments) == null ? void 0 : _a.filter((payment) => !(0, import_payment_utils.isPendingOrderPayment)(payment));
+    });
     this.logInfo("computeOrderQueryResult: 过滤结果", {
       rawCount: rawList.length,
       filteredCount: result.count,

package/lib/solution/BaseSales/index.js

@@ -309,6 +309,18 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
     (0, import_orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps)
   );
 }
+function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
+  if (!sourceRecord || typeof sourceRecord !== "object")
+    return sourceRecord;
+  const record = { ...sourceRecord };
+  if (Array.isArray(sourceRecord.payments)) {
+    record.payments = sourceRecord.payments.filter((payment) => !(0, import_payment_utils.isPendingOrderPayment)(payment));
+  }
+  if (Array.isArray(sourceRecord.payment)) {
+    record.payment = sourceRecord.payment.filter((payment) => !(0, import_payment_utils.isPendingOrderPayment)(payment));
+  }
+  return record;
+}
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -994,13 +1006,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
+      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
+        preloadedSalesDetail ?? loadedRecord.data
+      );
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(
+      const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
+      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
       return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.36",
+  "version": "2.3.37",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",