@pisell/pisellos 2.2.189 → 2.2.190

package/dist/modules/Order/index.js

@@ -2117,7 +2117,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              debugger;
               tempOrder = this.ensureTempOrder();
               linked = booking ? this.createLinkedProductAndBooking({
                 product: product,
@@ -2139,10 +2138,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(matchedProduct.product_option_item, matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context18.next = 18;
+                _context18.next = 17;
                 break;
               }
-              _context18.next = 15;
+              _context18.next = 14;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -2153,13 +2152,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 booking: booking
               });
-            case 15:
+            case 14:
               _context18.t0 = _context18.sent;
-              _context18.next = 19;
+              _context18.next = 18;
               break;
-            case 18:
+            case 17:
               _context18.t0 = false;
-            case 19:
+            case 18:
               shouldMerge = _context18.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
@@ -2192,18 +2191,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (linked) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
-              _context18.next = 24;
+              _context18.next = 23;
               return this.applyPromotion();
-            case 24:
+            case 23:
               this.applyDiscount();
-              _context18.next = 27;
+              _context18.next = 26;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 27:
+            case 26:
               this.persistTempOrder();
               return _context18.abrupt("return", tempOrder.products);
-            case 29:
+            case 28:
             case "end":
               return _context18.stop();
           }
@@ -2558,7 +2557,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "submitTempOrder",
     value: function () {
       var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _params$cacheId, _this$otherParams;
+        var _params$cacheId, _this$otherParams, _ref23, _params$businessCode, _this$otherParams2, _this$otherParams3;
         var tempOrder, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee21$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -2584,7 +2583,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform),
-                businessCode: params === null || params === void 0 ? void 0 : params.businessCode,
+                businessCode: (_ref23 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _ref23 !== void 0 ? _ref23 : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: params === null || params === void 0 ? void 0 : params.type,
                 enhance: enhancePayload
@@ -2770,6 +2769,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 payments: mappedPayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
+                businessCode: params.businessCode,
                 channel: params.channel,
                 enhancePayload: function enhancePayload(payload) {
                   var nextPayload = _objectSpread(_objectSpread({}, payload), {}, {
@@ -3339,7 +3339,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var _product$metadata6, _ref23, _ref24, _existed$origin, _rawProduct$metadata;
+          var _product$metadata6, _ref24, _ref25, _existed$origin, _rawProduct$metadata;
           var _step8$value = _slicedToArray(_step8.value, 2),
             index = _step8$value[0],
             product = _step8$value[1];
@@ -3347,7 +3347,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref23 = (_ref24 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref24 !== void 0 ? _ref24 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref23 !== void 0 ? _ref23 : rawProduct;
+          var origin = (_ref24 = (_ref25 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref25 !== void 0 ? _ref25 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref24 !== void 0 ? _ref24 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -3415,10 +3415,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref25, _optionItem$num, _ref26, _optionItem$price;
-      var rawNum = (_ref25 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref25 !== void 0 ? _ref25 : 1;
+      var _ref26, _optionItem$num, _ref27, _optionItem$price;
+      var rawNum = (_ref26 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref26 !== void 0 ? _ref26 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref26 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref26 !== void 0 ? _ref26 : 0;
+      var rawPrice = (_ref27 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref27 !== void 0 ? _ref27 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -3574,9 +3574,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step14;
           try {
             for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-              var _ref27, _bundle$num;
+              var _ref28, _bundle$num;
               var bundle = _step14.value;
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref27 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref28 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref28 !== void 0 ? _ref28 : 1) || 1).toNumber();
               var _iterator15 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step15;
               try {

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

@@ -479,6 +479,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    businessCode?: string;
     channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {

package/dist/solution/BaseSales/index.js

@@ -1789,7 +1789,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitSalesOrder",
     value: (function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _this$otherParams6, _this$otherParams7, _this$otherParams8;
+        var _this$otherParams6, _this$otherParams7, _this$otherParams8, _this$otherParams9;
         var inferredPaymentStatus, submitParams;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -1805,9 +1805,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
-                businessCode: (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode,
+                businessCode: ((_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) || ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code),
                 channel: this.getSubmitOrderSalesChannel(),
-                type: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.type
+                type: (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.type
               }, (params === null || params === void 0 ? void 0 : params.payments) !== undefined ? {
                 payments: params.payments
               } : {}), inferredPaymentStatus !== undefined ? {
@@ -1847,8 +1847,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
-        var _params$channel;
-        var channel, syncParams, syncState, payments, syncResult;
+        var _ref9, _params$businessCode, _this$otherParams10, _this$otherParams11, _params$channel;
+        var businessCode, channel, syncParams, syncState, payments, syncResult;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -1858,32 +1858,35 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
+              businessCode = (_ref9 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.businessCode) !== null && _ref9 !== void 0 ? _ref9 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
-              syncParams = _objectSpread(_objectSpread({}, params), channel !== undefined ? {
+              syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
+                businessCode: businessCode
+              } : {}), channel !== undefined ? {
                 channel: channel
               } : {});
               syncState = this.store.order.getOrderSyncState();
               if (!(params.submitWhenPaid && syncState === 'submitting')) {
-                _context19.next = 7;
+                _context19.next = 8;
                 break;
               }
               return _context19.abrupt("return", this.store.order.syncPaymentsToOrder(syncParams));
-            case 7:
+            case 8:
               payments = params.payments || [];
-              _context19.next = 10;
+              _context19.next = 11;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncStart, {
                 payments: payments,
                 params: syncParams,
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 10:
-              _context19.prev = 10;
-              _context19.next = 13;
+            case 11:
+              _context19.prev = 11;
+              _context19.next = 14;
               return this.store.order.syncPaymentsToOrder(syncParams);
-            case 13:
+            case 14:
               syncResult = _context19.sent;
-              _context19.next = 16;
+              _context19.next = 17;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
                 ok: true,
                 syncResult: syncResult,
@@ -1892,12 +1895,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 16:
+            case 17:
               return _context19.abrupt("return", syncResult);
-            case 19:
-              _context19.prev = 19;
-              _context19.t0 = _context19["catch"](10);
-              _context19.next = 23;
+            case 20:
+              _context19.prev = 20;
+              _context19.t0 = _context19["catch"](11);
+              _context19.next = 24;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
                 ok: false,
                 error: _context19.t0,
@@ -1906,13 +1909,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 23:
-              throw _context19.t0;
             case 24:
+              throw _context19.t0;
+            case 25:
             case "end":
               return _context19.stop();
           }
-        }, _callee19, this, [[10, 19]]);
+        }, _callee19, this, [[11, 20]]);
       }));
       function syncPaymentsToOrder(_x15) {
         return _syncPaymentsToOrder.apply(this, arguments);
@@ -1938,10 +1941,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this6 = this;
+      var _this$otherParams12,
+        _this6 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
+      debugger;
+      var shopWalletPassId = (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.shop_wallet_pass_id;
+      if (shopWalletPassId !== undefined && shopWalletPassId !== null) {
+        metadata.shop_wallet_pass_id = shopWalletPassId;
+      }
       if (!metadata.unique_identification_number) {
         metadata.unique_identification_number = createUuidV4();
       }
@@ -2050,7 +2059,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
-        var _params$order_wait_pa, _ref9, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref10, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -2093,7 +2102,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref9 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref9 !== void 0 ? _ref9 : 1
+                is_price_include_tax: (_ref10 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref10 !== void 0 ? _ref10 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2209,7 +2218,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
-        var orderIds, _ref10, _ref11, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref11, _ref12, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -2230,7 +2239,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context22.sent;
-              orderId = (_ref10 = (_ref11 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref11 !== void 0 ? _ref11 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref10 !== void 0 ? _ref10 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref11 = (_ref12 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref12 !== void 0 ? _ref12 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref11 !== void 0 ? _ref11 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context22.next = 10;
                 break;
@@ -2587,13 +2596,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-        var _this$otherParams9;
+        var _this$otherParams13;
         var menu_list_ids, _this$store$products, res;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 || (_this$otherParams9 = _this$otherParams9.dineInConfig) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9['menu.associated_menus'].map(function (n) {
+              menu_list_ids = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13 = _this$otherParams13.dineInConfig) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
               _context30.prev = 1;
@@ -2631,14 +2640,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _ref12,
-          _ref12$cover,
+        var _ref13,
+          _ref13$cover,
           cover,
           _args31 = arguments;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              _ref12 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref12$cover = _ref12.cover, cover = _ref12$cover === void 0 ? false : _ref12$cover;
+              _ref13 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref13$cover = _ref13.cover, cover = _ref13$cover === void 0 ? false : _ref13$cover;
               if (cover) {
                 this.otherParams = params;
               } else {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { composeLinePrice, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -123,6 +124,16 @@ export function transformBaseProductToOrderProduct(params) {
     discountway: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discountway,
     discount_per: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_per
   })) : payload.discount_list || [];
+
+  // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
+  var optionSum = sumOptionUnitPrice(productOptionItem).toNumber();
+  var mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
+  var bundleOnlyComposite = composeLinePrice({
+    mainPrice: 0,
+    bundle: productBundle
+  });
+  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
@@ -135,8 +146,9 @@ export function transformBaseProductToOrderProduct(params) {
     source_shop_id: payload.source_shop_id,
     origin: origin,
     source_product_price: sourceProductPrice,
-    main_product_selling_price: sourceProductPrice,
-    main_product_original_price: sourceProductPrice
+    main_product_selling_price: mainProductSellingPrice,
+    main_product_original_price: mainProductOriginalPrice,
+    price_schema_version: 2
   }, hasPriceOverride ? {
     price_override: String(payload.price_override),
     is_manual_discount: 1

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -279,7 +279,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/modules/Order/index.js

@@ -1445,7 +1445,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product, booking) {
     var _a;
-    debugger;
     const tempOrder = this.ensureTempOrder();
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
@@ -1841,7 +1840,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
    */
   async submitTempOrder(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
     this.persistTempOrder();
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
@@ -1866,7 +1865,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       cacheId: effectiveCacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: params == null ? void 0 : params.businessCode,
+      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: params == null ? void 0 : params.channel,
       type: params == null ? void 0 : params.type,
       enhance: enhancePayload
@@ -1880,7 +1879,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         externalSaleNumber: payload.external_sale_number,
         requestUniqueIdempotencyToken: payload.request_unique_idempotency_token,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_b = payload.payments) == null ? void 0 : _b.length) || 0,
+        paymentsCount: ((_d = payload.payments) == null ? void 0 : _d.length) || 0,
         smallTicketDataFlag: payload.small_ticket_data_flag
       });
       result = await this.submitSalesOrder({
@@ -1899,7 +1898,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderId: payload.order_id,
         externalSaleNumber: payload.external_sale_number,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_c = payload.payments) == null ? void 0 : _c.length) || 0
+        paymentsCount: ((_e = payload.payments) == null ? void 0 : _e.length) || 0
       });
       throw error;
     }
@@ -1988,6 +1987,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payments: mappedPayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
+      businessCode: params.businessCode,
       channel: params.channel,
       enhancePayload: (payload) => {
         const nextPayload = {

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

@@ -479,6 +479,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    businessCode?: string;
     channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {

package/lib/solution/BaseSales/index.js

@@ -1068,7 +1068,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * payments 会交给 OrderModule 统一映射为 Sales 协议支付项。
    */
   async submitSalesOrder(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!this.store.order) {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
@@ -1077,9 +1077,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
-      businessCode: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
+      businessCode: ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: this.getSubmitOrderSalesChannel(),
-      type: (_c = this.otherParams) == null ? void 0 : _c.type,
+      type: (_d = this.otherParams) == null ? void 0 : _d.type,
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
@@ -1102,11 +1102,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async syncPaymentsToOrder(params) {
+    var _a, _b;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
+    const businessCode = params.businessCode ?? ((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.business_code);
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
     const syncParams = {
       ...params,
+      ...businessCode !== void 0 ? { businessCode } : {},
       ...channel !== void 0 ? { channel } : {}
     };
     const syncState = this.store.order.getOrderSyncState();
@@ -1157,10 +1160,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /** 追加单个支付项到当前订单。 */
   addOrderPayment(payment) {
+    var _a;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const paymentRecord = payment;
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
+    debugger;
+    const shopWalletPassId = (_a = this.otherParams) == null ? void 0 : _a.shop_wallet_pass_id;
+    if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
+      metadata.shop_wallet_pass_id = shopWalletPassId;
+    }
     if (!metadata.unique_identification_number) {
       metadata.unique_identification_number = (0, import_utils.createUuidV4)();
     }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -22,6 +22,7 @@ __export(transformBaseProductToOrderProduct_exports, {
   transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
 });
 module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
+var import_utils = require("../../../modules/Order/utils");
 var import_manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
@@ -158,6 +159,13 @@ function transformBaseProductToOrderProduct(params) {
       discount_per: (_k = payload._extend) == null ? void 0 : _k.discount_per
     })
   ) : payload.discount_list || [];
+  const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
+  const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
+  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  const mainProductSellingPrice = toPriceString(
+    Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
+  );
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -170,8 +178,9 @@ function transformBaseProductToOrderProduct(params) {
     source_shop_id: payload.source_shop_id,
     origin,
     source_product_price: sourceProductPrice,
-    main_product_selling_price: sourceProductPrice,
-    main_product_original_price: sourceProductPrice,
+    main_product_selling_price: mainProductSellingPrice,
+    main_product_original_price: mainProductOriginalPrice,
+    price_schema_version: 2,
     ...hasPriceOverride ? {
       price_override: String(payload.price_override),
       is_manual_discount: 1

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -279,7 +279,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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