@pisell/pisellos 2.3.9 → 2.3.10

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/server/modules/order/index.d.ts

@@ -180,6 +180,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
      */
     private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

package/dist/server/modules/order/index.js

@@ -1607,7 +1607,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeOrdersToStore",
     value: (function () {
       var _mergeOrdersToStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(freshOrders, source) {
-        var storeOrderCountBefore, normalizedFreshOrders, _iterator9, _step9, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator10, _step10, key, _iterator11, _step11, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, mergedOrder, insertIndex, insertCount, updateCount;
+        var storeOrderCountBefore, normalizedFreshOrders, _iterator9, _step9, order, id, uniqueFreshOrders, uniqueFreshCount, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, identityKeys, _iterator10, _step10, key, _iterator11, _step11, fresh, freshIdentityKeys, matchIndex, storageKey, mergeKey, existingOrder, _ref2, _existingOrder$order_, _ref3, _external_sale_number, _existingOrder$paymen, _fresh$payment_status, _existingOrder$need_s, _fresh$need_sync, mergedOrder, insertIndex, insertCount, updateCount;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1680,7 +1680,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _iterator11.s();
             case 33:
               if ((_step11 = _iterator11.n()).done) {
-                _context16.next = 53;
+                _context16.next = 57;
                 break;
               }
               fresh = _step11.value;
@@ -1689,38 +1689,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               storageKey = this.getOrderStorageKey(fresh);
               mergeKey = storageKey || (fresh.order_id !== undefined && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : '');
               if (!(matchIndex >= 0)) {
-                _context16.next = 46;
+                _context16.next = 50;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+              existingOrder = updatedList[matchIndex];
+              if (!(this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source))) {
+                _context16.next = 44;
+                break;
+              }
+              this.logInfo('mergeOrdersToStore-跳过 pending 订单远端覆盖', {
+                source: source,
+                order_id: (_ref2 = (_existingOrder$order_ = existingOrder.order_id) !== null && _existingOrder$order_ !== void 0 ? _existingOrder$order_ : fresh.order_id) !== null && _ref2 !== void 0 ? _ref2 : null,
+                external_sale_number: (_ref3 = (_external_sale_number = existingOrder.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : fresh.external_sale_number) !== null && _ref3 !== void 0 ? _ref3 : null,
+                local_payment_status: (_existingOrder$paymen = existingOrder.payment_status) !== null && _existingOrder$paymen !== void 0 ? _existingOrder$paymen : null,
+                remote_payment_status: (_fresh$payment_status = fresh.payment_status) !== null && _fresh$payment_status !== void 0 ? _fresh$payment_status : null,
+                local_need_sync: (_existingOrder$need_s = existingOrder.need_sync) !== null && _existingOrder$need_s !== void 0 ? _existingOrder$need_s : null,
+                remote_need_sync: (_fresh$need_sync = fresh.need_sync) !== null && _fresh$need_sync !== void 0 ? _fresh$need_sync : null,
+                reason: 'protect_pending_sync_order_from_remote_echo'
+              });
+              return _context16.abrupt("continue", 55);
+            case 44:
+              mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
               updatedList[matchIndex] = mergedOrder;
               // 合并后身份字段可能新增（如挂单拿到 order_id），同步登记到索引，
               // 供同批后续 fresh 命中同一槽位，避免重复插入
               this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
               patchedOrders.push(mergedOrder);
               if (mergeKey) mergeActions[mergeKey] = 'update';
-              return _context16.abrupt("continue", 51);
-            case 46:
+              return _context16.abrupt("continue", 55);
+            case 50:
               insertIndex = updatedList.length;
               updatedList.push(fresh);
               this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
               patchedOrders.push(fresh);
               if (mergeKey) mergeActions[mergeKey] = 'insert';
-            case 51:
+            case 55:
               _context16.next = 33;
               break;
-            case 53:
-              _context16.next = 58;
+            case 57:
+              _context16.next = 62;
               break;
-            case 55:
-              _context16.prev = 55;
+            case 59:
+              _context16.prev = 59;
               _context16.t1 = _context16["catch"](31);
               _iterator11.e(_context16.t1);
-            case 58:
-              _context16.prev = 58;
+            case 62:
+              _context16.prev = 62;
               _iterator11.f();
-              return _context16.finish(58);
-            case 61:
+              return _context16.finish(62);
+            case 65:
               insertCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'insert';
               }).length;
@@ -1736,22 +1753,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 仅在自检开关开启时做一次兜底校验。
               this.store.list = this.runOrderStoreSelfCheck(updatedList, "".concat(source, ".store"));
               this.syncOrdersMap();
-              _context16.next = 68;
+              _context16.next = 72;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 68:
+            case 72:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context16.next = 71;
+              _context16.next = 75;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 71:
+            case 75:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[5, 17, 20, 23], [31, 55, 58, 61]]);
+        }, _callee16, this, [[5, 17, 20, 23], [31, 59, 62, 65]]);
       }));
       function mergeOrdersToStore(_x9, _x10) {
         return _mergeOrdersToStore.apply(this, arguments);
@@ -1786,6 +1803,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return matchIndex;
     }
+  }, {
+    key: "isRemoteEchoMergeSource",
+    value: function isRemoteEchoMergeSource(source) {
+      return source === 'pubsub.bodyUpsert' || source === 'pubsub.httpRefresh';
+    }
 
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
@@ -2166,22 +2188,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator20.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-          group = _ref3[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref4) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref4) {
         var _ref5 = _slicedToArray(_ref4, 2),
-          key = _ref5[0],
           group = _ref5[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          key = _ref7[0],
+          group = _ref7[1];
         return {
           key: key,
           count: group.length,
           orders: group.map(function (order) {
-            var _order$order_id2, _external_sale_number, _shop_order_number, _shop_full_order_numb, _order$need_sync;
+            var _order$order_id2, _external_sale_number2, _shop_order_number, _shop_full_order_numb, _order$need_sync;
             return {
               order_id: (_order$order_id2 = order.order_id) !== null && _order$order_id2 !== void 0 ? _order$order_id2 : null,
-              external_sale_number: (_external_sale_number = order.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : null,
+              external_sale_number: (_external_sale_number2 = order.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : null,
               shop_order_number: (_shop_order_number = order.shop_order_number) !== null && _shop_order_number !== void 0 ? _shop_order_number : null,
               shop_full_order_number: (_shop_full_order_numb = order.shop_full_order_number) !== null && _shop_full_order_numb !== void 0 ? _shop_full_order_numb : null,
               need_sync: (_order$need_sync = order.need_sync) !== null && _order$need_sync !== void 0 ? _order$need_sync : null

package/dist/solution/Sales/index.js

@@ -896,6 +896,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
               });
+              debugger;
               unpaidBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
@@ -940,7 +941,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 completedBookings: completedBookings,
                 unpaidBookings: unpaidBookings
               }));
-            case 28:
+            case 29:
             case "end":
               return _context6.stop();
           }

package/lib/server/modules/order/index.d.ts

@@ -180,6 +180,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
      */
     private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

package/lib/server/modules/order/index.js

@@ -985,7 +985,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const storageKey = this.getOrderStorageKey(fresh);
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
-        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], fresh);
+        const existingOrder = updatedList[matchIndex];
+        if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
+          this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
+            source,
+            order_id: existingOrder.order_id ?? fresh.order_id ?? null,
+            external_sale_number: existingOrder.external_sale_number ?? fresh.external_sale_number ?? null,
+            local_payment_status: existingOrder.payment_status ?? null,
+            remote_payment_status: fresh.payment_status ?? null,
+            local_need_sync: existingOrder.need_sync ?? null,
+            remote_need_sync: fresh.need_sync ?? null,
+            reason: "protect_pending_sync_order_from_remote_echo"
+          });
+          continue;
+        }
+        const mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
         updatedList[matchIndex] = mergedOrder;
         this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex);
         patchedOrders.push(mergedOrder);
@@ -1036,6 +1050,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return matchIndex;
   }
+  isRemoteEchoMergeSource(source) {
+    return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
+  }
   /**
    * 将订单的全部身份键登记到索引并指向其在列表中的下标。
    * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

package/lib/solution/Sales/index.js

@@ -631,6 +631,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
+    debugger;
     const unpaidBookingList = matchedBookingList.filter(
       (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
     );

package/package.json

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