@pisell/pisellos 2.3.98 → 2.3.99

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/solution/BaseSales/index.js

@@ -2410,7 +2410,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "restoreOrder",
     value: function () {
       var _restoreOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this$store$payment, tempOrder, wallet;
+        var _this$store$payment, tempOrder, appDataChanged, wallet;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -2422,43 +2422,44 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('scanOrder 解决方案需要 order 模块支持');
             case 3:
               // this.store.resource = null;
-              tempOrder = this.store.order.restoreOrder();
+              tempOrder = this.store.order.restoreOrder(); // 先补齐店铺级订单字段，再通知监听方，避免发布带空税区/币种的中间快照。
+              appDataChanged = this.syncAppDataToTempOrder(tempOrder);
               this.currentSalesDetail = null;
               this.discountConfigCacheKey = null;
               this.hasManualDiscountSelection = false;
               wallet = (_this$store$payment = this.store.payment) === null || _this$store$payment === void 0 ? void 0 : _this$store$payment.wallet;
               if (!wallet) {
-                _context21.next = 13;
+                _context21.next = 14;
                 break;
               }
               this.walletAssetsRefreshSequence += 1;
               wallet.clearAllCache();
-              _context21.next = 13;
+              _context21.next = 14;
               return this.publishWalletAssetsState(wallet.getWalletAssetsState());
-            case 13:
-              _context21.next = 15;
+            case 14:
+              _context21.next = 16;
               return this.effectsEmit('onTempOrderReplaced', {
                 tempOrder: tempOrder
               });
-            case 15:
-              if (!(this.syncAppDataToTempOrder(tempOrder) && this.isTempOrderPersistEnabled())) {
-                _context21.next = 19;
+            case 16:
+              if (!(appDataChanged && this.isTempOrderPersistEnabled())) {
+                _context21.next = 20;
                 break;
               }
               this.store.order.persistTempOrder();
-              _context21.next = 19;
+              _context21.next = 20;
               return this.store.order.saveDraft();
-            case 19:
+            case 20:
               return _context21.abrupt("return", tempOrder);
-            case 22:
-              _context21.prev = 22;
+            case 23:
+              _context21.prev = 23;
               _context21.t0 = _context21["catch"](0);
               throw _context21.t0;
-            case 25:
+            case 26:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[0, 22]]);
+        }, _callee21, this, [[0, 23]]);
       }));
       function restoreOrder() {
         return _restoreOrder.apply(this, arguments);

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

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/solution/BaseSales/index.js

@@ -1600,6 +1600,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       }
       // this.store.resource = null;
       const tempOrder = this.store.order.restoreOrder();
+      // 先补齐店铺级订单字段，再通知监听方，避免发布带空税区/币种的中间快照。
+      const appDataChanged = this.syncAppDataToTempOrder(tempOrder);
       this.currentSalesDetail = null;
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
@@ -1612,7 +1614,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       await this.effectsEmit('onTempOrderReplaced', {
         tempOrder
       });
-      if (this.syncAppDataToTempOrder(tempOrder) && this.isTempOrderPersistEnabled()) {
+      if (appDataChanged && this.isTempOrderPersistEnabled()) {
         this.store.order.persistTempOrder();
         await this.store.order.saveDraft();
       }

package/package.json

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