@pisell/pisellos 2.3.63 → 2.3.65

package/dist/core/index.js

@@ -45,7 +45,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('constructor1234');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

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/model/strategy/adapter/walletPass/evaluator.js

@@ -505,7 +505,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -189,8 +189,6 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
  * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
  */
 export function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, 'products123');
-
   // 拆分商品数据，同时维护含税和不含税两个金额池
   // remainingAmountWithTax: 含税费的剩余可抵扣金额
   // remainingAmountPure: 纯商品金额（不含税费）的剩余可抵扣金额

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -192,7 +192,7 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -210,12 +210,14 @@ export function buildCacheItemFromOrderLine(input) {
   var productTitle = resolveProductTitle(product, booking, sourceProduct);
   var productCover = resolveProductCover(product, booking, sourceProduct);
   var productOptionString = buildProductOptionStringFromOrderLine(product);
+  var hasBundle = Array.isArray(product.product_bundle) && product.product_bundle.length > 0;
+  var bundleEdit = (_product$bundle_edit = product.bundle_edit) !== null && _product$bundle_edit !== void 0 ? _product$bundle_edit : hasBundle ? 0 : undefined;
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
     option: getProductSkuOptions(product),
     bundle: mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [])
   };
-  var extend = _objectSpread({
+  var extend = _objectSpread(_objectSpread({
     start_date: startDate ? dayjs(startDate) : undefined,
     end_date: endDate ? dayjs(endDate) : undefined,
     startDate: startDate ? dayjs(startDate) : undefined,
@@ -237,7 +239,9 @@ export function buildCacheItemFromOrderLine(input) {
     other: other,
     like_status: booking.like_status || 'common',
     discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_reason) || undefined
-  }, productOptionString ? {
+  }, bundleEdit !== undefined ? {
+    bundle_edit: bundleEdit
+  } : {}), productOptionString ? {
     product_option_string: productOptionString
   } : {});
   var manualDiscount = (product.discount_list || []).find(function (d) {

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

@@ -44,6 +44,10 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
      */
     queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
+    /**
+     * 查询单个客户详情，不写入 customerList / pagination 状态。
+     */
+    queryCustomerDetail(id: string | number): Promise<ShopCustomer | null>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/dist/modules/Customer/index.js

@@ -1,12 +1,12 @@
 var _excluded = ["skip", "num", "search"],
   _excluded2 = ["skip", "num"];
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -322,6 +322,38 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
       }
       return queryCustomerList;
     }()
+    /**
+     * 查询单个客户详情，不写入 customerList / pagination 状态。
+     */
+    )
+  }, {
+    key: "queryCustomerDetail",
+    value: (function () {
+      var _queryCustomerDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
+        var _result$data;
+        var result, customer;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return this.request.get("/customer/info/".concat(id), {
+                with_trashed: 1
+              });
+            case 2:
+              result = _context5.sent;
+              customer = (result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.customer) || (result === null || result === void 0 ? void 0 : result.data) || (result === null || result === void 0 ? void 0 : result.customer) || null;
+              return _context5.abrupt("return", customer && _typeof(customer) === 'object' ? customer : null);
+            case 5:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function queryCustomerDetail(_x5) {
+        return _queryCustomerDetail.apply(this, arguments);
+      }
+      return queryCustomerDetail;
+    }()
     /**
      * 获取客户列表
      * @param params 查询参数
@@ -331,7 +363,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCustomerList",
     value: (function () {
-      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _getCustomerList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         var params,
           _yield$this$fetchCust2,
           customerList,
@@ -342,18 +374,18 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
           num,
           searchParams,
           response,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args6 = arguments;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              params = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
-              _context5.prev = 1;
+              params = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+              _context6.prev = 1;
               this.store.loading = true;
               this.store.error = null;
-              _context5.next = 6;
+              _context6.next = 6;
               return this.fetchCustomerListData(params);
             case 6:
-              _yield$this$fetchCust2 = _context5.sent;
+              _yield$this$fetchCust2 = _context6.sent;
               customerList = _yield$this$fetchCust2.customerList;
               total = _yield$this$fetchCust2.total;
               page = _yield$this$fetchCust2.page;
@@ -386,27 +418,27 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 page: page,
                 pageSize: pageSize
               };
-              return _context5.abrupt("return", response);
+              return _context6.abrupt("return", response);
             case 23:
-              _context5.prev = 23;
-              _context5.t0 = _context5["catch"](1);
-              _context5.next = 27;
-              return this.handleCustomerListError(_context5.t0, 'fetch customer list');
+              _context6.prev = 23;
+              _context6.t0 = _context6["catch"](1);
+              _context6.next = 27;
+              return this.handleCustomerListError(_context6.t0, 'fetch customer list');
             case 27:
-              throw _context5.t0;
+              throw _context6.t0;
             case 28:
-              _context5.prev = 28;
+              _context6.prev = 28;
               this.store.loading = false;
               this.storeChange();
-              _context5.next = 33;
+              _context6.next = 33;
               return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
             case 33:
-              return _context5.finish(28);
+              return _context6.finish(28);
             case 34:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this, [[1, 23, 28, 34]]);
+        }, _callee6, this, [[1, 23, 28, 34]]);
       }));
       function getCustomerList() {
         return _getCustomerList.apply(this, arguments);
@@ -583,10 +615,10 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeCustomerPage",
     value: (function () {
-      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(page, pageSize) {
+      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(page, pageSize) {
         var targetPageSize, skip, num;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               targetPageSize = pageSize || this.store.pageSize; // 先更新分页状态
               this.setPaginationInfo(page, targetPageSize);
@@ -594,20 +626,20 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               // skip直接使用page，num使用pageSize
               skip = page;
               num = targetPageSize; // 自动调用获取客户列表，使用存储的搜索条件
-              _context6.next = 6;
+              _context7.next = 6;
               return this.getCustomerList(_objectSpread({
                 skip: skip,
                 num: num
               }, this.store.searchParams));
             case 6:
-              return _context6.abrupt("return", _context6.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 7:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function changeCustomerPage(_x5, _x6) {
+      function changeCustomerPage(_x6, _x7) {
         return _changeCustomerPage.apply(this, arguments);
       }
       return changeCustomerPage;
@@ -620,16 +652,16 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadMoreCustomers",
     value: (function () {
-      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var nextPage, loadMoreParams, _yield$this$fetchCust3, newCustomers, total, page, pageSize, updatedCustomerList, response;
-        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:
               if (!(!this.store.hasMore || this.store.loadingMore)) {
-                _context7.next = 2;
+                _context8.next = 2;
                 break;
               }
-              return _context7.abrupt("return", {
+              return _context8.abrupt("return", {
                 list: [],
                 total: this.store.total,
                 page: this.store.currentPage,
@@ -638,17 +670,17 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               // 计算下一页
               nextPage = this.store.currentPage + 1;
-              _context7.prev = 3;
+              _context8.prev = 3;
               this.store.loadingMore = true;
               this.store.error = null;
               loadMoreParams = _objectSpread({
                 skip: nextPage,
                 num: this.store.pageSize
               }, this.store.searchParams); // 使用公共方法获取数据，传入存储的搜索条件
-              _context7.next = 9;
+              _context8.next = 9;
               return this.fetchCustomerListData(loadMoreParams);
             case 9:
-              _yield$this$fetchCust3 = _context7.sent;
+              _yield$this$fetchCust3 = _context8.sent;
               newCustomers = _yield$this$fetchCust3.customerList;
               total = _yield$this$fetchCust3.total;
               page = _yield$this$fetchCust3.page;
@@ -661,7 +693,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               this.store.hasMore = page * pageSize < total;
 
               // 触发滚动加载特定事件
-              _context7.next = 21;
+              _context8.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onScrollLoadMore"), {
                 newCustomers: newCustomers,
                 allCustomers: this.store.customerList,
@@ -683,27 +715,27 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 page: page,
                 pageSize: pageSize
               };
-              return _context7.abrupt("return", response);
+              return _context8.abrupt("return", response);
             case 26:
-              _context7.prev = 26;
-              _context7.t0 = _context7["catch"](3);
-              _context7.next = 30;
-              return this.handleCustomerListError(_context7.t0, 'load more customers');
+              _context8.prev = 26;
+              _context8.t0 = _context8["catch"](3);
+              _context8.next = 30;
+              return this.handleCustomerListError(_context8.t0, 'load more customers');
             case 30:
-              throw _context7.t0;
+              throw _context8.t0;
             case 31:
-              _context7.prev = 31;
+              _context8.prev = 31;
               this.store.loadingMore = false;
               this.storeChange();
-              _context7.next = 36;
+              _context8.next = 36;
               return this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), this.store);
             case 36:
-              return _context7.finish(31);
+              return _context8.finish(31);
             case 37:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this, [[3, 26, 31, 37]]);
+        }, _callee8, this, [[3, 26, 31, 37]]);
       }));
       function loadMoreCustomers() {
         return _loadMoreCustomers.apply(this, arguments);
@@ -719,15 +751,15 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetAndLoadCustomers",
     value: (function () {
-      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var params,
           resetParams,
           response,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+          _args9 = arguments;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              params = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
+              params = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
               // 重置状态
               this.store.customerList = [];
               this.store.currentPage = 1;
@@ -739,23 +771,23 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: 1,
                 num: params.num || this.store.pageSize
               }); // 调用普通的获取列表方法
-              _context8.next = 8;
+              _context9.next = 8;
               return this.getCustomerList(resetParams);
             case 8:
-              response = _context8.sent;
-              _context8.next = 11;
+              response = _context9.sent;
+              _context9.next = 11;
               return this.core.effects.emit("".concat(this.name, ":onScrollLoadComplete"), {
                 customers: this.store.customerList,
                 total: this.store.total,
                 hasMore: this.store.hasMore
               });
             case 11:
-              return _context8.abrupt("return", response);
+              return _context9.abrupt("return", response);
             case 12:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
       function resetAndLoadCustomers() {
         return _resetAndLoadCustomers.apply(this, arguments);

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

@@ -112,6 +112,8 @@ export interface CustomerModuleAPI {
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 查询客户列表但不更新列表分页状态 */
     queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询单个客户详情但不修改客户列表状态 */
+    queryCustomerDetail: (id: string | number) => Promise<ShopCustomer | null>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/dist/modules/Order/index.js

@@ -6358,7 +6358,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       delete row["product_".concat('option', "_item")];
       if (!Array.isArray(row.product_bundle)) row.product_bundle = [];
-      if (!row.metadata || _typeof(row.metadata) !== 'object') row.metadata = {};
+      row.metadata = row.metadata && _typeof(row.metadata) === 'object' ? _objectSpread({}, row.metadata) : {};
+      // bundle_edit 只描述当前编辑会话中的套餐修改状态，不能从本地缓存或详情响应带入新会话。
+      delete row.bundle_edit;
+      delete row.metadata.bundle_edit;
       if (row.booking_uid && !row.metadata.booking_uid) {
         row.metadata.booking_uid = row.booking_uid;
       }

package/dist/modules/Order/utils.js

@@ -910,7 +910,7 @@ function formatSubmitBundleItems(bundle) {
  * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
  */
 function normalizeSubmitProduct(product) {
-  var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
+  var _ref29, _submitProduct$bundle, _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
   var _ref28 = product,
     _runtimeUid = _ref28.unique_identification_number,
     submitProduct = _objectWithoutProperties(_ref28, _excluded2);
@@ -925,6 +925,10 @@ function normalizeSubmitProduct(product) {
   delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
+  // 兼容历史 BigSale 编辑链路：bundle_edit 曾被写入 metadata，
+  // 出站时需提升到商品顶层；套餐未编辑时也必须显式提交 0。
+  var hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
+  var bundleEdit = (_ref29 = (_submitProduct$bundle = submitProduct.bundle_edit) !== null && _submitProduct$bundle !== void 0 ? _submitProduct$bundle : rawMetadata.bundle_edit) !== null && _ref29 !== void 0 ? _ref29 : hasProductBundle ? 0 : undefined;
   var cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
@@ -949,8 +953,10 @@ function normalizeSubmitProduct(product) {
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
     option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
-  return _objectSpread(_objectSpread(_objectSpread({}, productRest), bookingUid ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, productRest), bookingUid ? {
     booking_uid: bookingUid
+  } : {}), bundleEdit !== undefined ? {
+    bundle_edit: bundleEdit
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
@@ -1080,7 +1086,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref30, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
+  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref31, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -1093,26 +1099,26 @@ export function buildSubmitPayload(params) {
     enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
-  var _ref29 = tempOrder,
-    _extend = _ref29._extend,
-    _relationId = _ref29.relation_id,
-    _tableFormId = _ref29.table_form_id,
-    _resourceId = _ref29.resource_id,
-    _summary = _ref29.summary,
-    _lastOrderInfo = _ref29.lastOrderInfo,
-    _paidAmount = _ref29.paid_amount,
-    _shopId = _ref29.shop_id,
-    _shopNote = _ref29.shop_note,
-    _shopServiceType = _ref29.shop_service_type,
-    _startTime = _ref29.start_time,
-    _customer = _ref29.customer,
-    _discountList = _ref29.discount_list,
-    _rootTaxFee = _ref29.tax_fee,
-    _totalAmount = _ref29.total_amount,
-    _totalRefundAmount = _ref29.total_refund_amount,
-    _createDate = _ref29.create_date,
-    _holderId = _ref29.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref29, _excluded4);
+  var _ref30 = tempOrder,
+    _extend = _ref30._extend,
+    _relationId = _ref30.relation_id,
+    _tableFormId = _ref30.table_form_id,
+    _resourceId = _ref30.resource_id,
+    _summary = _ref30.summary,
+    _lastOrderInfo = _ref30.lastOrderInfo,
+    _paidAmount = _ref30.paid_amount,
+    _shopId = _ref30.shop_id,
+    _shopNote = _ref30.shop_note,
+    _shopServiceType = _ref30.shop_service_type,
+    _startTime = _ref30.start_time,
+    _customer = _ref30.customer,
+    _discountList = _ref30.discount_list,
+    _rootTaxFee = _ref30.tax_fee,
+    _totalAmount = _ref30.total_amount,
+    _totalRefundAmount = _ref30.total_refund_amount,
+    _createDate = _ref30.create_date,
+    _holderId = _ref30.holder_id,
+    tempOrderRest = _objectWithoutProperties(_ref30, _excluded4);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
     var _tempOrder$bookings;
@@ -1137,7 +1143,7 @@ export function buildSubmitPayload(params) {
     type: submitType,
     business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref30 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref30 !== void 0 ? _ref30 : 'online_store',
+    order_sales_channel: (_ref31 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref31 !== void 0 ? _ref31 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -1163,10 +1169,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     summary: summary || tempOrder.summary || createEmptySummary(),
     metadata: function () {
-      var _ref31 = tempOrder.metadata || {},
-        _collectPax = _ref31.collect_pax,
-        _tableOccupancyDuration = _ref31.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref31, _excluded5);
+      var _ref32 = tempOrder.metadata || {},
+        _collectPax = _ref32.collect_pax,
+        _tableOccupancyDuration = _ref32.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref32, _excluded5);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -1374,8 +1380,8 @@ export function getRuntimeProductOrigin(tempOrder, product) {
     return tempOrder._extend.productsByUid[uid].origin;
   }
   var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
-    var _ref32, _item$product_id, _ref33, _product$product_id;
-    return item === product || getOrderProductLineUid(item) === uid || String((_ref32 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref32 !== void 0 ? _ref32 : '') === String((_ref33 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref33 !== void 0 ? _ref33 : '');
+    var _ref33, _item$product_id, _ref34, _product$product_id;
+    return item === product || getOrderProductLineUid(item) === uid || String((_ref33 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref33 !== void 0 ? _ref33 : '') === String((_ref34 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref34 !== void 0 ? _ref34 : '');
   });
   var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
   return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[matchedUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin) || null : null;

package/dist/modules/Payment/walletpass.js

@@ -620,7 +620,6 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 vouchers: allList
               });
               recommended = res.recommended, transformList = res.transformList, noApplicableVoucher = res.noApplicableVoucher, recommendedAmount = res.recommendedAmount;
-              console.log(res, 'resres12');
               this.walletRecommendList = recommended;
 
               // 存储初始化数据到内存中，供 useWalletPass 使用
@@ -640,19 +639,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 noApplicableVoucher: noApplicableVoucher,
                 products: products || []
               });
-            case 20:
-              _context3.prev = 20;
+            case 19:
+              _context3.prev = 19;
               _context3.t0 = _context3["catch"](0);
               this.paymentModule.logError('[WalletPass] 初始化钱包数据失败', _context3.t0, {
                 customer_id: baseParams.customer_id,
                 order_expect_amount: baseParams.order_expect_amount
               });
               throw _context3.t0;
-            case 24:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 20]]);
+        }, _callee3, this, [[0, 19]]);
       }));
       function initializeWalletDataAsync(_x3) {
         return _initializeWalletDataAsync.apply(this, arguments);

package/dist/server/index.js

@@ -1243,7 +1243,8 @@ var Server = /*#__PURE__*/function () {
                 checkoutData: checkoutData,
                 order: printableOrder,
                 response: null,
-                requireFullyPaid: false
+                requireFullyPaid: false,
+                isManualPrint: true
               });
             case 27:
               printResult = _context19.sent;
@@ -6040,9 +6041,8 @@ var Server = /*#__PURE__*/function () {
                 checkoutData: syncResult.checkoutData,
                 order: syncedOrder,
                 response: syncResult.normalizedResponse,
-                requireFullyPaid: true,
+                requireFullyPaid: true
                 // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-                isManualPrint: true
               });
             case 16:
               return _context61.abrupt("return", response);
@@ -6317,7 +6317,7 @@ var Server = /*#__PURE__*/function () {
     value: function shouldAutoPrintCheckoutReceipt() {
       var _this$core$context2, _this$core$context2$g, _this$app17, _this$app17$getStorag;
       if (((_this$core$context2 = this.core.context) === null || _this$core$context2 === void 0 || (_this$core$context2$g = _this$core$context2.getPlatform) === null || _this$core$context2$g === void 0 ? void 0 : _this$core$context2$g.call(_this$core$context2)) !== 'android') return true;
-      return ((_this$app17 = this.app) === null || _this$app17 === void 0 || (_this$app17 = _this$app17.storage) === null || _this$app17 === void 0 || (_this$app17$getStorag = _this$app17.getStorage) === null || _this$app17$getStorag === void 0 ? void 0 : _this$app17$getStorag.call(_this$app17, AUTO_PRINT_STORAGE_KEY)) === 'true';
+      return ((_this$app17 = this.app) === null || _this$app17 === void 0 || (_this$app17 = _this$app17.storage) === null || _this$app17 === void 0 || (_this$app17$getStorag = _this$app17.getStorage) === null || _this$app17$getStorag === void 0 ? void 0 : _this$app17$getStorag.call(_this$app17, AUTO_PRINT_STORAGE_KEY)) !== 'false';
     }
   }, {
     key: "shouldBuildSmallTicketData",

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

@@ -274,6 +274,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getPersistedOrderStorageKey;
     private getOrderIdentityMatchKeys;
     private doOrdersShareIdentity;
     private findOrderIndexByIdentity;