@pisell/pisellos 0.10.8 → 0.10.9

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -43,6 +43,21 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
+var DEFAULT_WALLET_PASS_CALCULATION_CONFIG = {
+  maxDeductionAmount: 99999,
+  maxUsagePerOrder: 0,
+  allowCrossProduct: true,
+  applicableProductLimit: 0,
+  deductTaxAndFee: true,
+  maxPassesPerItem: 0,
+  deductOptionPrice: false
+};
+function getWalletPassCalculationConfig(voucher) {
+  return {
+    ...DEFAULT_WALLET_PASS_CALCULATION_CONFIG,
+    ...(voucher == null ? void 0 : voucher.config) || {}
+  };
+}
 var getProductQuantity = (product) => {
   return product.quantity || product.product_quantity || 1;
 };
@@ -105,9 +120,15 @@ function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPer
   });
 }
 var getRecommendedAmount = (voucher) => {
-  console.log("voucher312", voucher);
   const { config, recommended_usage_amount, recommended_pure_product_usage_amount } = voucher;
   const deductTaxAndFee = (config == null ? void 0 : config.deductTaxAndFee) ?? true;
+  const rawRecalculationBaseAmount = voucher._wallet_asset_recalculation_base_amount;
+  if (rawRecalculationBaseAmount !== void 0 && rawRecalculationBaseAmount !== null) {
+    const recalculationBaseAmount = Number(rawRecalculationBaseAmount);
+    if (Number.isFinite(recalculationBaseAmount) && recalculationBaseAmount >= 0) {
+      return recalculationBaseAmount;
+    }
+  }
   return deductTaxAndFee ? recommended_usage_amount : recommended_pure_product_usage_amount ?? recommended_usage_amount;
 };
 var getApplicableProductIds = (voucher) => {
@@ -145,7 +166,6 @@ var getApplicableProducts = (voucher, productsData) => {
   return productsData.filter((p) => applicableProductIds.includes(p.product_id));
 };
 function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const getItemPassUsage = (usageMap, walletPassProductId, lineKey) => {
@@ -218,7 +238,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     return import_decimal.default.min(baseAmount, finalApplicableAmount, remainingOrderAmount);
   };
   const isVoucherAvailable = (voucher, productsData, usedVoucherCounts2, itemPassUsage) => {
-    const { config, id, product_id } = voucher;
+    const { config, product_id } = voucher;
     const recommendedAmount = getRecommendedAmount(voucher);
     if (recommendedAmount <= 0) {
       return { isAvailable: false, reasonCode: "not_meet_the_required_conditions" };
@@ -453,6 +473,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
   const productsForCalc = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const selectedWithDetails = [];
+  const usedVoucherCounts = /* @__PURE__ */ new Map();
   const itemPassUsageMap = /* @__PURE__ */ new Map();
   const getItemPassUsageRecalc = (walletPassProductId, lineKey) => {
     var _a;
@@ -469,8 +490,29 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     });
   };
   selectedVouchers.forEach((selectedVoucher) => {
-    const { config, id } = selectedVoucher;
-    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit, deductTaxAndFee = true, maxPassesPerItem = 0 } = config;
+    const { product_id } = selectedVoucher;
+    const config = getWalletPassCalculationConfig(selectedVoucher);
+    const {
+      maxDeductionAmount,
+      maxUsagePerOrder,
+      allowCrossProduct,
+      applicableProductLimit,
+      deductTaxAndFee,
+      maxPassesPerItem
+    } = config;
+    const usedCount = usedVoucherCounts.get(product_id) || 0;
+    if (maxUsagePerOrder > 0 && usedCount >= maxUsagePerOrder) {
+      selectedWithDetails.push({
+        ...selectedVoucher,
+        config,
+        actualDeduction: 0,
+        deductionDetails: [],
+        _available_max_amount: 0,
+        _unified_available_status: 0,
+        reasonCode: "usage_limit_reached"
+      });
+      return;
+    }
     const unitPriceField = deductTaxAndFee ? "unitPriceWithTax" : "unitPricePure";
     const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let applicableProducts = getApplicableProducts(
@@ -481,6 +523,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     if (applicableProducts.length === 0) {
       selectedWithDetails.push({
         ...selectedVoucher,
+        config,
         actualDeduction: 0,
         deductionDetails: [],
         _available_max_amount: 0,
@@ -558,6 +601,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push({
       ...selectedVoucher,
+      config,
       actualDeduction: totalDeducted.toNumber(),
       // 转换为数字
       deductionDetails,
@@ -565,12 +609,11 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       // 转换为数字
       _unified_available_status: totalDeducted.greaterThan(0) ? 1 : 0
     });
+    if (totalDeducted.greaterThan(0)) {
+      usedVoucherCounts.set(product_id, usedCount + 1);
+    }
   });
   const selectedIds = new Set(selectedVouchers.map((v) => v.id));
-  const usedVoucherCounts = /* @__PURE__ */ new Map();
-  selectedVouchers.forEach((v) => {
-    usedVoucherCounts.set(v.product_id, (usedVoucherCounts.get(v.product_id) || 0) + 1);
-  });
   const allWithUpdatedStatus = allVouchers.map((voucher) => {
     if (selectedIds.has(voucher.id)) {
       const selectedDetail = selectedWithDetails.find(
@@ -578,8 +621,15 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       );
       return selectedDetail || voucher;
     }
-    const { config, id, product_id } = voucher;
-    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit, deductTaxAndFee = true, maxPassesPerItem = 0 } = config;
+    const { product_id } = voucher;
+    const config = getWalletPassCalculationConfig(voucher);
+    const {
+      maxDeductionAmount,
+      allowCrossProduct,
+      applicableProductLimit,
+      deductTaxAndFee,
+      maxPassesPerItem
+    } = config;
     const unitPriceField = deductTaxAndFee ? "unitPriceWithTax" : "unitPricePure";
     const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     const recommendedAmount = getRecommendedAmount(voucher);
@@ -663,6 +713,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     }
     return {
       ...voucher,
+      config,
       _available_max_amount: calculatedMaxAmount.toNumber(),
       // 转换为数字
       _unified_available_status: isAvailable ? 1 : 0,

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

@@ -202,6 +202,8 @@ function buildCacheItemFromOrderLine(input) {
   const productTitle = resolveProductTitle(product, booking, sourceProduct);
   const productCover = resolveProductCover(product, booking, sourceProduct);
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const hasBundle = Array.isArray(product.product_bundle) && product.product_bundle.length > 0;
+  const bundleEdit = product.bundle_edit ?? (hasBundle ? 0 : void 0);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
@@ -234,6 +236,7 @@ function buildCacheItemFromOrderLine(input) {
       product.discount_list,
       (_c = product.metadata) == null ? void 0 : _c.product_discount_reason
     ) || void 0,
+    ...bundleEdit !== void 0 ? { bundle_edit: bundleEdit } : {},
     ...productOptionString ? { product_option_string: productOptionString } : {}
   };
   const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");

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

@@ -83,12 +83,13 @@ function getTimeObj(params) {
   const { cacheItem, useStartTime, useDuration, ctx } = params;
   const isMultiDay = (0, import_serviceTimes.isMultiDayProduct)(cacheItem);
   const flexibleOption = getFlexibleOption({ cacheItem, useStartTime, ctx });
-  const baseSlices = (0, import_timeSlices.sliceDayIntoFiveMinutes)(
+  const {
+    timeSlices,
+    durationSlicesBasedOnTime
+  } = (0, import_timeSlices.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = ctx == null ? void 0 : ctx.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
     isMultiDay
   );
-  const timeSlices = [...baseSlices.timeSlices];
-  const durationSlicesBasedOnTime = [...baseSlices.durationSlicesBasedOnTime];
   if (flexibleOption) {
     durationSlicesBasedOnTime.unshift(flexibleOption);
   }

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

@@ -38,10 +38,21 @@ __export(timeSlices_exports, {
 module.exports = __toCommonJS(timeSlices_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_flexible = require("./flexible");
+var timeSlicesCache = /* @__PURE__ */ new Map();
+function copyTimeSlices(result) {
+  return {
+    timeSlices: [...result.timeSlices],
+    durationSlicesBasedOnTime: [...result.durationSlicesBasedOnTime]
+  };
+}
 function sliceDayIntoFiveMinutes(config, isDay) {
+  const timeSlice = config && config.value || 5;
+  const cacheKey = isDay ? "days" : `minutes:${timeSlice}`;
+  const cached = timeSlicesCache.get(cacheKey);
+  if (cached)
+    return copyTimeSlices(cached);
   const startTime = (0, import_dayjs.default)().startOf("day");
   const endTime = (0, import_dayjs.default)().endOf("day");
-  const timeSlice = config && config.value || 5;
   const timeSlices = [];
   const durationSlicesBasedOnTime = [];
   let currentTime = startTime;
@@ -58,7 +69,9 @@ function sliceDayIntoFiveMinutes(config, isDay) {
       });
       currentDay += 1;
     }
-    return { timeSlices, durationSlicesBasedOnTime };
+    const result2 = { timeSlices, durationSlicesBasedOnTime };
+    timeSlicesCache.set(cacheKey, result2);
+    return copyTimeSlices(result2);
   }
   while (currentTime.isBefore(endTime)) {
     timeSlices.push({
@@ -73,7 +86,9 @@ function sliceDayIntoFiveMinutes(config, isDay) {
     });
     currentTime = nextTime;
   }
-  return { timeSlices, durationSlicesBasedOnTime };
+  const result = { timeSlices, durationSlicesBasedOnTime };
+  timeSlicesCache.set(cacheKey, result);
+  return copyTimeSlices(result);
 }
 function findNextDuration(current, array, defaultValue) {
   if (defaultValue !== void 0 && defaultValue !== null)

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

@@ -44,6 +44,10 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
      */
     queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
+    /**
+     * 查询单个客户详情，不写入 customerList / pagination 状态。
+     */
+    queryCustomerDetail(id: string | number): Promise<ShopCustomer | null>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -201,6 +201,17 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       pageSize
     };
   }
+  /**
+   * 查询单个客户详情，不写入 customerList / pagination 状态。
+   */
+  async queryCustomerDetail(id) {
+    var _a;
+    const result = await this.request.get(`/customer/info/${id}`, {
+      with_trashed: 1
+    });
+    const customer = ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.customer) || (result == null ? void 0 : result.data) || (result == null ? void 0 : result.customer) || null;
+    return customer && typeof customer === "object" ? customer : null;
+  }
   /**
    * 获取客户列表
    * @param params 查询参数

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

@@ -112,6 +112,8 @@ export interface CustomerModuleAPI {
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 查询客户列表但不更新列表分页状态 */
     queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询单个客户详情但不修改客户列表状态 */
+    queryCustomerDetail: (id: string | number) => Promise<ShopCustomer | null>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

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

@@ -25,9 +25,11 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_wallet_pass_holder: 0 | 1;
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
+        with_virtual_currency?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
+    private normalizeVirtualCurrencyList;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/lib/modules/Discount/index.js

@@ -96,7 +96,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return Array.from(new Set(ids));
   }
   async loadPrepareConfig(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (typeof params.order_id === "string" && params.order_id.startsWith("LOCAL_")) {
       params.order_id = void 0;
     }
@@ -105,7 +105,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       {
         ...params,
         with_available_wallet_flag: params.with_available_wallet_flag ?? 1,
-        with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1
+        with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1,
+        with_virtual_currency: params.with_virtual_currency ?? 1
       }
     );
     const rawDiscountList = [
@@ -121,14 +122,47 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       ...availableWalletList.map((item) => item == null ? void 0 : item.wallet_id),
       ...availableWalletPassList.map((item) => item == null ? void 0 : item.product_id)
     ]);
+    const virtualCurrencyList = this.normalizeVirtualCurrencyList(
+      (_f = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _f.virtual_currency_list
+    );
     const goodPassList = this.filterEnabledDiscountList(
       rawDiscountList
     ) || [];
     return {
       discountList: goodPassList,
-      availableWalletIds
+      availableWalletIds,
+      virtualCurrencyList
     };
   }
+  normalizeVirtualCurrencyList(value) {
+    if (!Array.isArray(value))
+      return [];
+    return value.flatMap((item) => {
+      const id = Number(item == null ? void 0 : item.id);
+      const productId = Number(item == null ? void 0 : item.product_id);
+      if (!Number.isFinite(id) || id <= 0 || !Number.isFinite(productId) || productId <= 0) {
+        return [];
+      }
+      const displayExtension = Array.isArray(item == null ? void 0 : item.extension_data) ? item.extension_data.find(
+        (extension) => (extension == null ? void 0 : extension.field_key) === "virtual_currency_display"
+      ) : void 0;
+      let display = displayExtension == null ? void 0 : displayExtension.value;
+      if (typeof display === "string") {
+        try {
+          display = JSON.parse(display);
+        } catch {
+          display = {};
+        }
+      }
+      return [{
+        ...item,
+        id,
+        product_id: productId,
+        balance: String((item == null ? void 0 : item.balance) ?? "0"),
+        virtual_currency_display: display && typeof display === "object" && !Array.isArray(display) ? display : {}
+      }];
+    });
+  }
   async batchSearch(code, options) {
     const { customerId, orderId } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {

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

@@ -71,6 +71,17 @@ export interface DiscountWithReason {
 export interface DiscountPrepareConfigResult {
     discountList: Discount[];
     availableWalletIds: number[];
+    virtualCurrencyList?: VirtualCurrencyAsset[];
+}
+export interface VirtualCurrencyAsset extends Record<string, any> {
+    id: number;
+    product_id: number;
+    balance: string;
+    product_name?: string;
+    format_title?: Record<string, any>;
+    code?: string;
+    encoded?: string;
+    virtual_currency_display?: Record<string, any>;
 }
 interface ExtensionData {
     id: number;

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

@@ -82,6 +82,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
     getAvailableWalletIds(): number[];
+    getVirtualCurrencyList(): import("../Discount/types").VirtualCurrencyAsset[];
     private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
@@ -195,6 +196,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         orderExpectedAmount: string;
     };
     private calculateDepositPaidAmount;
+    private hasPaidNormalPayment;
     private resolveNextOrderPaymentType;
     private getPaymentNumberAppData;
     private getPaymentNumberDevicePrefixSync;
@@ -372,6 +374,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }): Promise<OrderPaymentData[]>;
+    private normalizeShouldMergeProductResult;
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -381,6 +384,13 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * this.hasLinkedBookingUid({ metadata: { booking_uid: 'booking-1' } });
      */
     private hasLinkedBookingUid;
+    private isMultiCurrencySettlementEnabled;
+    private isActiveVirtualSettlementOrder;
+    private shouldUseVirtualSettlementSummary;
+    private normalizeVirtualSettlementProductIfEnabled;
+    private assertAndLockProductSettlement;
+    private syncTempOrderSettlementState;
+    private prepareVirtualSettlementTempOrder;
     /**
      * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
      *
@@ -393,7 +403,12 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 带 booking 且 num>1 时由 `addProductToOrder` 拆成多次本方法调用（每次 num=1）。
      *
      * @example
-     * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
+     * const pending = this.appendProductLineToTempOrder(
+     *   tempOrder,
+     *   { product_id: 1, num: 1 },
+     *   booking,
+     * );
+     * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
     /**
@@ -448,6 +463,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
+    /**
+     * 切换购物车结算单位时清理所有会影响新币种的订单状态，但保留当前客户。
+     */
+    clearOrderForSettlementSwitch(): Promise<OrderTempOrder>;
     buildCurrentSubmitPayloadForLocalPrint(params?: {
         cacheId?: string;
         platform?: string;