@pisell/pisellos 2.2.229 → 2.2.230

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

@@ -372,6 +372,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private markLocalOrderSynced;
+    private applyRemoteOrderNumbersToTempOrder;
     private isSubmitResponseRejected;
     private isLocalPendingSubmitResult;
     private isSubmitErrorResponse;

package/dist/modules/Order/index.js

@@ -3740,7 +3740,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var enhancedPayload = params !== null && params !== void 0 && params.enhancePayload ? params.enhancePayload(nextPayload, ctx) : nextPayload;
                 return enhancedPayload;
               } : undefined;
-              debugger;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
@@ -3754,10 +3753,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context26.next = 21;
+              _context26.next = 20;
               return this.saveDraft();
-            case 21:
-              _context26.prev = 21;
+            case 20:
+              _context26.prev = 20;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -3766,26 +3765,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context26.next = 25;
+              _context26.next = 24;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 25:
+            case 24:
               result = _context26.sent;
-              _context26.next = 38;
+              _context26.next = 37;
               break;
-            case 28:
-              _context26.prev = 28;
-              _context26.t2 = _context26["catch"](21);
+            case 27:
+              _context26.prev = 27;
+              _context26.t2 = _context26["catch"](20);
               backendErrorResponse = this.extractSubmitErrorResponse(_context26.t2);
               if (!backendErrorResponse) {
-                _context26.next = 35;
+                _context26.next = 34;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context26.abrupt("return", backendErrorResponse);
-            case 35:
+            case 34:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context26.t2 instanceof Error ? _context26.t2.message : String(_context26.t2),
@@ -3795,40 +3794,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context26.t2;
-            case 38:
+            case 37:
               if (!this.isSubmitResponseRejected(result)) {
-                _context26.next = 42;
+                _context26.next = 41;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context26.abrupt("return", result);
-            case 42:
+            case 41:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context26.next = 50;
+                _context26.next = 49;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context26.next = 48;
+              _context26.next = 47;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 48:
-              _context26.next = 51;
+            case 47:
+              _context26.next = 50;
               break;
-            case 50:
+            case 49:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 51:
+            case 50:
               return _context26.abrupt("return", result);
-            case 52:
+            case 51:
             case "end":
               return _context26.stop();
           }
-        }, _callee24, this, [[21, 28]]);
+        }, _callee24, this, [[20, 27]]);
       }));
       function submitTempOrder(_x26) {
         return _submitTempOrder.apply(this, arguments);
@@ -3845,12 +3844,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
+              this.applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder);
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context27.next = 7;
+              _context27.next = 8;
               return this.saveDraft();
-            case 7:
+            case 8:
             case "end":
               return _context27.stop();
           }
@@ -3861,6 +3861,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return markLocalOrderSynced;
     }()
+  }, {
+    key: "applyRemoteOrderNumbersToTempOrder",
+    value: function applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder) {
+      var applyOrderNumber = function applyOrderNumber(key) {
+        var value = remoteOrder === null || remoteOrder === void 0 ? void 0 : remoteOrder[key];
+        if (value !== undefined && value !== null && value !== '') {
+          tempOrder[key] = String(value);
+        }
+      };
+      applyOrderNumber('order_number');
+      applyOrderNumber('shop_order_number');
+      applyOrderNumber('shop_full_order_number');
+    }
   }, {
     key: "isSubmitResponseRejected",
     value: function isSubmitResponseRejected(response) {

package/dist/server/index.js

@@ -3785,7 +3785,7 @@ var Server = /*#__PURE__*/function () {
     key: "normalizeCheckoutSubmitData",
     value: function () {
       var _normalizeCheckoutSubmitData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(data, title) {
-        var next, externalSaleNumber, shouldClearLocalOrderId, localOrder;
+        var next, externalSaleNumber, shouldClearLocalOrderId, hasCheckoutOrderNumbers, localOrder;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
@@ -3799,8 +3799,22 @@ var Server = /*#__PURE__*/function () {
               externalSaleNumber = next.external_sale_number;
               shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
               if (shouldClearLocalOrderId) next.order_id = null;
+              hasCheckoutOrderNumbers = !this.isBlankCheckoutValue(next.shop_order_number) && !this.isBlankCheckoutValue(next.shop_full_order_number);
+              if (!hasCheckoutOrderNumbers) {
+                _context40.next = 10;
+                break;
+              }
+              this.logInfo("".concat(title, ": checkout \u5DF2\u643A\u5E26\u8BA2\u5355\u53F7\uFF0C\u8DF3\u8FC7\u67E5\u91CD"), {
+                original_order_id: data.order_id,
+                order_id: next.order_id,
+                external_sale_number: externalSaleNumber,
+                shop_order_number: next.shop_order_number,
+                shop_full_order_number: next.shop_full_order_number
+              });
+              return _context40.abrupt("return", next);
+            case 10:
               if (!this.isBlankCheckoutValue(externalSaleNumber)) {
-                _context40.next = 9;
+                _context40.next = 13;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3810,9 +3824,9 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context40.abrupt("return", next);
-            case 9:
+            case 13:
               if (!(!this.order || typeof this.order.getLocalOrderFromMemoryByLookup !== 'function')) {
-                _context40.next = 12;
+                _context40.next = 16;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3822,11 +3836,11 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context40.abrupt("return", next);
-            case 12:
-              _context40.prev = 12;
+            case 16:
+              _context40.prev = 16;
               localOrder = this.order.getLocalOrderFromMemoryByLookup(externalSaleNumber);
               if (localOrder) {
-                _context40.next = 17;
+                _context40.next = 21;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3837,7 +3851,7 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context40.abrupt("return", next);
-            case 17:
+            case 21:
               if (this.isBlankCheckoutValue(next.shop_order_number)) {
                 next.shop_order_number = localOrder.shop_order_number;
               }
@@ -3853,20 +3867,20 @@ var Server = /*#__PURE__*/function () {
                 shop_full_order_number: next.shop_full_order_number
               });
               return _context40.abrupt("return", next);
-            case 23:
-              _context40.prev = 23;
-              _context40.t0 = _context40["catch"](12);
+            case 27:
+              _context40.prev = 27;
+              _context40.t0 = _context40["catch"](16);
               this.logWarning("".concat(title, ": checkout \u67E5\u627E\u672C\u5730\u8BA2\u5355\u5931\u8D25"), {
                 external_sale_number: externalSaleNumber,
                 error: this.getUnknownErrorMessage(_context40.t0),
                 error_detail: this.normalizeUnknownError(_context40.t0)
               });
               return _context40.abrupt("return", next);
-            case 27:
+            case 31:
             case "end":
               return _context40.stop();
           }
-        }, _callee40, this, [[12, 23]]);
+        }, _callee40, this, [[16, 27]]);
       }));
       function normalizeCheckoutSubmitData(_x42, _x43) {
         return _normalizeCheckoutSubmitData.apply(this, arguments);

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

@@ -0,0 +1,49 @@
+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/modules/Order/index.d.ts

@@ -372,6 +372,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private markLocalOrderSynced;
+    private applyRemoteOrderNumbersToTempOrder;
     private isSubmitResponseRejected;
     private isLocalPendingSubmitResult;
     private isSubmitErrorResponse;

package/lib/modules/Order/index.js

@@ -2761,7 +2761,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
       return enhancedPayload;
     } : void 0;
-    debugger;
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
       cacheId: effectiveCacheId,
@@ -2829,11 +2828,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async markLocalOrderSynced(orderId, remoteOrder) {
     const tempOrder = this.ensureTempOrder();
     tempOrder.order_id = orderId;
+    this.applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder);
     this.store.lastOrderInfo = remoteOrder;
     this.store.syncState = "submitted";
     this.persistTempOrder();
     await this.saveDraft();
   }
+  applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder) {
+    const applyOrderNumber = (key) => {
+      const value = remoteOrder == null ? void 0 : remoteOrder[key];
+      if (value !== void 0 && value !== null && value !== "") {
+        tempOrder[key] = String(value);
+      }
+    };
+    applyOrderNumber("order_number");
+    applyOrderNumber("shop_order_number");
+    applyOrderNumber("shop_full_order_number");
+  }
   isSubmitResponseRejected(response) {
     const isErrorCode = (response == null ? void 0 : response.code) !== void 0 && response.code !== 200 && response.code !== "200";
     const isErrorStatus = (response == null ? void 0 : response.status) === false || typeof (response == null ? void 0 : response.status) === "number" && response.status >= 400;

package/lib/server/index.js

@@ -2373,6 +2373,17 @@ var Server = class {
     const shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
     if (shouldClearLocalOrderId)
       next.order_id = null;
+    const hasCheckoutOrderNumbers = !this.isBlankCheckoutValue(next.shop_order_number) && !this.isBlankCheckoutValue(next.shop_full_order_number);
+    if (hasCheckoutOrderNumbers) {
+      this.logInfo(`${title}: checkout 已携带订单号，跳过查重`, {
+        original_order_id: data.order_id,
+        order_id: next.order_id,
+        external_sale_number: externalSaleNumber,
+        shop_order_number: next.shop_order_number,
+        shop_full_order_number: next.shop_full_order_number
+      });
+      return next;
+    }
     if (this.isBlankCheckoutValue(externalSaleNumber)) {
       if (shouldClearLocalOrderId) {
         this.logInfo(`${title}: checkout 本地订单号已清理`, {

package/package.json

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