@pisell/pisellos 2.2.275 → 2.2.277

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

@@ -193,7 +193,7 @@ export function transformBaseProductToOrderProduct(params) {
   }
   // 从源头补充商品多语言标题
   var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
-    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
   return {
     product_id: productId,

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

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

@@ -326,7 +326,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/dist/solution/BookingTicket/index.js

@@ -2620,10 +2620,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _context30.next = 11;
                 break;
               }
-              return _context30.abrupt("return", this.store.order.addProductsToOrder(orderLines, {
-                skipEditDiscountConfigRefresh: true,
-                skipDiscountRecalculation: true
-              }));
+              return _context30.abrupt("return", this.store.order.addProductsToOrder(orderLines));
             case 11:
               result = [];
               _iterator2 = _createForOfIteratorHelper(orderLines);

package/lib/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

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

@@ -214,7 +214,6 @@ var WalletPassEvaluator = class {
         }
         const rawText = this.getText(reasonCode);
         const currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_g = (_f = this.otherParams) == null ? void 0 : _f.getData) == null ? void 0 : _g.call(_f, "shop_symbol")) || "" : "";
-        console.log(currency, "currency12345");
         const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue, currency) : rawText;
         results.push({
           voucher,
@@ -416,7 +415,6 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -26,6 +26,11 @@ export interface Voucher {
     recommended_usage_amount: number;
     /** 后端计算推荐使用金额（仅商品） 不包含税费附加费 */
     recommended_pure_product_usage_amount: number;
+    /**
+     * 扫码资产自身可供前端重新计算的金额基准。
+     * 后端 recommended_usage_amount 会包含当前已选券上下文，取消勾选后不能继续把它当作资产永久上限。
+     */
+    _wallet_asset_recalculation_base_amount?: number;
     /** 实际抵扣金额 */
     actualDeduction: number;
     /** 抵扣详情 */

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/Order/index.js

@@ -133,7 +133,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.draftPersistEnabled = true;
   }
   collectHydratedEditDiscounts(products) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const discountMap = /* @__PURE__ */ new Map();
     for (const product of (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
@@ -148,16 +148,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const key = Number.isFinite(id) ? id : String(resourceId);
         const title = ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.title) ?? {};
         const amount = Number((item == null ? void 0 : item.amount) || 0);
+        const discountCardType = (_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.discount_card_type;
+        const parValue = isDiscountCard ? discountCardType === "fixed_amount" ? ((_d = item == null ? void 0 : item.discount) == null ? void 0 : _d.fixed_amount) ?? (item == null ? void 0 : item.amount) : (_e = item == null ? void 0 : item.discount) == null ? void 0 : _e.percent : "0";
         const detail = {
           amount: String((item == null ? void 0 : item.amount) ?? "0"),
           type,
           resource_id: key,
           title,
-          original_amount: String(((_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
-          num: Number(((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
+          original_amount: String(((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          num: Number(((_g = item == null ? void 0 : item.metadata) == null ? void 0 : _g.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
           metadata: item == null ? void 0 : item.metadata,
           discount: item == null ? void 0 : item.discount,
-          _num: Number(((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
+          _num: Number(((_h = item == null ? void 0 : item.metadata) == null ? void 0 : _h.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
         };
         const existed = discountMap.get(key);
         if (existed) {
@@ -166,7 +168,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           if (!isDiscountCard) {
             existed.balance = String(Number(existed.balance || 0) + amount);
           }
-          const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+          const productIds = Array.isArray((_i = existed.limited_relation_product_data) == null ? void 0 : _i.product_ids) ? existed.limited_relation_product_data.product_ids : [];
           if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
             existed.limited_relation_product_data = {
               ...existed.limited_relation_product_data || {},
@@ -189,9 +191,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           encoded: "",
           code: "",
           tag: type,
-          product_id: ((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          product_id: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
           relation_type: "",
-          par_value: String(((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          par_value: String(parValue ?? "0"),
           used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
           limit_status: "enable",
           limited_relation_product_data: {
@@ -221,8 +223,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: {
             ...(item == null ? void 0 : item.discount) || {},
             resource_id: key,
-            discount_product_id: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
-            discount_calculation_mode: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_calculation_mode) ?? "item_level"
+            discount_product_id: ((_k = item == null ? void 0 : item.discount) == null ? void 0 : _k.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_l = item == null ? void 0 : item.discount) == null ? void 0 : _l.discount_calculation_mode) ?? "item_level"
           },
           applicableProductDetails: [detail],
           appliedProductDetails: [detail]
@@ -274,7 +276,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const isPersistedBundleProduct = isPersistedProduct || Boolean(
           (bundle == null ? void 0 : bundle.order_detail_id) || (bundle == null ? void 0 : bundle.orderDetailId) || (bundle == null ? void 0 : bundle.booking_id)
         );
-        const bundleQty = new import_decimal.default(Number(qty) || 1).times(Number((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity) ?? 1) || 1).toNumber();
+        const bundleQty = Number(qty) || 1;
         for (const pd of (bundle == null ? void 0 : bundle.discount_list) || []) {
           addProductDiscountAmount(pd, bundleQty, isPersistedBundleProduct);
         }

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

@@ -486,6 +486,8 @@ export interface WalletPassPayment {
     importWalletAssetsSnapshot: (snapshot: WalletAssetsSnapshot) => WalletAssetsState;
     /** 设置单张钱包资产的选择状态并重新计算其实际抵扣额。 */
     selectWalletAsset: (assetId: WalletAssetId, options: SelectWalletAssetOptions) => WalletAssetsState;
+    /** 更新已选钱包资产的手动使用金额，并保持原有选择顺序重新计算。 */
+    updateWalletAssetAmount: (assetId: WalletAssetId, amount: number) => WalletAssetsState;
     /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
     scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
     /** 清空未确认的钱包资产选择。 */

package/lib/modules/Payment/utils.js

@@ -34,7 +34,11 @@ var formatWalletPassList2PreparePayments = (list) => {
   const formatted = (list || []).map((item) => {
     return {
       voucher_id: item.id || 0,
-      amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
+      // 前端策略重算后的 actualDeduction 才是最终可同步金额；
+      // edit_current_amount 只是用户请求值，仍可能被策略和订单剩余金额裁剪。
+      amount: Number(
+        item.actualDeduction ?? item.edit_current_amount ?? getAvailableMaxAmount(item)
+      ) || 0,
       tag: item.tag || "",
       wallet_pass_usage_unit: item.wallet_pass_usage_unit || {},
       wallet_pass_use_value: item.wallet_pass_use_value || void 0

package/lib/modules/Payment/walletpass.d.ts

@@ -24,6 +24,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private emitEvent;
     private publishWalletAssetsState;
     private recalculateWalletAssets;
+    /**
+     * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+     * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+     */
+    private formatSearchedWalletPaymentAssets;
     /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
     private getSearchedWalletAssetCodes;
     /**
@@ -106,7 +111,13 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     getWalletAssetsState(): WalletAssetsState;
     exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
     importWalletAssetsSnapshot(snapshot: WalletAssetsSnapshot): WalletAssetsState;
+    private updateWalletAssetEditAmountInCaches;
     selectWalletAsset(assetId: WalletAssetId, options: SelectWalletAssetOptions): WalletAssetsState;
+    /**
+     * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
+     * 金额为 0 时沿用 legacy 行为取消选择。
+     */
+    updateWalletAssetAmount(assetId: WalletAssetId, amount: number): WalletAssetsState;
     scanWalletAssetAsync(code: string): Promise<ScanWalletAssetResult>;
     clearWalletAssetSelection(): WalletAssetsState;
     setCommittedWalletAssets(committedIds: WalletAssetId[], committedAssets?: any[]): WalletAssetsState;