@pisell/pisellos 2.2.167 → 2.2.169

package/dist/modules/Rules/index.js

@@ -222,6 +222,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return item.type === type || item.tag === type;
       });
     }
+
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+  }, {
+    key: "excludeDiscountListByType",
+    value: function excludeDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type !== type && item.tag !== type;
+      });
+    }
+
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+  }, {
+    key: "resolveDiscountListForManualOverride",
+    value: function resolveDiscountListForManualOverride(discountList) {
+      return this.excludeDiscountListByType(discountList, 'promotion');
+    }
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -1208,7 +1224,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
               var _ref13, _product$_promotion$f, _product13, _product$origin_total;
@@ -1231,14 +1247,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8;
+            var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
+              discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this3.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -2069,10 +2085,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          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;
           // original_price 对应：
@@ -2139,10 +2155,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem12, _flatItem$bundleItem13;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

package/dist/server/modules/order/utils/filterOrders.js

@@ -1,4 +1,17 @@
 import dayjs from 'dayjs';
+/** 从订单 payments 提取支付方式 code，与 UI 筛选选项及 filterBookings 一致 */
+function getOrderPaymentCodes(order) {
+  var payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.code;
+  }).filter(function (code) {
+    return typeof code === 'string' && code.length > 0;
+  });
+}
+
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -126,22 +139,23 @@ export function filterOrders(orders, filters) {
       }
     }
 
-    // payment_methods - 支付方式
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      var orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      var hasMatch = order.payment_methods.some(function (pm) {
-        return safeFilters.payment_methods.includes(pm);
+      var hasMatch = orderPaymentCodes.some(function (code) {
+        return safeFilters.payment_methods.includes(code);
       });
       if (!hasMatch) {
         rejected.push({
@@ -149,7 +163,7 @@ export function filterOrders(orders, filters) {
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/dist/solution/BaseSales/index.js

@@ -1348,17 +1348,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 48:
               this.store.order.persistTempOrder();
-              _context14.next = 54;
+              this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products,
+                discountList: nextDiscountList,
+                selectedDiscountList: tempOrder.discount_list,
+                tempOrder: tempOrder
+              });
+              _context14.next = 55;
               break;
-            case 51:
-              _context14.prev = 51;
+            case 52:
+              _context14.prev = 52;
               _context14.t1 = _context14["catch"](0);
               throw _context14.t1;
-            case 54:
+            case 55:
             case "end":
               return _context14.stop();
           }
-        }, _callee14, this, [[0, 51], [16, 36, 39, 42]]);
+        }, _callee14, this, [[0, 52], [16, 36, 39, 42]]);
       }));
       function setDiscountSelected(_x9) {
         return _setDiscountSelected.apply(this, arguments);

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

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parsedValue = Number(value);
@@ -74,7 +75,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, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _ref25, _ref26, _payload$tax_fee, _ref27, _ref28, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref25, _ref26, _origin$base_price, _ref27, _ref28, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref29, _ref30, _payload$tax_fee, _ref31, _ref32, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -92,6 +93,34 @@ export function transformBaseProductToOrderProduct(params) {
   var productOptionItem = normalizeOptionItems((_ref24 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item);
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
   var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
+  var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
+  var originTotal = resolveManualDiscountOriginTotal({
+    originTotal: payload.origin_total,
+    extendOriginTotal: (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.origin_total,
+    originExtendOriginTotal: origin === null || origin === void 0 || (_extend = origin._extend) === null || _extend === void 0 ? void 0 : _extend.origin_total,
+    sourceExtendOriginTotal: sourceProduct === null || sourceProduct === void 0 || (_extend2 = sourceProduct._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total,
+    catalogUnitPrice: (_ref25 = (_ref26 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref25 !== void 0 ? _ref25 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
+    quantity: resolvedQuantity
+  });
+  var sellingTotal = Number((_ref27 = (_ref28 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref28 !== void 0 ? _ref28 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref27 !== void 0 ? _ref27 : lineCompositeTotal);
+  var discountReason = resolveManualDiscountReasonFromSources({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.discount_reason,
+    originExtendDiscountReason: origin === null || origin === void 0 || (_extend3 = origin._extend) === null || _extend3 === void 0 ? void 0 : _extend3.discount_reason
+  });
+  var lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  var manualDiscountList = shouldBuildManualProductDiscount({
+    hasPriceOverride: hasPriceOverride,
+    originTotal: originTotal,
+    sellingTotal: sellingTotal
+  }) ? mergeManualProductDiscountIntoList(payload.discount_list, buildManualProductDiscountItem({
+    originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+    sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+    quantity: resolvedQuantity,
+    message: discountReason,
+    discountway: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discountway,
+    discount_per: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_per
+  })) : payload.discount_list || [];
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
@@ -107,7 +136,8 @@ export function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: sourceProductPrice,
     main_product_original_price: sourceProductPrice
   }, hasPriceOverride ? {
-    price_override: String(payload.price_override)
+    price_override: String(payload.price_override),
+    is_manual_discount: 1
   } : {}), payload.bundle_edit !== undefined ? {
     bundle_edit: payload.bundle_edit
   } : {});
@@ -118,14 +148,15 @@ export function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
-    num: toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1),
+    num: resolvedQuantity,
     product_option_item: productOptionItem,
     product_bundle: productBundle,
+    discount_list: manualDiscountList,
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
-    original_price: lineCompositeTotal,
-    tax_fee: toPriceString((_ref25 = (_ref26 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref26 !== void 0 ? _ref26 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref25 !== void 0 ? _ref25 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
-    is_charge_tax: toNumber((_ref27 = (_ref28 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref28 !== void 0 ? _ref28 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref27 !== void 0 ? _ref27 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
+    original_price: lineOriginalPrice,
+    tax_fee: toPriceString((_ref29 = (_ref30 = (_payload$tax_fee = payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref30 !== void 0 ? _ref30 : origin === null || origin === void 0 ? void 0 : origin.tax_fee) !== null && _ref29 !== void 0 ? _ref29 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.tax_fee, '0.00'),
+    is_charge_tax: toNumber((_ref31 = (_ref32 = (_payload$is_charge_ta = payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref32 !== void 0 ? _ref32 : origin === null || origin === void 0 ? void 0 : origin.is_charge_tax) !== null && _ref31 !== void 0 ? _ref31 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.is_charge_tax, 0),
     metadata: metadata,
     note: payload.note != null ? String(payload.note) : '',
     _origin: _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {

package/dist/solution/BaseSales/utils.js

@@ -6,6 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import Decimal from 'decimal.js';
 import { composeLinePrice, createUuidV4, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -231,8 +232,16 @@ export function normalizeOrderProduct(product) {
   });
   var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
     num: product.num,
-    metadata: metadata
+    metadata: metadata,
+    lineOriginalPrice: product.original_price
   }, composedOriginalPrice);
+  var discountList = ensureManualProductDiscountList({
+    discountList: product.discount_list,
+    metadata: metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -243,7 +252,7 @@ export function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''

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

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

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

@@ -4,6 +4,7 @@ import type { ProductData } from '../../modules';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
 import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
+import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
 import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
@@ -43,6 +44,14 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 让现有 setActiveCustomer / getActiveCustomer 调用方零成本拿到详情态客户。
      */
     loadSalesDetail(orderIdOrParams: number | string | LoadSalesDetailParams): Promise<ISalesDetail>;
+    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    private hydrateOrderCustomerFromScanDiscounts;
+    private getDiscountCustomerId;
+    private resolveCustomerByDiscountCustomerId;
+    private findCustomerById;
+    private normalizeCustomer;
+    private getRawCustomerId;
+    private hasUsableCustomerDetails;
     /**
      * 更新当前预约的 appointment_status。
      *