@pisell/pisellos 2.2.284 → 2.2.286

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

@@ -5468,7 +5468,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
         var _this32 = this,
           _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
+        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
         return _regeneratorRuntime().wrap(function _callee34$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
@@ -5521,6 +5521,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
+              enhancePayload = function enhancePayload(payload, ctx) {
+                var enhancedPayload = params.enhancePayload ? params.enhancePayload(payload, ctx) : payload;
+                return _objectSpread(_objectSpread({}, enhancedPayload), {}, {
+                  request_unique_idempotency_token: paymentSyncIdempotencyToken
+                });
+              };
               submitParams = {
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
@@ -5528,34 +5534,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 businessCode: params.businessCode,
                 channel: params.channel,
                 confirmPendingVoucherPayments: true,
-                enhancePayload: function enhancePayload(payload) {
-                  var nextPayload = _objectSpread(_objectSpread({}, payload), {}, {
-                    request_unique_idempotency_token: paymentSyncIdempotencyToken
-                  });
-                  return nextPayload;
-                }
+                enhancePayload: enhancePayload
               };
               if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context37.next = 34;
+                _context37.next = 35;
                 break;
               }
-              _context37.next = 31;
+              _context37.next = 32;
               return this.submitTempOrderAsync(submitParams);
-            case 31:
+            case 32:
               _context37.t1 = _context37.sent;
-              _context37.next = 37;
+              _context37.next = 38;
               break;
-            case 34:
-              _context37.next = 36;
+            case 35:
+              _context37.next = 37;
               return this.submitTempOrder(submitParams);
-            case 36:
-              _context37.t1 = _context37.sent;
             case 37:
+              _context37.t1 = _context37.sent;
+            case 38:
               submitResult = _context37.t1;
               return _context37.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 39:
+            case 40:
             case "end":
               return _context37.stop();
           }

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

@@ -157,11 +157,13 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
+    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
@@ -606,6 +608,7 @@ export interface SyncPaymentsToOrderParams {
     businessCode?: string;
     channel?: string;
     confirmPendingVoucherPayments?: boolean;
+    enhancePayload?: SubmitPayloadEnhancer;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;

package/dist/modules/Order/types.js

@@ -60,6 +60,7 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 

package/dist/modules/ProductList/index.js

@@ -131,8 +131,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProducts",
     value: function () {
-      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$otherParams;
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this$otherParams,
+          _this2 = this;
         var _ref,
           _ref$category_ids,
           category_ids,
@@ -161,14 +162,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           rawApplicationCode,
           mappedApplicationCode,
           queryPayload,
+          originalCallback,
+          subscriptionCallback,
           productsData,
           sortedList,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
-              options = _args4.length > 1 ? _args4[1] : undefined;
+              _ref = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule, extension_type = _ref.extension_type, _ref$status = _ref.status, status = _ref$status === void 0 ? 'published' : _ref$status, strategy_context = _ref.strategy_context;
+              options = _args5.length > 1 ? _args5[1] : undefined;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -228,15 +231,38 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 extension_type: extension_type,
                 strategy_context: strategy_context
               });
-              _context4.next = 11;
+              originalCallback = options === null || options === void 0 ? void 0 : options.callback;
+              subscriptionCallback = originalCallback ? ( /*#__PURE__*/function () {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
+                  var _result$data;
+                  var products;
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        products = Array.isArray(result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.list) ? result.data.list : [];
+                        _context4.next = 3;
+                        return _this2.addProduct(products);
+                      case 3:
+                        originalCallback(result);
+                      case 4:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4);
+                }));
+                return function (_x5) {
+                  return _ref2.apply(this, arguments);
+                };
+              }()) : undefined;
+              _context5.next = 13;
               return this.request.post("/product/query", queryPayload, {
                 osServer: true,
-                callback: options === null || options === void 0 ? void 0 : options.callback,
+                callback: subscriptionCallback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 11:
-              productsData = _context4.sent;
+            case 13:
+              productsData = _context5.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               }); // if (sortedList.length) {
@@ -247,12 +273,12 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               //   })
               // }
               this.addProduct(sortedList);
-              return _context4.abrupt("return", sortedList);
-            case 15:
+              return _context5.abrupt("return", sortedList);
+            case 17:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function loadProducts() {
         return _loadProducts.apply(this, arguments);
@@ -262,13 +288,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductsPrice",
     value: function () {
-      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref2) {
-        var _ref2$ids, ids, customer_id, schedule_date, channel, productsData;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref3) {
+        var _ref3$ids, ids, customer_id, schedule_date, channel, productsData;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _ref2$ids = _ref2.ids, ids = _ref2$ids === void 0 ? [] : _ref2$ids, customer_id = _ref2.customer_id, schedule_date = _ref2.schedule_date, channel = _ref2.channel;
-              _context5.next = 3;
+              _ref3$ids = _ref3.ids, ids = _ref3$ids === void 0 ? [] : _ref3$ids, customer_id = _ref3.customer_id, schedule_date = _ref3.schedule_date, channel = _ref3.channel;
+              _context6.next = 3;
               return this.request.post("/product/query/price", {
                 ids: ids,
                 customer_id: customer_id,
@@ -278,15 +304,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true
               });
             case 3:
-              productsData = _context5.sent;
-              return _context5.abrupt("return", productsData.data);
+              productsData = _context6.sent;
+              return _context6.abrupt("return", productsData.data);
             case 5:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function loadProductsPrice(_x5) {
+      function loadProductsPrice(_x6) {
         return _loadProductsPrice.apply(this, arguments);
       }
       return loadProductsPrice;
@@ -294,19 +320,19 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProducts"), this.store.list);
             case 2:
-              return _context6.abrupt("return", cloneDeep(this.store.list));
+              return _context7.abrupt("return", cloneDeep(this.store.list));
             case 3:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -316,25 +342,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProduct",
     value: function () {
-      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
+      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _context8.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProduct"), this.store.list);
             case 2:
               product = this.store.list.find(function (product) {
                 return product.id === id;
               });
-              return _context7.abrupt("return", product ? cloneDeep(product) : undefined);
+              return _context8.abrupt("return", product ? cloneDeep(product) : undefined);
             case 4:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function getProduct(_x6) {
+      function getProduct(_x7) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -342,25 +368,25 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductByIds",
     value: function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(ids) {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ids) {
         var products;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.next = 2;
+              _context9.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onGetProductByIds"), this.store.list);
             case 2:
               products = this.store.list.filter(function (product) {
                 return ids.includes(product.id);
               });
-              return _context8.abrupt("return", products);
+              return _context9.abrupt("return", products);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function getProductByIds(_x7) {
+      function getProductByIds(_x8) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -368,23 +394,23 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(products) {
-        var _this2 = this;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
+        var _this3 = this;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               // list 需要根据 id 去重
               if (!this.store.list) {
                 this.store.list = [];
               }
               products.forEach(function (n) {
-                var index = _this2.store.list.findIndex(function (m) {
+                var index = _this3.store.list.findIndex(function (m) {
                   return m.id === n.id;
                 });
                 if (index === -1) {
-                  _this2.store.list.push(n);
+                  _this3.store.list.push(n);
                 } else {
-                  _this2.store.list[index] = n;
+                  _this3.store.list[index] = n;
                 }
               });
               // 根据 sort 值做降序排序（数字越大越靠前）
@@ -394,11 +420,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
             case 4:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
-      function addProduct(_x8) {
+      function addProduct(_x9) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -406,18 +432,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(products) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function selectProducts(_x9) {
+      function selectProducts(_x10) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

package/dist/modules/Summary/utils.d.ts

@@ -72,7 +72,7 @@ export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/dist/server/index.d.ts

@@ -505,6 +505,10 @@ declare class Server {
     private buildCheckoutTaskIdempotencyKey;
     private isBlankCheckoutValue;
     private isLocalCheckoutOrderId;
+    private applyCheckoutFulfillmentBuzzer;
+    private buildCheckoutResourceIdentifierBuzzer;
+    private getCheckoutResourceIdentifier;
+    private stringifyCheckoutResourceIdentifier;
     private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
     private dispatchCheckoutSyncTask;