@pisell/pisellos 2.2.219 → 2.2.220

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

@@ -1237,9 +1237,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }, {
         field: 'shop_order_number',
         value: record.shop_order_number
-      }, {
-        field: 'shop_full_order_number',
-        value: record.shop_full_order_number
       }];
       var entries = [];
       var _loop2 = function _loop2() {
@@ -1351,7 +1348,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
               pendingCount: _this12.pendingSyncMessages.length,
               throttleMs: throttleMs,
-              pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
+              pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
+              fullMessage: JSON.stringify(message)
             });
             _this12.scheduleOrderSyncThrottle();
           }
@@ -1874,9 +1872,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'summary', 'payments'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
+      var incomingRecord = incoming;
       for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
         var field = _fieldsToPreserve[_i3];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
@@ -1887,6 +1887,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
+      for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
+        var _field = _incomingPatchFields[_i4];
+        if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
+        if (incomingRecord[_field] === undefined || incomingRecord[_field] === null) continue;
+        if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
+        mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
+      }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }

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/modules/order/index.js

@@ -694,8 +694,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       { field: "order_id", value: order.order_id },
       { field: "external_sale_number", value: record.external_sale_number },
       { field: "order_number", value: record.order_number },
-      { field: "shop_order_number", value: record.shop_order_number },
-      { field: "shop_full_order_number", value: record.shop_full_order_number }
+      { field: "shop_order_number", value: record.shop_order_number }
     ];
     const entries = [];
     for (const candidate of candidates) {
@@ -787,7 +786,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             type: message.type ?? null,
             pendingCount: this.pendingSyncMessages.length,
             throttleMs,
-            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
+            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
+            fullMessage: JSON.stringify(message)
           });
           this.scheduleOrderSyncThrottle();
         }
@@ -1129,9 +1129,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "shop_order_number",
       "shop_full_order_number"
     ];
+    const incomingPatchFields = [
+      "payment_status",
+      "status",
+      "shipping_status",
+      "updated_at",
+      "summary",
+      "payments"
+    ];
     const mergedRecord = merged;
     const preferredRecord = preferred;
     const secondaryRecord = secondary;
+    const incomingRecord = incoming;
     for (const field of fieldsToPreserve) {
       if (!this.isBlankIdentityValue(preferredRecord[field])) {
         mergedRecord[field] = preferredRecord[field];
@@ -1141,6 +1150,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         mergedRecord[field] = secondaryRecord[field];
       }
     }
+    for (const field of incomingPatchFields) {
+      if (!Object.prototype.hasOwnProperty.call(incomingRecord, field))
+        continue;
+      if (incomingRecord[field] === void 0 || incomingRecord[field] === null)
+        continue;
+      if (typeof incomingRecord[field] === "string" && incomingRecord[field] === "")
+        continue;
+      mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
+    }
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

package/package.json

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