@pisell/pisellos 2.2.267 → 2.2.269

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

@@ -27,6 +27,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }): {
         isAvailable: boolean;
         discountList: Discount[];
+        /** 完整规则计算后的列表；调用方可用于保留暂时无适用商品的扫码卡券。 */
+        evaluatedDiscountList?: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
     };
@@ -35,6 +37,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
+    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -94,7 +94,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    if (productList.every((item) => {
+    if (productList.length > 0 && productList.every((item) => {
       var _a;
       const product = this.hooks.getProduct(item);
       return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || product.total == 0);
@@ -152,6 +152,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     return {
       isAvailable: hasApplicableDiscount,
       discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
+      evaluatedDiscountList: result.discountList,
       productList: hasApplicableDiscount ? result.productList : productList,
       unavailableReason
     };
@@ -167,13 +168,27 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   resolveDiscountListForManualOverride(discountList) {
     return this.excludeDiscountListByType(discountList, "promotion");
   }
+  isItemRewardProductDiscount(product) {
+    var _a;
+    const discountList = Array.isArray(product == null ? void 0 : product.discount_list) ? product.discount_list : [];
+    return ((_a = product == null ? void 0 : product._promotion) == null ? void 0 : _a.actionType) === "ITEM_REWARD" && discountList.some(
+      (item) => {
+        var _a2, _b;
+        return (item == null ? void 0 : item.type) === "product" && ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+      }
+    );
+  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
     for (const discount of discountList) {
-      for (const item of productList) {
+      const bookingTimes = productList.length ? productList.map((item) => {
         const product = this.hooks.getProduct(item);
-        const bookingTime = ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss");
+        return ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
+      }) : [(0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")];
+      for (const bookingTime of bookingTimes) {
         const filteredList = (0, import_utils.filterDiscountListByBookingTime)([discount], bookingTime);
         if (filteredList.length === 0) {
           return import_types.UnavailableReason.TimeLimit;
@@ -228,7 +243,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const discountType = selectedDiscount.tag || selectedDiscount.type;
       return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
     };
-    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+    const resolveReapplyBookingDiscountPercent = (originProduct, selectedDiscount) => {
       var _a2;
       if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
         return void 0;
@@ -302,8 +317,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
-              id: bundleItem._bundle_product_id,
-              // 🔥 使用 _bundle_product_id
+              // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+              // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+              // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
+              id: bundleItem.bundle_product_id ?? bundleItem._bundle_product_id ?? bundleItem.product_id,
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
               num: bundleItem.num || 1,
@@ -500,6 +517,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           startDate: (_a2 = flatItem.parentProduct) == null ? void 0 : _a2.startDate
         };
       }
+      if (this.isItemRewardProductDiscount(product)) {
+        return false;
+      }
       const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.length) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.every((d) => d.id && ["good_pass", "discount_card", "product_discount_card"].includes(d.tag || d.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_e = (_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.length) && ((_g = (_f = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _f.discount_list) == null ? void 0 : _g.every((d) => d.id)));
       if (!isAvailableProduct) {
         return false;
@@ -625,6 +645,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
+      const isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
       addModeDiscount.forEach((discount) => {
         var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
@@ -648,7 +669,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           ].includes(discount2.tag || discount2.type)
         ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
+        if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
           (_h = discountApplicability.get(discount.id)) == null ? void 0 : _h.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -759,18 +780,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isPersistedProduct && hasExistingWalletDiscount) {
         if (flatItem.type === "main") {
           processedProductsMap.set(product._id, [originProduct]);
-        } else {
-          processedFlatItemsMap.set(flatItem._id, [
-            {
-              ...flatItem,
-              processed: true
-            }
-          ]);
         }
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a3, _b2, _c2, _d2;
+        if (this.isItemRewardProductDiscount(product))
+          return false;
         const discountType = discount.tag || discount.type;
         const currentOriginUid = getOriginProductUid(originProduct);
         const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
@@ -840,11 +856,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscountCard = applicableDiscounts.find(
+      const explicitlySelectedDiscountCard = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
+        const discountType = discount.tag || discount.type;
+        return String(discount.id) === String(options.discountId) && ["discount_card", "product_discount_card"].includes(discountType);
+      }) : void 0;
+      const scannedSelectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
+      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
+      let isItemRewardProductDiscount = false;
       if (flatItem.type === "main") {
         isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : ((_g = product.discount_list) == null ? void 0 : _g.some((item) => item.type === "product")) || product.total != product.origin_total && (product.bundle || []).every(
           (item) => {
@@ -855,7 +877,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _i,
           (item) => item.type === "product"
         )));
-        if (product.inPromotion) {
+        isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
+        if (product.inPromotion && !isItemRewardProductDiscount) {
           isManualDiscount = false;
         }
       } else {
@@ -969,7 +992,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           } else {
             let total = product.inPromotion ? ((_w = product == null ? void 0 : product._promotion) == null ? void 0 : _w.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
             let main_product_selling_price = product.price;
-            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || isItemRewardProductDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
               total = product.total ?? product.origin_total;
               main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
             }
@@ -977,7 +1000,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
                   price: product.price,
-                  main_product_selling_price: product.price
+                  main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price,
+                  ...isItemRewardProductDiscount ? { total } : {}
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
@@ -1061,8 +1085,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
-          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
-            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2);
             reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
             mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
             amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
@@ -1235,10 +1259,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let targetProductTotal;
           let fixedAmountPerItem;
           let productDiscountDifference;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             fixedAmountPerItem = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(
+              originProduct,
+              selectedDiscount2
+            );
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            targetProductTotal = new import_decimal.default(productOriginTotal).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           } else {
             targetProductTotal = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1260,7 +1293,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
               product_id: product.id || product.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             metadata: {

package/lib/modules/SalesSummary/utils.js

@@ -99,7 +99,11 @@ function getUnitOriginalTotal(product) {
 function isGeneratedVoucherProduct(product) {
   const record = product;
   const metadata = (record == null ? void 0 : record.metadata) || {};
-  return (record == null ? void 0 : record.extension_type) === "product_voucher" || metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  const isGeneratedChild = metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  if (isGeneratedChild)
+    return true;
+  const isPersisted = (record == null ? void 0 : record.order_detail_id) !== void 0 && (record == null ? void 0 : record.order_detail_id) !== null;
+  return (record == null ? void 0 : record.extension_type) === "product_voucher" && !isPersisted;
 }
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {

package/lib/server/index.d.ts

@@ -57,6 +57,7 @@ declare class Server {
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
     private salesSearchSubscribers;
     private deviceTaskActionsRegistered;
+    private localPaymentUpdateQueues;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -120,6 +121,8 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
+    private buildRemoteCheckoutData;
+    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
@@ -453,6 +456,18 @@ declare class Server {
      */
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
+    private handleOrderSalesDraft;
+    private createLocalPaymentOperationId;
+    private buildLocalPaymentOrderLogContext;
+    private isValidLocalPaymentDecimal;
+    private getInvalidLocalPaymentSurchargeFields;
+    private buildLocalPaymentSurchargeUpdate;
+    private handleGetLocalPayment;
+    private handleUpdateLocalPayment;
+    private runLocalPaymentUpdateInQueue;
+    private processLocalPaymentUpdate;
+    private processSuccessfulLocalPayment;
+    private sanitizeLocalRecoveryOrder;
     private handleOrderCheckout;
     private getDeviceTaskPlugin;
     private getIdGeneratorPlugin;
@@ -480,6 +495,7 @@ declare class Server {
     private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
+    private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
     private shouldBuildSmallTicketData;