@pisell/pisellos 2.2.164 → 2.2.166

package/dist/solution/BookingTicket/index.js

@@ -61,6 +61,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     _defineProperty(_assertThisInitialized(_this), "platform", void 0);
     _defineProperty(_assertThisInitialized(_this), "scan", void 0);
     _defineProperty(_assertThisInitialized(_this), "productCatalog", []);
+    _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshInFlight", null);
+    _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshCustomerId", null);
     return _this;
   }
   _createClass(BookingTicketImpl, [{
@@ -135,7 +137,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderIdOrParams) {
-        var sales, customerModule, detailCustomer, _detailCustomer$name, _ref, detailCustomerId, detailCustomerRest, rawId, customer;
+        var _ref;
+        var sales, customerModule, detailCustomer, orderCustomerSnapshot, protocolCustomerId, protocolCustomer, selectedCustomer, _selectedCustomer$nam, _ref2, detailCustomerId, detailCustomerRest, rawId, customer;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -146,21 +149,36 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               console.log(sales, '1234sales');
               customerModule = this.store.customer;
               detailCustomer = sales === null || sales === void 0 ? void 0 : sales.customer;
-              if (customerModule && detailCustomer) {
-                _ref = detailCustomer !== null && detailCustomer !== void 0 ? detailCustomer : {}, detailCustomerId = _ref.id, detailCustomerRest = _objectWithoutProperties(_ref, _excluded);
-                rawId = detailCustomerId !== null && detailCustomerId !== void 0 ? detailCustomerId : '';
-                customer = _objectSpread(_objectSpread({}, detailCustomerRest), {}, {
-                  id: rawId == null ? '' : rawId,
-                  name: (_detailCustomer$name = detailCustomer === null || detailCustomer === void 0 ? void 0 : detailCustomer.name) !== null && _detailCustomer$name !== void 0 ? _detailCustomer$name : '',
-                  phone: detailCustomer === null || detailCustomer === void 0 ? void 0 : detailCustomer.phone,
-                  email: detailCustomer === null || detailCustomer === void 0 ? void 0 : detailCustomer.email,
-                  country_calling_code: detailCustomer === null || detailCustomer === void 0 ? void 0 : detailCustomer.country_calling_code
-                });
-                customerModule.setSelectedCustomer(customer);
-                this.setOrderCustomer(customer);
+              orderCustomerSnapshot = this.store.order.getOrderCustomerSnapshot();
+              protocolCustomerId = sales === null || sales === void 0 ? void 0 : sales.customer_id;
+              protocolCustomer = protocolCustomerId !== undefined && protocolCustomerId !== null ? {
+                id: protocolCustomerId,
+                name: String((sales === null || sales === void 0 ? void 0 : sales.customer_name) || ''),
+                phone: sales === null || sales === void 0 ? void 0 : sales.phone,
+                email: sales === null || sales === void 0 ? void 0 : sales.email,
+                country_calling_code: sales === null || sales === void 0 ? void 0 : sales.country_calling_code
+              } : null;
+              selectedCustomer = (_ref = detailCustomer !== null && detailCustomer !== void 0 ? detailCustomer : orderCustomerSnapshot) !== null && _ref !== void 0 ? _ref : protocolCustomer;
+              if (!(customerModule && selectedCustomer)) {
+                _context2.next = 18;
+                break;
               }
+              _ref2 = selectedCustomer !== null && selectedCustomer !== void 0 ? selectedCustomer : {}, detailCustomerId = _ref2.id, detailCustomerRest = _objectWithoutProperties(_ref2, _excluded);
+              rawId = detailCustomerId !== null && detailCustomerId !== void 0 ? detailCustomerId : '';
+              customer = _objectSpread(_objectSpread({}, detailCustomerRest), {}, {
+                id: rawId == null ? '' : rawId,
+                name: (_selectedCustomer$nam = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.name) !== null && _selectedCustomer$nam !== void 0 ? _selectedCustomer$nam : '',
+                phone: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.phone,
+                email: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.email,
+                country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
+              });
+              customerModule.setSelectedCustomer(customer);
+              this.setOrderCustomer(customer);
+              _context2.next = 18;
+              return this.store.order.saveDraft();
+            case 18:
               return _context2.abrupt("return", sales);
-            case 8:
+            case 19:
             case "end":
               return _context2.stop();
           }
@@ -678,6 +696,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       this.store.order.setOrderCustomer(patch, customer);
       var next = this.buildOrderCustomerPayload();
       this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
+      this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     }
 
     /**
@@ -704,7 +723,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "clearOrderCustomer",
     value: function clearOrderCustomer() {
+      var _discountModule$setOr,
+        _discountModule$setDi,
+        _this2 = this;
       this.store.order.clearOrderCustomer();
+      var orderStore = this.store.order.store || {};
+      var discountModule = orderStore.discount;
+      void (discountModule === null || discountModule === void 0 || (_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, []));
+      void (discountModule === null || discountModule === void 0 || (_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, []));
+      this.store.order.applyDiscount();
+      void this.store.order.recalculateSummary({
+        createIfMissing: true
+      }).then(function () {
+        return _this2.store.order.persistTempOrder();
+      }).catch(function (error) {
+        console.error('Failed to recalculate summary after clearing customer:', error);
+      });
       this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), null);
     }
 
@@ -754,6 +788,56 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         snapshot: this.store.order.getOrderCustomerSnapshot()
       };
     }
+  }, {
+    key: "refreshDiscountConfigAfterOrderCustomerChange",
+    value: function refreshDiscountConfigAfterOrderCustomerChange(customerId) {
+      var _this3 = this;
+      if (!customerId || customerId === 1) return;
+      if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
+        return;
+      }
+      var previousRefresh = this.orderCustomerDiscountRefreshInFlight;
+      var refreshTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var currentCustomer;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              if (!previousRefresh) {
+                _context12.next = 3;
+                break;
+              }
+              _context12.next = 3;
+              return previousRefresh.catch(function () {
+                return undefined;
+              });
+            case 3:
+              currentCustomer = _this3.store.order.getOrderCustomer();
+              if (!(!currentCustomer || Number(currentCustomer.customer_id) !== customerId)) {
+                _context12.next = 6;
+                break;
+              }
+              return _context12.abrupt("return");
+            case 6:
+              _context12.next = 8;
+              return _this3.loadDiscountConfig({
+                customerId: customerId
+              });
+            case 8:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12);
+      }))();
+      this.orderCustomerDiscountRefreshInFlight = refreshTask;
+      this.orderCustomerDiscountRefreshCustomerId = customerId;
+      refreshTask.catch(function (error) {
+        console.error('Failed to load discount config after customer change:', error);
+      }).finally(function () {
+        if (_this3.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
+        _this3.orderCustomerDiscountRefreshInFlight = null;
+        _this3.orderCustomerDiscountRefreshCustomerId = null;
+      });
+    }
 
     /**
      * 获取客户分页信息
@@ -795,27 +879,27 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "changeCustomerPage",
     value: (function () {
-      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(page, pageSize) {
+      var _changeCustomerPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(page, pageSize) {
         var _result3;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context13.prev = 0;
+              _context13.next = 3;
               return this.store.customer.changeCustomerPage(page, pageSize);
             case 3:
-              _result3 = _context12.sent;
-              return _context12.abrupt("return", _result3);
+              _result3 = _context13.sent;
+              return _context13.abrupt("return", _result3);
             case 7:
-              _context12.prev = 7;
-              _context12.t0 = _context12["catch"](0);
-              console.error('Failed to change customer page:', _context12.t0);
-              throw _context12.t0;
+              _context13.prev = 7;
+              _context13.t0 = _context13["catch"](0);
+              console.error('Failed to change customer page:', _context13.t0);
+              throw _context13.t0;
             case 11:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this, [[0, 7]]);
+        }, _callee13, this, [[0, 7]]);
       }));
       function changeCustomerPage(_x8, _x9) {
         return _changeCustomerPage.apply(this, arguments);
@@ -830,28 +914,28 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "loadMoreCustomers",
     value: (function () {
-      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _loadMoreCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var _result4;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              _context13.prev = 0;
-              _context13.next = 3;
+              _context14.prev = 0;
+              _context14.next = 3;
               return this.store.customer.loadMoreCustomers();
             case 3:
-              _result4 = _context13.sent;
+              _result4 = _context14.sent;
               this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), _result4);
-              return _context13.abrupt("return", _result4);
+              return _context14.abrupt("return", _result4);
             case 8:
-              _context13.prev = 8;
-              _context13.t0 = _context13["catch"](0);
-              console.error('Failed to load more customers:', _context13.t0);
-              throw _context13.t0;
+              _context14.prev = 8;
+              _context14.t0 = _context14["catch"](0);
+              console.error('Failed to load more customers:', _context14.t0);
+              throw _context14.t0;
             case 12:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this, [[0, 8]]);
+        }, _callee14, this, [[0, 8]]);
       }));
       function loadMoreCustomers() {
         return _loadMoreCustomers.apply(this, arguments);
@@ -867,31 +951,31 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "resetAndLoadCustomers",
     value: (function () {
-      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _resetAndLoadCustomers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var params,
           _result5,
-          _args14 = arguments;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+          _args15 = arguments;
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              params = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-              _context14.prev = 1;
-              _context14.next = 4;
+              params = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
+              _context15.prev = 1;
+              _context15.next = 4;
               return this.store.customer.resetAndLoadCustomers(params);
             case 4:
-              _result5 = _context14.sent;
+              _result5 = _context15.sent;
               this.core.effects.emit("".concat(this.name, ":onCustomerListReset"), _result5);
-              return _context14.abrupt("return", _result5);
+              return _context15.abrupt("return", _result5);
             case 9:
-              _context14.prev = 9;
-              _context14.t0 = _context14["catch"](1);
-              console.error('Failed to reset and load customers:', _context14.t0);
-              throw _context14.t0;
+              _context15.prev = 9;
+              _context15.t0 = _context15["catch"](1);
+              console.error('Failed to reset and load customers:', _context15.t0);
+              throw _context15.t0;
             case 13:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this, [[1, 9]]);
+        }, _callee15, this, [[1, 9]]);
       }));
       function resetAndLoadCustomers() {
         return _resetAndLoadCustomers.apply(this, arguments);
@@ -936,9 +1020,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "scanGlobalListener",
     value: function scanGlobalListener(callback) {
-      var _this2 = this;
+      var _this4 = this;
       var localSearch = function localSearch(v) {
-        return _this2.store.products.findProductsByCodeOrBarcode(v);
+        return _this4.store.products.findProductsByCodeOrBarcode(v);
       };
       var scanCallback = handleGlobalScan(this.request, localSearch);
       var safeCallback = function safeCallback(d) {
@@ -1053,15 +1137,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "setOtherParams",
     value: (function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
-        var _ref2,
-          _ref2$cover,
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+        var _ref4,
+          _ref4$cover,
           cover,
-          _args15 = arguments;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args16 = arguments;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _ref2 = _args15.length > 1 && _args15[1] !== undefined ? _args15[1] : {}, _ref2$cover = _ref2.cover, cover = _ref2$cover === void 0 ? false : _ref2$cover;
+              _ref4 = _args16.length > 1 && _args16[1] !== undefined ? _args16[1] : {}, _ref4$cover = _ref4.cover, cover = _ref4$cover === void 0 ? false : _ref4$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -1069,9 +1153,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
             case 2:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
       function setOtherParams(_x10) {
         return _setOtherParams.apply(this, arguments);
@@ -1086,16 +1170,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getOtherParams",
     value: (function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              return _context16.abrupt("return", this.otherParams);
+              return _context17.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -1261,10 +1345,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref3, _this$getOrderCustome, _this$getOrderCustome2, _this$store$order$get3, _extra$presetStartTim2;
+      var _extra$date2, _ref5, _this$getOrderCustome, _this$getOrderCustome2, _this$store$order$get3, _extra$presetStartTim2;
       var bookingContextState = this.store.bookingContext.getState();
       var date = (_extra$date2 = extra === null || extra === void 0 ? void 0 : extra.date) !== null && _extra$date2 !== void 0 ? _extra$date2 : bookingContextState.date;
-      var orderCustomerId = (_ref3 = (_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$store$order$get3 = this.store.order.getTempOrder()) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.customer_id) !== null && _ref3 !== void 0 ? _ref3 : undefined;
+      var orderCustomerId = (_ref5 = (_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$store$order$get3 = this.store.order.getTempOrder()) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.customer_id) !== null && _ref5 !== void 0 ? _ref5 : undefined;
       return _objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -1364,16 +1448,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "updateProductInOrder",
     value: (function () {
-      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context17.abrupt("return", this.updateOrderProduct(params));
+              return _context18.abrupt("return", this.updateOrderProduct(params));
             case 1:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
       function updateProductInOrder(_x11) {
         return _updateProductInOrder.apply(this, arguments);
@@ -1388,12 +1472,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "destroy",
     value: (function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var _this$scan;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context18.next = 2;
+              _context19.next = 2;
               return _get(_getPrototypeOf(BookingTicketImpl.prototype), "destroy", this).call(this);
             case 2:
               try {
@@ -1404,9 +1488,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               scanCache.clear();
             case 4:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

package/dist/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -89,8 +89,10 @@ export declare function buildRequiresDetailPayload(item: any, ctx?: AddProductDe
  */
 export declare function buildCacheItemFromCartDetail(item: any, ctx?: AddProductDecideContext): any;
 /**
- * 用 Info2 callback 的 (e, extension_type, detail) 拼装一个 cacheItem。
- * 与 info2 `addService.tsx#handleSelectProduct.callback` 内的拼装等价（剥 pricing）。
+ * 用 Info2 callback 的 (e, extension_type, detail) 拼装 cacheItem。
+ *
+ * 保留 detail._extend 中的 pricing / note（规格弹窗改价、备注等），
+ * 再叠加 session 时间、ctx.quantity 等运行态字段；other 以 callback `e` 为准。
  */
 export declare function buildCacheItemFromDetail(item: any, detailResult: {
     e: any;

package/dist/solution/BookingTicket/utils/addProductDecision.js

@@ -212,7 +212,7 @@ export function buildRequiresDetailPayload(item, ctx) {
  * 这里只补 `_extend.start_date / quantity / other` 等运行态字段；后续走 getProductExtend 才会补齐资源 / 时间。
  */
 export function buildCacheItemFromCartDetail(item, ctx) {
-  var _item$id, _item$_extend$price, _item$_extend;
+  var _item$id, _ref, _ctx$quantity, _item$_extend$price, _item$_extend;
   var cartDetailValue = item.cartDetailValue || {};
   var other = JSON.parse(JSON.stringify(cartDetailValue || {}));
   other.session = cartDetailValue.session;
@@ -220,7 +220,8 @@ export function buildCacheItemFromCartDetail(item, ctx) {
   var resolvedId = (_item$id = item.id) !== null && _item$id !== void 0 ? _item$id : item.product_id;
   var extend = applySessionTimesToExtend(item, {
     start_date: (ctx === null || ctx === void 0 ? void 0 : ctx.date) || undefined,
-    quantity: (cartDetailValue === null || cartDetailValue === void 0 ? void 0 : cartDetailValue.quantity) || (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) || 1,
+    /** 列表连点 / 防抖合并时以 ctx.quantity 为准，避免 cartDetailValue 默认 1 盖掉合并数量 */
+    quantity: (_ref = (_ctx$quantity = ctx === null || ctx === void 0 ? void 0 : ctx.quantity) !== null && _ctx$quantity !== void 0 ? _ctx$quantity : cartDetailValue === null || cartDetailValue === void 0 ? void 0 : cartDetailValue.quantity) !== null && _ref !== void 0 ? _ref : 1,
     product_name: item.title,
     other: other,
     isNormalProduct: !isBookingProduct(item),
@@ -238,34 +239,44 @@ export function buildCacheItemFromCartDetail(item, ctx) {
 }
 
 /**
- * 用 Info2 callback 的 (e, extension_type, detail) 拼装一个 cacheItem。
- * 与 info2 `addService.tsx#handleSelectProduct.callback` 内的拼装等价（剥 pricing）。
+ * 用 Info2 callback 的 (e, extension_type, detail) 拼装 cacheItem。
+ *
+ * 保留 detail._extend 中的 pricing / note（规格弹窗改价、备注等），
+ * 再叠加 session 时间、ctx.quantity 等运行态字段；other 以 callback `e` 为准。
  */
 export function buildCacheItemFromDetail(item, detailResult, ctx) {
-  var _detailResult$e, _currentItem$id, _detail$extension_typ, _detailResult$e2, _detailResult$e3;
+  var _detailResult$e, _currentItem$id, _detail$extension_typ, _ref2, _ref3, _ctx$quantity2, _detailResult$e2, _ref4, _detailExtend$price, _currentItem$title, _detailExtend$note, _detailResult$e3;
   var _currentItem = detailResult.detail || item;
   var _detail = _currentItem;
+  var detailExtend = (_detail === null || _detail === void 0 ? void 0 : _detail._extend) || {};
   var other = JSON.parse(JSON.stringify(detailResult.e || {}));
   other.session = (_detailResult$e = detailResult.e) === null || _detailResult$e === void 0 ? void 0 : _detailResult$e.session;
   var resolvedId = (_currentItem$id = _currentItem.id) !== null && _currentItem$id !== void 0 ? _currentItem$id : _currentItem.product_id;
   var mergedItem = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
     extension_type: (_detail$extension_typ = _detail.extension_type) !== null && _detail$extension_typ !== void 0 ? _detail$extension_typ : item.extension_type
   });
-  var extend = applySessionTimesToExtend(mergedItem, {
-    start_date: (ctx === null || ctx === void 0 ? void 0 : ctx.date) || undefined,
-    quantity: ((_detailResult$e2 = detailResult.e) === null || _detailResult$e2 === void 0 ? void 0 : _detailResult$e2.quantity) || (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) || 1,
-    price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
-    product_name: _currentItem.title,
+  var runtimeExtend = applySessionTimesToExtend(mergedItem, {
+    start_date: (ctx === null || ctx === void 0 ? void 0 : ctx.date) || detailExtend.start_date || undefined,
+    quantity: (_ref2 = (_ref3 = (_ctx$quantity2 = ctx === null || ctx === void 0 ? void 0 : ctx.quantity) !== null && _ctx$quantity2 !== void 0 ? _ctx$quantity2 : (_detailResult$e2 = detailResult.e) === null || _detailResult$e2 === void 0 ? void 0 : _detailResult$e2.quantity) !== null && _ref3 !== void 0 ? _ref3 : detailExtend.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1,
+    price: (_ref4 = (_detailExtend$price = detailExtend.price) !== null && _detailExtend$price !== void 0 ? _detailExtend$price : _detail === null || _detail === void 0 ? void 0 : _detail.price) !== null && _ref4 !== void 0 ? _ref4 : item === null || item === void 0 ? void 0 : item.price,
+    product_name: (_currentItem$title = _currentItem.title) !== null && _currentItem$title !== void 0 ? _currentItem$title : detailExtend.product_name,
     other: other,
     isNormalProduct: !isBookingProduct(mergedItem)
   }, {
     date: ctx === null || ctx === void 0 ? void 0 : ctx.date
   });
-  return _objectSpread(_objectSpread({}, _detail), {}, {
+  var extend = _objectSpread(_objectSpread(_objectSpread({}, detailExtend), runtimeExtend), {}, {
+    other: other
+  });
+  var note = (_detailExtend$note = detailExtend.note) !== null && _detailExtend$note !== void 0 ? _detailExtend$note : _detail === null || _detail === void 0 ? void 0 : _detail.note;
+  return _objectSpread(_objectSpread(_objectSpread({}, _detail), {}, {
     id: resolvedId,
     product_id: resolvedId,
     extension_type: mergedItem.extension_type,
-    _key: (_detailResult$e3 = detailResult.e) === null || _detailResult$e3 === void 0 ? void 0 : _detailResult$e3.key,
+    _key: (_detailResult$e3 = detailResult.e) === null || _detailResult$e3 === void 0 ? void 0 : _detailResult$e3.key
+  }, note != null && note !== '' ? {
+    note: String(note)
+  } : {}), {}, {
     _extend: extend,
     new: 1
   });
@@ -306,21 +317,28 @@ export function transformDetailToProductAndBooking(cacheItem, ctx) {
  * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
  */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _cacheItem$_extend, _ref, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref2, _other$product_varian, _cacheItem$_extend3, _cacheItem$_extend$pr, _cacheItem$_extend4, _cacheItem$_extend$pr2, _cacheItem$_extend5;
+  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2;
   var other = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.other) || {};
-  var quantity = (_ref = (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : ctx === null || ctx === void 0 ? void 0 : ctx.quantity) !== null && _ref !== void 0 ? _ref : 1;
+  var quantity = (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : 1;
   var resolvedPid = (_cacheItem$product_id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id) !== null && _cacheItem$product_id !== void 0 ? _cacheItem$product_id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id;
+  var extend = (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {};
   return {
     id: (_cacheItem$id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id) !== null && _cacheItem$id !== void 0 ? _cacheItem$id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id,
     product_id: resolvedPid,
-    variant_id: (_ref2 = (_other$product_varian = other === null || other === void 0 ? void 0 : other.product_variant_id) !== null && _other$product_varian !== void 0 ? _other$product_varian : other === null || other === void 0 ? void 0 : other.variant_id) !== null && _ref2 !== void 0 ? _ref2 : 0,
+    variant_id: (_ref5 = (_other$product_varian = other === null || other === void 0 ? void 0 : other.product_variant_id) !== null && _other$product_varian !== void 0 ? _other$product_varian : other === null || other === void 0 ? void 0 : other.variant_id) !== null && _ref5 !== void 0 ? _ref5 : 0,
     quantity: quantity,
     option: (other === null || other === void 0 ? void 0 : other.option) || [],
-    bundle: (other === null || other === void 0 ? void 0 : other.bundle) || [],
+    bundle: (other === null || other === void 0 ? void 0 : other.bundle) || (extend === null || extend === void 0 || (_extend$skuValue = extend.skuValue) === null || _extend$skuValue === void 0 ? void 0 : _extend$skuValue.bundle) || (extend === null || extend === void 0 || (_extend$_skuValue = extend._skuValue) === null || _extend$_skuValue === void 0 ? void 0 : _extend$_skuValue.bundle) || [],
     unique: other === null || other === void 0 ? void 0 : other.unique,
     session: other === null || other === void 0 ? void 0 : other.session,
-    note: cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.note,
-    price: (_cacheItem$_extend$pr = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.price) !== null && _cacheItem$_extend$pr !== void 0 ? _cacheItem$_extend$pr : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.price,
-    selling_price: (_cacheItem$_extend$pr2 = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.price) !== null && _cacheItem$_extend$pr2 !== void 0 ? _cacheItem$_extend$pr2 : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.price
+    note: extend === null || extend === void 0 ? void 0 : extend.note,
+    price: (_extend$price = extend === null || extend === void 0 ? void 0 : extend.price) !== null && _extend$price !== void 0 ? _extend$price : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.price,
+    selling_price: (_extend$price2 = extend === null || extend === void 0 ? void 0 : extend.price) !== null && _extend$price2 !== void 0 ? _extend$price2 : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.price,
+    line_total: extend === null || extend === void 0 ? void 0 : extend.total,
+    total: extend === null || extend === void 0 ? void 0 : extend.total,
+    origin_total: extend === null || extend === void 0 ? void 0 : extend.origin_total,
+    price_override: extend === null || extend === void 0 ? void 0 : extend.priceOverride,
+    bundle_edit: extend === null || extend === void 0 ? void 0 : extend.bundle_edit,
+    _extend: extend
   };
 }

package/dist/solution/ScanOrder/utils.js

@@ -13,7 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
-import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -480,17 +480,42 @@ export function getProductIdentityIndex(products, identity) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _product$metadata, _metadata$origin, _variantList$find, _product$is_charge_ta;
+  var _product$metadata, _metadata$origin, _metadata$origin2, _variantList$find, _product$is_charge_ta;
   var metadata = _objectSpread({}, product.metadata || {});
   // 不透明 identity 契约：每条订单行必须带 identity_key。
   // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
   var resolvedIdentityKey = (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : createUuidV4();
   metadata.unique_identification_number = resolvedIdentityKey;
-  var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref4, _item$bundle_selling_, _ref5, _ref6, _item$price2, _ref7, _item$price_type, _ref8, _item$price_type_ext;
+  var priceOverride = metadata.price_override;
+  var originOtherBundle = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin.other) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.bundle;
+  var bundleInput = product.product_bundle || [];
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    var priceById = new Map();
+    originOtherBundle.forEach(function (item) {
+      var _item$price2;
+      if ((item === null || item === void 0 ? void 0 : item.id) == null) return;
+      var unit = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.bundle_selling_price;
+      if (unit === undefined || unit === null) return;
+      priceById.set(String(item.id), String(unit));
+    });
+    var base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map(function (item) {
+      var unit = priceById.get(String(item === null || item === void 0 ? void 0 : item.id));
+      if (unit === undefined) return item;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        price: unit,
+        bundle_selling_price: unit
+      });
+    });
+  }
+  var normalizedBundle = bundleInput.map(function (item) {
+    var _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref4, _item$bundle_selling_, _ref5, _ref6, _item$price3, _ref7, _item$price_type, _ref8, _item$price_type_ext;
     return _objectSpread(_objectSpread({}, item), {}, {
+      bundle_id: (_item$bundle_id2 = item.bundle_id) !== null && _item$bundle_id2 !== void 0 ? _item$bundle_id2 : item.id,
+      bundle_product_id: (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id,
+      bundle_group_id: (_item$bundle_group_id = item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item.group_id,
       bundle_selling_price: (_ref4 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref4 !== void 0 ? _ref4 : '0.00',
-      price: (_ref5 = (_ref6 = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price) !== null && _ref6 !== void 0 ? _ref6 : item.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : '0.00',
+      price: (_ref5 = (_ref6 = (_item$price3 = item.price) !== null && _item$price3 !== void 0 ? _item$price3 : item.custom_price) !== null && _ref6 !== void 0 ? _ref6 : item.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : '0.00',
       price_type: (_ref7 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref7 !== void 0 ? _ref7 : '',
       price_type_ext: (_ref8 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref8 !== void 0 ? _ref8 : ''
     });
@@ -508,7 +533,7 @@ export function normalizeOrderProduct(product) {
   //   6) 入参 selling_price（最末兜底，新添加路径 caller 只给 selling_price）
   var isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
   var variantId = Number(product.product_variant_id || 0);
-  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.variant : null;
+  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin2 = metadata.origin) === null || _metadata$origin2 === void 0 ? void 0 : _metadata$origin2.variant : null;
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
@@ -578,6 +603,10 @@ export function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+    num: product.num,
+    metadata: metadata
+  }, composedOriginalPrice);
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -585,7 +614,7 @@ export function normalizeOrderProduct(product) {
     product_variant_id: product.product_variant_id,
     product_option_item: normalizedOptions,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
     discount_list: product.discount_list || [],