@pisell/pisellos 2.3.88 → 2.3.89

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

@@ -191,6 +191,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;

package/dist/modules/Order/utils.js

@@ -868,6 +868,7 @@ function formatSubmitBundleItems(bundle) {
     return {
       is_charge_tax: (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
       bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
+      production_code: rawBundle.production_code,
       num: num,
       quantity: toBundleNumber((_rawBundle$quantity = rawBundle.quantity) !== null && _rawBundle$quantity !== void 0 ? _rawBundle$quantity : rawBundle.num, num),
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,

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

@@ -77,6 +77,8 @@ export interface ProductData {
     is_gst: number;
     /** 商品编码 */
     code: string;
+    /** ERP/生产侧商品编码；有规格时以选中 Variant 的值为准 */
+    production_code?: string;
     /** 商品条码 */
     barcode: string;
     /** 是否支持配送 */

package/dist/modules/Rules/index.js

@@ -2223,7 +2223,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
-      var _flatItem$product;
+      var _flatItem$product, _flatItem$originProdu, _flatItem$parentProdu10;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2236,7 +2236,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
       var _ref18 = packageScope || {},
-        scopeType = _ref18.type,
+        _ref18$type = _ref18.type,
+        scopeType = _ref18$type === void 0 ? 'product_all' : _ref18$type,
         _ref18$exclude_bundle = _ref18.exclude_bundle_product_ids,
         exclude_bundle_product_ids = _ref18$exclude_bundle === void 0 ? [] : _ref18$exclude_bundle,
         _ref18$include_bundle = _ref18.include_bundle_product_ids,
@@ -2246,6 +2247,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
       var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
+      // 主商品id
+      var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2258,12 +2261,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11;
           // 套餐中购买时，判断是否为原价
           var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
           var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
-          var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
+          // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -2288,13 +2291,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2357,13 +2360,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 _isScopeValid = true;
               } else {
-                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                _isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              _isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用

package/dist/solution/BaseSales/types.d.ts

@@ -112,6 +112,8 @@ export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrde
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: BaseSalesProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -3,6 +3,7 @@ import type { ProductData } from '../../../modules/Product/types';
 export interface BaseProductDetailOptionItem {
     option_group_item_id?: number | string;
     option_group_id?: number | string;
+    production_code?: string;
     num?: number | string;
     quantity?: number | string;
     price?: number | string;
@@ -10,6 +11,7 @@ export interface BaseProductDetailOptionItem {
     [key: string]: any;
 }
 export interface BaseProductDetailBundleItem {
+    production_code?: string;
     option?: BaseProductDetailOptionItem[];
     [key: string]: any;
 }
@@ -18,6 +20,7 @@ export interface BaseProductDetailPayload {
     product_id?: number | string | null;
     variant_id?: number | string | null;
     product_variant_id?: number | string | null;
+    production_code?: string;
     quantity?: number | string;
     num?: number | string;
     option?: BaseProductDetailOptionItem[];

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

@@ -30,6 +30,10 @@ function toPriceString(value) {
   if (!Number.isFinite(parsedValue)) return fallback;
   return parsedValue.toFixed(2);
 }
+function normalizeProductionCode(value) {
+  if (value === undefined || value === null) return '';
+  return String(value).trim();
+}
 function isBlankValue(value) {
   return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
 }
@@ -104,7 +108,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _origin$production_co, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -116,6 +120,7 @@ export function transformBaseProductToOrderProduct(params) {
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
+  var productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.production_code : (_origin$production_co = origin === null || origin === void 0 ? void 0 : origin.production_code) !== null && _origin$production_co !== void 0 ? _origin$production_co : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.production_code);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
   // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
@@ -198,6 +203,7 @@ export function transformBaseProductToOrderProduct(params) {
   return _objectSpread(_objectSpread({
     product_id: productId,
     product_variant_id: productVariantId,
+    production_code: productionCode,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
     num: resolvedQuantity,
     product_sku: _objectSpread(_objectSpread({}, payload.product_sku && _typeof(payload.product_sku) === 'object' ? payload.product_sku : {}), {}, {

package/dist/solution/BaseSales/utils.js

@@ -256,11 +256,14 @@ export function normalizeOrderProduct(product) {
     sellingPrice: composedSellingPrice,
     quantity: getSafeProductNum(product.num)
   });
-  return {
+  return _objectSpread(_objectSpread({
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
-    product_variant_id: product.product_variant_id,
+    product_variant_id: product.product_variant_id
+  }, product.production_code !== undefined && product.production_code !== null ? {
+    production_code: String(product.production_code).trim()
+  } : {}), {}, {
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,
@@ -270,5 +273,5 @@ export function normalizeOrderProduct(product) {
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''
-  };
+  });
 }

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -319,7 +319,7 @@ export function transformDetailToProductAndBooking(cacheItem, ctx) {
  * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
  */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  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 _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _other$production_cod, _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 = (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;
@@ -329,6 +329,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     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,
+    // SKUOptionsSelection 已按 Product / Variant 解析好主商品编码；显式空串也需保留。
+    production_code: (_other$production_cod = other === null || other === void 0 ? void 0 : other.production_code) !== null && _other$production_cod !== void 0 ? _other$production_cod : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.production_code,
     quantity: quantity,
     // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
     product_sku: productSku ? _objectSpread(_objectSpread({}, productSku), {}, {

package/dist/solution/ScanOrder/types.d.ts

@@ -44,6 +44,8 @@ export interface ScanOrderProductSku {
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/dist/solution/ScanOrder/utils.js

@@ -660,11 +660,14 @@ export function normalizeOrderProduct(product) {
     sellingPrice: composedSellingPrice,
     quantity: getSafeProductNum(product.num)
   });
-  return {
+  return _objectSpread(_objectSpread({
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
-    product_variant_id: product.product_variant_id,
+    product_variant_id: product.product_variant_id
+  }, product.production_code !== undefined && product.production_code !== null ? {
+    production_code: String(product.production_code).trim()
+  } : {}), {}, {
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: manualOriginalPrice,
@@ -674,7 +677,7 @@ export function normalizeOrderProduct(product) {
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''
-  };
+  });
 }
 
 /**

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -191,6 +191,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;

package/lib/modules/Order/utils.js

@@ -909,6 +909,7 @@ function formatSubmitBundleItems(bundle) {
     return {
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
+      production_code: rawBundle.production_code,
       num,
       quantity: toBundleNumber(rawBundle.quantity ?? rawBundle.num, num),
       extension_id: rawBundle.extension_id ?? 0,

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

@@ -77,6 +77,8 @@ export interface ProductData {
     is_gst: number;
     /** 商品编码 */
     code: string;
+    /** ERP/生产侧商品编码；有规格时以选中 Variant 的值为准 */
+    production_code?: string;
     /** 商品条码 */
     barcode: string;
     /** 是否支持配送 */

package/lib/modules/Rules/index.js

@@ -1961,7 +1961,7 @@ class RulesModule extends _BaseModule.BaseModule {
     // 套餐适用范围配置
     const packageScope = usageRules?.package_scope;
     const {
-      type: scopeType,
+      type: scopeType = 'product_all',
       exclude_bundle_product_ids = [],
       include_bundle_product_ids = [],
       filter = 0
@@ -1969,6 +1969,8 @@ class RulesModule extends _BaseModule.BaseModule {
     const isMainProduct = flatItem.type === 'main'; // 单独购买
     const isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
     const bundleMainProductId = flatItem.product?.product_id;
+    // 主商品id
+    const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
 
     // 主商品直接可用
     if (isMainProduct) {
@@ -1985,7 +1987,7 @@ class RulesModule extends _BaseModule.BaseModule {
         const priceType = flatItem.bundleItem?.price_type;
         const priceTypeExt = flatItem.bundleItem?.price_type_ext;
         // 主商品id
-        const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
+        // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
         // original_price 对应：
         // 1. price_type: "markup" && price_type_ext: "product_price"
         // markup_price 对应：
@@ -2010,13 +2012,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用
@@ -2078,13 +2080,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用

package/lib/solution/BaseSales/types.d.ts

@@ -112,6 +112,8 @@ export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrde
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: BaseSalesProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -3,6 +3,7 @@ import type { ProductData } from '../../../modules/Product/types';
 export interface BaseProductDetailOptionItem {
     option_group_item_id?: number | string;
     option_group_id?: number | string;
+    production_code?: string;
     num?: number | string;
     quantity?: number | string;
     price?: number | string;
@@ -10,6 +11,7 @@ export interface BaseProductDetailOptionItem {
     [key: string]: any;
 }
 export interface BaseProductDetailBundleItem {
+    production_code?: string;
     option?: BaseProductDetailOptionItem[];
     [key: string]: any;
 }
@@ -18,6 +20,7 @@ export interface BaseProductDetailPayload {
     product_id?: number | string | null;
     variant_id?: number | string | null;
     product_variant_id?: number | string | null;
+    production_code?: string;
     quantity?: number | string;
     num?: number | string;
     option?: BaseProductDetailOptionItem[];

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

@@ -27,6 +27,10 @@ function toPriceString(value, fallback = '0.00') {
   if (!Number.isFinite(parsedValue)) return fallback;
   return parsedValue.toFixed(2);
 }
+function normalizeProductionCode(value) {
+  if (value === undefined || value === null) return '';
+  return String(value).trim();
+}
 function isBlankValue(value) {
   return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
 }
@@ -108,6 +112,7 @@ function transformBaseProductToOrderProduct(params) {
     ...(callbackOrigin || {})
   };
   const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant?.production_code : origin?.production_code ?? sourceProduct?.production_code);
   const hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
   // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
@@ -193,6 +198,7 @@ function transformBaseProductToOrderProduct(params) {
   return {
     product_id: productId,
     product_variant_id: productVariantId,
+    production_code: productionCode,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
     num: resolvedQuantity,
     product_sku: {

package/lib/solution/BaseSales/utils.js

@@ -257,6 +257,9 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
+    ...(product.production_code !== undefined && product.production_code !== null ? {
+      production_code: String(product.production_code).trim()
+    } : {}),
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -336,6 +336,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     id: cacheItem?.id ?? cacheItem?.product_id,
     product_id: resolvedPid,
     variant_id: other?.product_variant_id ?? other?.variant_id ?? 0,
+    // SKUOptionsSelection 已按 Product / Variant 解析好主商品编码；显式空串也需保留。
+    production_code: other?.production_code ?? cacheItem?.production_code,
     quantity,
     // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
     product_sku: productSku ? {

package/lib/solution/ScanOrder/types.d.ts

@@ -44,6 +44,8 @@ export interface ScanOrderProductSku {
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/lib/solution/ScanOrder/utils.js

@@ -633,6 +633,9 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
+    ...(product.production_code !== undefined && product.production_code !== null ? {
+      production_code: String(product.production_code).trim()
+    } : {}),
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: manualOriginalPrice,

package/package.json

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