@pisell/pisellos 2.2.272 → 2.2.273

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

@@ -190,7 +190,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, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$order_detail, _ref12, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref12, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -257,7 +257,7 @@ export function buildCacheItemFromOrderLine(input) {
   if (Array.isArray(booking.relation_forms)) {
     extend.relation_forms = booking.relation_forms;
   }
-  var base = _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     extension_type: (_ref11 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
@@ -265,7 +265,9 @@ export function buildCacheItemFromOrderLine(input) {
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
     original_price: product.original_price
-  }, productOptionString ? {
+  }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
+    product_sku: JSON.parse(JSON.stringify(product.product_sku))
+  } : {}), productOptionString ? {
     product_option_string: productOptionString
   } : {}), {}, {
     _extend: extend,

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

@@ -75,7 +75,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail, _product$product_sku;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -127,7 +127,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend.skuValue = JSON.parse(JSON.stringify(originExtend.skuValue || originExtend._skuValue));
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
-  return _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
@@ -141,7 +141,10 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   } : {}), {}, {
     note: product.note,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    discount_list: discountList,
+    discount_list: discountList
+  }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
+    product_sku: JSON.parse(JSON.stringify(product.product_sku))
+  } : {}), {}, {
     new: 0,
     autoClose: true,
     _extend: extend

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

@@ -485,7 +485,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -4858,7 +4858,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "saveTempOrderAsDraft",
     value: function () {
       var _saveTempOrderAsDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _params$cacheId2, _this$otherParams6, _ref74, _params$businessCode2, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
+        var _params$cacheId2, _this$otherParams6, _this$otherParams7, _this$otherParams8, _params$type, _this$otherParams9, _payload$products;
         var tempOrder, latestSummary, payload;
         return _regeneratorRuntime().wrap(function _callee31$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
@@ -4890,7 +4890,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform),
-                businessCode: (_ref74 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
+                businessCode: (params === null || params === void 0 ? void 0 : params.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) || tempOrder.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.type,
                 summary: latestSummary,
@@ -4971,7 +4971,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
-        var _params$cacheId3, _this$otherParams10, _ref75, _ref76, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
+        var _params$cacheId3, _this$otherParams10, _ref74, _ref75, _submitSnapshot$busin, _this$otherParams11, _this$otherParams12, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee34$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
@@ -5033,7 +5033,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.platform),
-                businessCode: (_ref75 = (_ref76 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref76 !== void 0 ? _ref76 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
+                businessCode: (_ref74 = (_ref75 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref75 !== void 0 ? _ref75 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref74 !== void 0 ? _ref74 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -6065,7 +6065,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata11, _ref77, _ref78, _existed$origin, _rawProduct$metadata;
+          var _product$metadata11, _ref76, _ref77, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
@@ -6073,7 +6073,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 = (_ref77 = (_ref78 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref78 !== void 0 ? _ref78 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref77 !== void 0 ? _ref77 : rawProduct;
+          var origin = (_ref76 = (_ref77 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref77 !== void 0 ? _ref77 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref76 !== void 0 ? _ref76 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -6202,10 +6202,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref79, _optionItem$num, _ref80, _optionItem$add_price;
-      var rawNum = (_ref79 = (_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 && _ref79 !== void 0 ? _ref79 : 1;
+      var _ref78, _optionItem$num, _ref79, _optionItem$add_price;
+      var rawNum = (_ref78 = (_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 && _ref78 !== void 0 ? _ref78 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref80 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref80 !== void 0 ? _ref80 : 0;
+      var rawPrice = (_ref79 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref79 !== void 0 ? _ref79 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -6346,10 +6346,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step29;
           try {
             for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-              var _ref81, _bundle$num3;
+              var _ref80, _bundle$num3;
               var bundle = _step29.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref81 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref81 !== void 0 ? _ref81 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref80 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref80 !== void 0 ? _ref80 : 1) || 1).toNumber();
               var _iterator30 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step30;
               try {

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

@@ -167,6 +167,11 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncOrdersMap;
     private getOrderMapKey;
     private isBlankIdentityValue;
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+    private preserveExistingBusinessCodeForDraft;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
     private getOrderDateKey;

package/dist/server/modules/order/index.js

@@ -1572,7 +1572,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(draftOrders) {
         var _this10 = this;
-        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, mergedOrder, nextOrder, insertIndex, previousList, removedLegacyMemoryDraft;
+        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, existingOrder, reconciledDraftOrder, mergedOrder, nextOrder, insertIndex, patchedOrders, previousList, removedLegacyMemoryDraft;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1639,7 +1639,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 memoryDraftCount: memoryDraftMap.size,
                 sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
               });
-              patchedOrders = _toConsumableArray(draftMap.values());
               mergeActions = {};
               updatedList = this.store.list.filter(function (order) {
                 return _this10.shouldKeepOrderInMemory(order);
@@ -1659,66 +1658,71 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator10 = _createForOfIteratorHelper(memoryDraftMap.entries());
-              _context13.prev = 37;
+              _context13.prev = 36;
               _iterator10.s();
-            case 39:
+            case 38:
               if ((_step10 = _iterator10.n()).done) {
-                _context13.next = 55;
+                _context13.next = 57;
                 break;
               }
               _step10$value = _slicedToArray(_step10.value, 2), _storageKey2 = _step10$value[0], _draftOrder = _step10$value[1];
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
               if (!(matchIndex >= 0)) {
-                _context13.next = 49;
+                _context13.next = 51;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], _draftOrder);
+              existingOrder = updatedList[matchIndex];
+              reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, _draftOrder);
+              mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
               nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
                 need_sync: 0,
                 is_draft_order: 1
               });
               updatedList[matchIndex] = nextOrder;
+              // SQLite 必须与内存中的草稿保持同一份 business_code，避免下次 hydrate 再次丢失分类。
+              draftMap.set(_storageKey2, reconciledDraftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey2] = 'update';
-              return _context13.abrupt("continue", 53);
-            case 49:
+              return _context13.abrupt("continue", 55);
+            case 51:
               insertIndex = updatedList.length;
               updatedList.push(_draftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
               mergeActions[_storageKey2] = 'insert';
-            case 53:
-              _context13.next = 39;
-              break;
             case 55:
-              _context13.next = 60;
+              _context13.next = 38;
               break;
             case 57:
-              _context13.prev = 57;
-              _context13.t1 = _context13["catch"](37);
+              _context13.next = 62;
+              break;
+            case 59:
+              _context13.prev = 59;
+              _context13.t1 = _context13["catch"](36);
               _iterator10.e(_context13.t1);
-            case 60:
-              _context13.prev = 60;
+            case 62:
+              _context13.prev = 62;
               _iterator10.f();
-              return _context13.finish(60);
-            case 63:
+              return _context13.finish(62);
+            case 65:
+              patchedOrders = _toConsumableArray(draftMap.values());
               previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
               this.syncOrdersMap();
-              _context13.prev = 66;
-              _context13.next = 69;
+              _context13.prev = 69;
+              _context13.next = 72;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
                 throwOnError: true
               });
-            case 69:
-              _context13.next = 76;
+            case 72:
+              _context13.next = 79;
               break;
-            case 71:
-              _context13.prev = 71;
-              _context13.t2 = _context13["catch"](66);
+            case 74:
+              _context13.prev = 74;
+              _context13.t2 = _context13["catch"](69);
               this.store.list = previousList;
               this.syncOrdersMap();
               throw _context13.t2;
-            case 76:
+            case 79:
               this.logInfo('upsertLocalDraftOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
@@ -1727,18 +1731,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return !_this10.shouldKeepOrderInMemory(order);
               });
               if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
-                _context13.next = 81;
+                _context13.next = 84;
                 break;
               }
-              _context13.next = 81;
+              _context13.next = 84;
               return this.emitOrdersChanged(patchedOrders.filter(function (order) {
                 return _this10.shouldKeepOrderInMemory(order);
               }), 'upsertLocalDraftOrders');
-            case 81:
+            case 84:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[6, 21, 24, 27], [37, 57, 60, 63], [66, 71]]);
+        }, _callee13, this, [[6, 21, 24, 27], [36, 59, 62, 65], [69, 74]]);
       }));
       function upsertLocalDraftOrders(_x10) {
         return _upsertLocalDraftOrders.apply(this, arguments);
@@ -1853,6 +1857,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isBlankIdentityValue(value) {
       return value === undefined || value === null || value === '';
     }
+
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+  }, {
+    key: "preserveExistingBusinessCodeForDraft",
+    value: function preserveExistingBusinessCodeForDraft(existingOrder, draftOrder) {
+      var existingBusinessCode = existingOrder.business_code;
+      var draftBusinessCode = draftOrder.business_code;
+      var hasExistingBusinessCode = typeof existingBusinessCode === 'string' && existingBusinessCode.trim() !== '';
+      var hasDraftBusinessCode = typeof draftBusinessCode === 'string' && draftBusinessCode.trim() !== '';
+      if (!hasExistingBusinessCode || hasDraftBusinessCode) return draftOrder;
+      return _objectSpread(_objectSpread({}, draftOrder), {}, {
+        business_code: existingBusinessCode
+      });
+    }
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {

package/dist/solution/BaseSales/index.js

@@ -2743,7 +2743,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveSalesOrderDraft",
     value: function () {
       var _saveSalesOrderDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        var _params$platform, _this$otherParams10, _ref22, _params$businessCode, _this$otherParams11, _this$otherParams12, _params$channel, _params$type, _this$otherParams13;
+        var _params$platform, _this$otherParams10, _this$otherParams11, _this$otherParams12, _params$channel, _params$type, _this$otherParams13;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -2756,7 +2756,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context28.abrupt("return", this.store.order.saveTempOrderAsDraft(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_params$platform = params === null || params === void 0 ? void 0 : params.platform) !== null && _params$platform !== void 0 ? _params$platform : (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.platform,
-                businessCode: (_ref22 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) !== null && _ref22 !== void 0 ? _ref22 : (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code,
+                businessCode: (params === null || params === void 0 ? void 0 : params.businessCode) || ((_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code),
                 channel: (_params$channel = params === null || params === void 0 ? void 0 : params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel(),
                 type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.type
               }, (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
@@ -2902,7 +2902,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _ref23, _params$businessCode2, _this$otherParams22, _this$otherParams23, _params$channel2;
+        var _ref22, _params$businessCode, _this$otherParams22, _this$otherParams23, _params$channel2;
         var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
@@ -2913,7 +2913,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref23 = (_params$businessCode2 = params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.businessCode) !== null && _ref23 !== void 0 ? _ref23 : (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.business_code;
+              businessCode = (_ref22 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.businessCode) !== null && _ref22 !== void 0 ? _ref22 : (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.business_code;
               channel = (_params$channel2 = params.channel) !== null && _params$channel2 !== void 0 ? _params$channel2 : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -3173,7 +3173,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams24,
         _paymentRecord$paymen,
         _paymentRecord$create,
-        _ref24,
+        _ref23,
         _paymentRecord$origin,
         _this14 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -3195,7 +3195,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
       var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
-      var calculatedServiceFee = serviceCharge ? new Decimal((_ref24 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref24 !== void 0 ? _ref24 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref23 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref23 !== void 0 ? _ref23 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
       var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, normalizedPaymentRecord), calculatedServiceFee !== undefined ? {
         service_fee: calculatedServiceFee
       } : {}), {}, {
@@ -3471,7 +3471,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _params$order_wait_pa, _ref25, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref24, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -3514,7 +3514,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: (_ref25 = (_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 && _ref25 !== void 0 ? _ref25 : 1
+                is_price_include_tax: (_ref24 = (_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 && _ref24 !== void 0 ? _ref24 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -3645,7 +3645,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
-        var orderIds, _ref26, _ref27, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref25, _ref26, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
@@ -3666,7 +3666,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context38.sent;
-              orderId = (_ref26 = (_ref27 = (_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 && _ref27 !== void 0 ? _ref27 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref26 !== void 0 ? _ref26 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref25 = (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref25 !== void 0 ? _ref25 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context38.next = 10;
                 break;
@@ -3838,12 +3838,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               _context41.next = 9;
               return Promise.all(Array.from(groups.entries()).map( /*#__PURE__*/function () {
-                var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(_ref28) {
-                  var _ref30, groupKey, group, productsById;
+                var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(_ref27) {
+                  var _ref29, groupKey, group, productsById;
                   return _regeneratorRuntime().wrap(function _callee40$(_context40) {
                     while (1) switch (_context40.prev = _context40.next) {
                       case 0:
-                        _ref30 = _slicedToArray(_ref28, 2), groupKey = _ref30[0], group = _ref30[1];
+                        _ref29 = _slicedToArray(_ref27, 2), groupKey = _ref29[0], group = _ref29[1];
                         _context40.next = 3;
                         return _this16.loadProductsForPriceQuery({
                           ids: Array.from(group.ids),
@@ -3861,7 +3861,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   }, _callee40);
                 }));
                 return function (_x35) {
-                  return _ref29.apply(this, arguments);
+                  return _ref28.apply(this, arguments);
                 };
               }()));
             case 9:
@@ -4290,14 +4290,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee51(params) {
         var _this$otherParams26;
-        var _ref31,
-          _ref31$cover,
+        var _ref30,
+          _ref30$cover,
           cover,
           _args51 = arguments;
         return _regeneratorRuntime().wrap(function _callee51$(_context51) {
           while (1) switch (_context51.prev = _context51.next) {
             case 0:
-              _ref31 = _args51.length > 1 && _args51[1] !== undefined ? _args51[1] : {}, _ref31$cover = _ref31.cover, cover = _ref31$cover === void 0 ? false : _ref31$cover;
+              _ref30 = _args51.length > 1 && _args51[1] !== undefined ? _args51[1] : {}, _ref30$cover = _ref30.cover, cover = _ref30$cover === void 0 ? false : _ref30$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {

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 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -7,6 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { cacheItemToBookingInput, derivePresetStartTimeFromDate, getProductExtend, getIsAutoClose, isSessionProduct, isBookingProduct, applySessionTimesToExtend, hasActualResourceSelection, productNeedsResourceExtend } from "../../../modules/BookingContext";
 import { transformBaseProductToOrderProduct } from "../../BaseSales/utils/transformBaseProductToOrderProduct";
+import { buildProductSkuFromCacheItem } from "./weighingProductSku";
 
 /**
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
@@ -322,11 +323,16 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
   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) || {};
+  var productSku = buildProductSkuFromCacheItem(cacheItem);
   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: (_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 权威源，避免目录/旧订单里的空 option 覆盖它。
+    product_sku: productSku ? _objectSpread(_objectSpread({}, productSku), {}, {
+      option: (other === null || other === void 0 ? void 0 : other.option) || []
+    }) : undefined,
     option: (other === null || other === void 0 ? void 0 : other.option) || [],
     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,

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

@@ -0,0 +1,5 @@
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export declare function buildProductSkuFromCacheItem(cacheItem: Record<string, any> | null | undefined): Record<string, any> | undefined;

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

@@ -0,0 +1,45 @@
+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 _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); }
+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); }
+var WEIGHT_UNIT_MAP = {
+  KILOGRAMS: 'kg',
+  GRAMS: 'g',
+  POUNDS: 'lb',
+  OUNCES: 'oz'
+};
+function isRecord(value) {
+  return Boolean(value) && _typeof(value) === 'object' && !Array.isArray(value);
+}
+
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export function buildProductSkuFromCacheItem(cacheItem) {
+  var _cacheItem$_extend, _cacheItem$_extend2, _weighing$unit_weight, _weighing$tare$label, _weighing$tare, _weighing$tare$value, _weighing$tare2, _weighing$weight, _weighing$net_weight;
+  var currentSku = isRecord(cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_sku) ? cacheItem.product_sku : undefined;
+  var weighing = isRecord(cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.weighing) ? cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.weighing : undefined;
+  var hasRuntimeWeighingSku = Number((currentSku === null || currentSku === void 0 ? void 0 : currentSku.open_sold_weight) || 0) === 1 && ((currentSku === null || currentSku === void 0 ? void 0 : currentSku.weight) !== undefined || (currentSku === null || currentSku === void 0 ? void 0 : currentSku.net_weight) !== undefined || (currentSku === null || currentSku === void 0 ? void 0 : currentSku.weight_source) !== undefined);
+  var isWeighingSku = Number((currentSku === null || currentSku === void 0 ? void 0 : currentSku.open_sold_weight) || 0) === 1;
+
+  // 普通商品维持旧转换行为，不把目录侧完整 SKU 引入订单行。
+  if (!isWeighingSku && !weighing) return undefined;
+  // 新版 SkuDetailModal 已直接生成 product_sku；_extend.weighing 只作为旧调用方回退。
+  if (hasRuntimeWeighingSku) return _objectSpread({}, currentSku);
+  if (!weighing) return currentSku ? _objectSpread({}, currentSku) : undefined;
+  return _objectSpread(_objectSpread({}, currentSku || {}), {}, {
+    open_sold_weight: 1,
+    unit_data_snapshot: weighing.scalePriceProduct,
+    unit: WEIGHT_UNIT_MAP[String(weighing.unit)] || weighing.unit,
+    unit_weight: (_weighing$unit_weight = weighing.unit_weight) !== null && _weighing$unit_weight !== void 0 ? _weighing$unit_weight : '1.000',
+    unit_price: weighing.unit_price,
+    weight_source: weighing.mode,
+    tare_name: (_weighing$tare$label = (_weighing$tare = weighing.tare) === null || _weighing$tare === void 0 ? void 0 : _weighing$tare.label) !== null && _weighing$tare$label !== void 0 ? _weighing$tare$label : '',
+    tare_weight: (_weighing$tare$value = (_weighing$tare2 = weighing.tare) === null || _weighing$tare2 === void 0 ? void 0 : _weighing$tare2.value) !== null && _weighing$tare$value !== void 0 ? _weighing$tare$value : 0,
+    weight: (_weighing$weight = weighing.weight) !== null && _weighing$weight !== void 0 ? _weighing$weight : 0,
+    net_weight: (_weighing$net_weight = weighing.net_weight) !== null && _weighing$net_weight !== void 0 ? _weighing$net_weight : 0
+  });
+}

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

@@ -0,0 +1,51 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -184,7 +184,7 @@ function synthesizeProductResourceFromBooking(booking) {
   };
 }
 function buildCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { product, booking, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
@@ -259,6 +259,7 @@ function buildCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,
+    ...Number(((_g = product.product_sku) == null ? void 0 : _g.open_sold_weight) || 0) === 1 ? { product_sku: JSON.parse(JSON.stringify(product.product_sku)) } : {},
     ...productOptionString ? { product_option_string: productOptionString } : {},
     _extend: extend,
     new: 0,

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -78,7 +78,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 function buildNormalProductCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const { product, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const sourcePrice = resolveSourceProductPrice(product, sourceProduct);
@@ -144,6 +144,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
     discount_list: discountList,
+    ...Number(((_f = product.product_sku) == null ? void 0 : _f.open_sold_weight) || 0) === 1 ? { product_sku: JSON.parse(JSON.stringify(product.product_sku)) } : {},
     new: 0,
     autoClose: true,
     _extend: extend

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

@@ -485,7 +485,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -3629,7 +3629,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       cacheId: (params == null ? void 0 : params.cacheId) ?? this.cacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      businessCode: (params == null ? void 0 : params.businessCode) || ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code) || tempOrder.business_code,
       channel: params == null ? void 0 : params.channel,
       type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
       summary: latestSummary,

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

@@ -167,6 +167,11 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncOrdersMap;
     private getOrderMapKey;
     private isBlankIdentityValue;
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+    private preserveExistingBusinessCodeForDraft;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
     private getOrderDateKey;

package/lib/server/modules/order/index.js

@@ -1090,7 +1090,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       memoryDraftCount: memoryDraftMap.size,
       sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
     });
-    const patchedOrders = [...draftMap.values()];
     const mergeActions = {};
     const updatedList = this.store.list.filter((order) => this.shouldKeepOrderInMemory(order));
     const identityKeyToIndex = /* @__PURE__ */ new Map();
@@ -1106,13 +1105,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.getOrderIdentityMatchKeys(draftOrder)
       );
       if (matchIndex >= 0) {
-        const mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], draftOrder);
+        const existingOrder = updatedList[matchIndex];
+        const reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(
+          existingOrder,
+          draftOrder
+        );
+        const mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
         const nextOrder = {
           ...mergedOrder,
           need_sync: 0,
           is_draft_order: 1
         };
         updatedList[matchIndex] = nextOrder;
+        draftMap.set(storageKey, reconciledDraftOrder);
         this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
         mergeActions[storageKey] = "update";
         continue;
@@ -1122,6 +1127,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.registerOrderIdentityKeys(identityKeyToIndex, draftOrder, insertIndex);
       mergeActions[storageKey] = "insert";
     }
+    const patchedOrders = [...draftMap.values()];
     const previousList = this.store.list;
     this.store.list = this.runOrderStoreSelfCheck(updatedList, "upsertLocalDraftOrders.store");
     this.syncOrdersMap();
@@ -1207,6 +1213,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isBlankIdentityValue(value) {
     return value === void 0 || value === null || value === "";
   }
+  /**
+   * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+   * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+   */
+  preserveExistingBusinessCodeForDraft(existingOrder, draftOrder) {
+    const existingBusinessCode = existingOrder.business_code;
+    const draftBusinessCode = draftOrder.business_code;
+    const hasExistingBusinessCode = typeof existingBusinessCode === "string" && existingBusinessCode.trim() !== "";
+    const hasDraftBusinessCode = typeof draftBusinessCode === "string" && draftBusinessCode.trim() !== "";
+    if (!hasExistingBusinessCode || hasDraftBusinessCode)
+      return draftOrder;
+    return {
+      ...draftOrder,
+      business_code: existingBusinessCode
+    };
+  }
   getOrderIdentityEntries(order) {
     if (!order)
       return [];

package/lib/solution/BaseSales/index.js

@@ -1832,7 +1832,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.saveTempOrderAsDraft({
       cacheId: this.cacheId,
       platform: (params == null ? void 0 : params.platform) ?? ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      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) ?? this.getSubmitOrderSalesChannel(),
       type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}

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 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(addProductDecision_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_BookingContext = require("../../../modules/BookingContext");
 var import_transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
+var import_weighingProductSku = require("./weighingProductSku");
 function needsSpecDetailModal(item) {
   if (item == null ? void 0 : item.open_sold_weight)
     return true;
@@ -281,11 +282,14 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
   const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
   const extend = (cacheItem == null ? void 0 : cacheItem._extend) || {};
+  const productSku = (0, import_weighingProductSku.buildProductSkuFromCacheItem)(cacheItem);
   return {
     id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
     product_id: resolvedPid,
     variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
     quantity,
+    // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
+    product_sku: productSku ? { ...productSku, option: (other == null ? void 0 : other.option) || [] } : void 0,
     option: (other == null ? void 0 : other.option) || [],
     bundle: (other == null ? void 0 : other.bundle) || ((_c = extend == null ? void 0 : extend.skuValue) == null ? void 0 : _c.bundle) || ((_d = extend == null ? void 0 : extend._skuValue) == null ? void 0 : _d.bundle) || [],
     unique: other == null ? void 0 : other.unique,

package/lib/solution/BookingTicket/utils/weighingProductSku.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export declare function buildProductSkuFromCacheItem(cacheItem: Record<string, any> | null | undefined): Record<string, any> | undefined;

package/lib/solution/BookingTicket/utils/weighingProductSku.js

@@ -0,0 +1,63 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BookingTicket/utils/weighingProductSku.ts
+var weighingProductSku_exports = {};
+__export(weighingProductSku_exports, {
+  buildProductSkuFromCacheItem: () => buildProductSkuFromCacheItem
+});
+module.exports = __toCommonJS(weighingProductSku_exports);
+var WEIGHT_UNIT_MAP = {
+  KILOGRAMS: "kg",
+  GRAMS: "g",
+  POUNDS: "lb",
+  OUNCES: "oz"
+};
+function isRecord(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function buildProductSkuFromCacheItem(cacheItem) {
+  var _a, _b, _c, _d;
+  const currentSku = isRecord(cacheItem == null ? void 0 : cacheItem.product_sku) ? cacheItem.product_sku : void 0;
+  const weighing = isRecord((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.weighing) ? (_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.weighing : void 0;
+  const hasRuntimeWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1 && ((currentSku == null ? void 0 : currentSku.weight) !== void 0 || (currentSku == null ? void 0 : currentSku.net_weight) !== void 0 || (currentSku == null ? void 0 : currentSku.weight_source) !== void 0);
+  const isWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1;
+  if (!isWeighingSku && !weighing)
+    return void 0;
+  if (hasRuntimeWeighingSku)
+    return { ...currentSku };
+  if (!weighing)
+    return currentSku ? { ...currentSku } : void 0;
+  return {
+    ...currentSku || {},
+    open_sold_weight: 1,
+    unit_data_snapshot: weighing.scalePriceProduct,
+    unit: WEIGHT_UNIT_MAP[String(weighing.unit)] || weighing.unit,
+    unit_weight: weighing.unit_weight ?? "1.000",
+    unit_price: weighing.unit_price,
+    weight_source: weighing.mode,
+    tare_name: ((_c = weighing.tare) == null ? void 0 : _c.label) ?? "",
+    tare_weight: ((_d = weighing.tare) == null ? void 0 : _d.value) ?? 0,
+    weight: weighing.weight ?? 0,
+    net_weight: weighing.net_weight ?? 0
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildProductSkuFromCacheItem
+});

package/package.json

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