@pisell/pisellos 2.2.308 → 2.2.309

package/lib/modules/Rules/index.js

@@ -211,7 +211,8 @@ class RulesModule extends _BaseModule.BaseModule {
     // 识别出来是不是在编辑的界面里又新增了商品
     // 这种情况下，如果有可用的优惠券，也会自动勾选上
     const isEditModeAddNewProduct = productList.find(n => n.booking_id) && productList.find(n => !n.booking_id);
-    const reapplyBookingDiscountProductUids = new Set((options?.reapplyBookingDiscountProductUids || []).filter(uid => uid !== undefined && uid !== null && uid !== '').map(String));
+    const reapplyWeighedDiscountProductUids = new Set((options?.reapplyWeighedDiscountProductUids || []).map(String));
+    const reapplyBookingDiscountProductUids = new Set([...(options?.reapplyBookingDiscountProductUids || []), ...reapplyWeighedDiscountProductUids].filter(uid => uid !== undefined && uid !== null && uid !== '').map(String));
     const getOriginProductUid = originProduct => {
       const uid = originProduct?.metadata?.unique_identification_number ?? originProduct?.unique_identification_number;
       if (uid === undefined || uid === null || uid === '') return undefined;
@@ -915,7 +916,8 @@ class RulesModule extends _BaseModule.BaseModule {
       });
 
       // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
-      if (isPersistedProduct && hasExistingWalletDiscount) {
+      const isReweighedProduct = reapplyWeighedDiscountProductUids.has(getOriginProductUid(originProduct) || '');
+      if (isPersistedProduct && hasExistingWalletDiscount && !isReweighedProduct) {
         if (flatItem.type === 'main') {
           processedProductsMap.set(product._id, [originProduct]);
         }

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

@@ -31,6 +31,8 @@ export interface RulesCalcDiscountOptions {
     scan?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
+    /** Reweighed order lines only: reapply selected wallet discounts against their new amount. */
+    reapplyWeighedDiscountProductUids?: string[];
 }
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
+var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
 var _utils = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
@@ -65,11 +66,11 @@ function appendDataVariantIds(base, ...values) {
   }
   return Array.isArray(base) || result.length ? result : undefined;
 }
-function normalizeOptionItems(optionItems) {
+function normalizeOptionItems(optionItems, useOriginalPrice = false) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(optionItem => {
     const optionGroupItemId = toNumber(optionItem?.option_group_item_id ?? optionItem?.id);
-    const price = optionItem?.price ?? optionItem?.add_price ?? 0;
+    const price = (useOriginalPrice ? optionItem?.original_price : undefined) ?? optionItem?.price ?? optionItem?.add_price ?? 0;
     return {
       ...optionItem,
       option_group_item_id: optionGroupItemId,
@@ -80,10 +81,12 @@ function normalizeOptionItems(optionItems) {
     };
   });
 }
-function normalizeBundleItems(bundleItems, preferPriceField = false) {
+function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundleSellingPrice = false) {
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(bundleItem => {
-    const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
+    // Weighed manual prices distribute the bundle base and nested options separately.
+    // Its explicit selling amount already includes those options.
+    const unitSelling = preferPriceField && !preferBundleSellingPrice ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
     const unitStr = toPriceString(unitSelling, '0.00');
     const num = toSafePositiveInt(bundleItem?.num ?? bundleItem?.quantity, 1);
     const magnitudeSource = {
@@ -147,19 +150,25 @@ function transformBaseProductToOrderProduct(params) {
   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 推导。
+  // 称重商品使用改价前净重金额；其它商品从商品/variant 快照读取目录价。
+  // 售价仍由 line_total - bundle 推导。
   const catalogSourcePrice = matchedVariant?.price ?? matchedVariant?.base_price ?? origin?.price ?? origin?.base_price ?? sourceProduct?.price ?? sourceProduct?.selling_price ?? sourceProduct?.base_price;
-  const sourceProductPrice = toPriceString(hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice, '0.00');
+  const weighedSourcePrice = (0, _weighedProduct.resolveWeighedSourcePrice)(payload.product_sku ?? origin.product_sku, payload._extend?.weighing ?? origin._extend?.weighing);
+  const sourceProductPrice = toPriceString(weighedSourcePrice ?? (hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice), '0.00');
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item));
-  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride);
+  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+    bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
+    useOriginalBundle: true
+  })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
     extendOriginTotal: payload._extend?.origin_total,
     originExtendOriginTotal: origin?._extend?.origin_total,
@@ -260,6 +269,12 @@ function transformBaseProductToOrderProduct(params) {
     product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),
     _origin: {
       ...(sourceProduct || {}),
+      ...(weighedSourcePrice !== undefined && hasPriceOverride ? {
+        _extend: {
+          ...sourceProduct?._extend,
+          origin_total: originTotal
+        }
+      } : {}),
       callbackData: payload
     }
   };

package/lib/solution/BaseSales/utils.js

@@ -8,6 +8,7 @@ exports.createEmptySummary = createEmptySummary;
 exports.getSafeProductNum = getSafeProductNum;
 exports.isSkuOnlyDeleteIdentity = isSkuOnlyDeleteIdentity;
 exports.normalizeOrderProduct = normalizeOrderProduct;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
 var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
@@ -237,7 +238,7 @@ function normalizeOrderProduct(product) {
   });
   const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadata) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({

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

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

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

package/lib/solution/ScanOrder/utils.js

@@ -34,6 +34,7 @@ exports.toNonNegativeInt = toNonNegativeInt;
 exports.toNonNegativeNumber = toNonNegativeNumber;
 exports.toPositiveString = toPositiveString;
 exports.toPriceString = toPriceString;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
@@ -612,7 +613,7 @@ function normalizeOrderProduct(product) {
   });
   const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadata) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({

package/package.json

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