@pisell/pisellos 2.3.38 → 2.3.40

package/lib/model/strategy/adapter/promotion/examples.js

@@ -20,7 +20,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var examples_exports = {};
 __export(examples_exports, {
   BUY_X_GET_Y_FREE_STRATEGY: () => BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => ITEM_REWARD_STRATEGY,
   X_ITEMS_FOR_Y_PRICE_STRATEGY: () => X_ITEMS_FOR_Y_PRICE_STRATEGY
 });
 module.exports = __toCommonJS(examples_exports);
@@ -186,98 +185,8 @@ var BUY_X_GET_Y_FREE_STRATEGY = {
     }
   ]
 };
-var ITEM_REWARD_STRATEGY = {
-  metadata: {
-    id: "STRATEGY_003",
-    name: {
-      en: "Infant ticket free with child ticket",
-      "zh-CN": "儿童票触发婴儿票免费",
-      "zh-HK": "兒童票觸發嬰兒票免費"
-    },
-    type: "promotion",
-    custom: {
-      display: {
-        product_card: {
-          text: {
-            en: "Infant ticket free",
-            "zh-CN": "婴儿票免费",
-            "zh-HK": "嬰兒票免費"
-          },
-          type: "tag"
-        }
-      }
-    }
-  },
-  conditions: {
-    operator: "and",
-    rules: [
-      {
-        type: "operator",
-        field: "currentDateTime",
-        value: "2023-01-01 00:00:00",
-        operator: ">="
-      },
-      {
-        type: "operator",
-        field: "currentDateTime",
-        value: "2030-01-01 00:00:00",
-        operator: "<="
-      },
-      {
-        type: "operator",
-        field: "productIdAndVariantId",
-        value: [
-          {
-            product_id: 1001,
-            // 条件商品：儿童票
-            product_variant_id: 0
-            // 0 = 匹配任意变体
-          }
-        ],
-        operator: "product_match"
-      }
-    ],
-    actionIds: ["1"]
-  },
-  actions: [
-    {
-      id: "1",
-      type: "ITEM_REWARD",
-      value: {
-        rewardMethod: "free",
-        // free | percent_off | amount_off | fixed_price
-        rewardValue: 0,
-        // free 可省略；其他 rewardMethod 使用
-        quantityRule: "per_condition_quantity",
-        // per_condition_quantity | all_targets | max_per_order
-        triggerQuantity: 1,
-        // N：每满足 N 个条件商品
-        rewardQuantity: 1,
-        // Y：奖励 Y 个目标商品
-        maxRewardQuantity: 1
-        // max_per_order 使用；本例保留为配置示意
-      },
-      valueType: "object",
-      target: "product",
-      priority: 1,
-      config: {
-        rewardTargets: [
-          {
-            product_id: 2001,
-            // 奖励对象：婴儿票
-            product_variant_id: 0
-            // 0 = 匹配任意变体
-          }
-        ],
-        targetSelection: "consumer_best"
-        // consumer_best = 按可节省金额从高到低选择
-      }
-    }
-  ]
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
   X_ITEMS_FOR_Y_PRICE_STRATEGY
 });

package/lib/model/strategy/adapter/promotion/index.d.ts

@@ -1,4 +1,4 @@
 export { PromotionEvaluator } from './evaluator';
 export { PromotionAdapter } from './adapter';
 export { default } from './adapter';
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY, } from './examples';
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, } from './examples';

package/lib/model/strategy/adapter/promotion/index.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var promotion_exports = {};
 __export(promotion_exports, {
   BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
   PromotionAdapter: () => import_adapter.PromotionAdapter,
   PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
   X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
@@ -44,7 +43,6 @@ var import_examples = require("./examples");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
   PromotionAdapter,
   PromotionEvaluator,
   X_ITEMS_FOR_Y_PRICE_STRATEGY

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

@@ -12,8 +12,6 @@ export declare const PROMOTION_ACTION_TYPES: {
     readonly X_ITEMS_FOR_Y_PRICE: "X_ITEMS_FOR_Y_PRICE";
     /** 买X送Y（买X件送Y件，可累计） */
     readonly BUY_X_GET_Y_FREE: "BUY_X_GET_Y_FREE";
-    /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
-    readonly ITEM_REWARD: "ITEM_REWARD";
     /** 固定折扣 */
     readonly DISCOUNT_RATE: "DISCOUNT_RATE";
     /** 固定减价 */
@@ -68,59 +66,6 @@ export interface BuyXGetYFreeConfig {
     /** 可选的赠品列表 */
     giftProducts?: ProductIdentifier[];
 }
-/**
- * 商品奖励优惠方式
- *
- * - free: 目标商品最终价为 0
- * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
- * - amount_off: 每个目标商品固定减免 rewardValue
- * - fixed_price: 目标商品改为固定价 rewardValue
- */
-export type ItemRewardMethod = 'free' | 'percent_off' | 'amount_off' | 'fixed_price';
-/**
- * 商品奖励数量规则
- *
- * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
- * - all_targets: 满足条件后奖励全部目标商品
- * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
- */
-export type ItemRewardQuantityRule = 'per_condition_quantity' | 'all_targets' | 'max_per_order';
-/** 商品奖励目标选择规则 */
-export type ItemRewardTargetSelection = 'consumer_best';
-/**
- * 商品奖励 - Action Value
- *
- * @example
- * value: {
- *   rewardMethod: 'free',
- *   quantityRule: 'per_condition_quantity',
- *   triggerQuantity: 1,
- *   rewardQuantity: 1,
- * }
- */
-export interface ItemRewardValue {
-    /** 奖励方式 */
-    rewardMethod: ItemRewardMethod;
-    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 可省略 */
-    rewardValue?: number;
-    /** 奖励数量规则 */
-    quantityRule: ItemRewardQuantityRule;
-    /** 每满足 N 个条件商品；默认 1 */
-    triggerQuantity?: number;
-    /** 奖励 Y 个目标商品；默认 1 */
-    rewardQuantity?: number;
-    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
-    maxRewardQuantity?: number;
-}
-/**
- * 商品奖励 - Action Config
- */
-export interface ItemRewardConfig {
-    /** 奖励对象，本期支持指定商品/变体；product_variant_id=0 表示任意变体 */
-    rewardTargets?: ProductIdentifier[];
-    /** 目标商品超额时的选择规则；本期支持 consumer_best */
-    targetSelection?: ItemRewardTargetSelection;
-}
 /**
  * 商品标识
  *
@@ -157,19 +102,10 @@ export interface BuyXGetYFreeAction extends Omit<ActionEffect, 'type' | 'value'
     valueType: 'object';
     config?: BuyXGetYFreeConfig;
 }
-/**
- * 商品奖励 Action
- */
-export interface ItemRewardAction extends Omit<ActionEffect, 'type' | 'value' | 'config'> {
-    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
-    value: ItemRewardValue;
-    valueType: 'object';
-    config?: ItemRewardConfig;
-}
 /**
  * 促销活动 Action 联合类型
  */
-export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction | ItemRewardAction;
+export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction;
 /**
  * 促销相关运算符
  */
@@ -234,8 +170,6 @@ export interface PromotionProduct {
     quantity: number;
     /** 原价 */
     original_price?: number;
-    /** 内部字段：编辑态订单行只允许参与 ITEM_REWARD，避免旧促销误算历史行 */
-    _promotionOnlyForItemReward?: boolean;
 }
 /**
  * 促销活动适配器转换结果
@@ -261,7 +195,7 @@ export interface PromotionTransformResult {
 /**
  * Action 详情联合类型
  */
-export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail | ItemRewardActionDetail;
+export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail;
 /**
  * X件Y元 Action 详情
  */
@@ -292,28 +226,6 @@ export interface BuyXGetYFreeActionDetail {
     /** 可选的赠品列表 */
     giftProducts: ProductIdentifier[];
 }
-/**
- * 商品奖励 Action 详情
- */
-export interface ItemRewardActionDetail {
-    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
-    /** 奖励方式 */
-    rewardMethod: ItemRewardMethod;
-    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 为 0 */
-    rewardValue: number;
-    /** 奖励数量规则 */
-    quantityRule: ItemRewardQuantityRule;
-    /** 每满足 N 个条件商品；默认 1 */
-    triggerQuantity: number;
-    /** 奖励 Y 个目标商品；默认 1 */
-    rewardQuantity: number;
-    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
-    maxRewardQuantity?: number;
-    /** 奖励对象，本期支持指定商品/变体 */
-    rewardTargets: ProductIdentifier[];
-    /** 目标商品超额时的选择规则 */
-    targetSelection: ItemRewardTargetSelection;
-}
 /**
  * X件Y元 - 业务层计算结果
  *

package/lib/model/strategy/adapter/promotion/type.js

@@ -28,8 +28,6 @@ var PROMOTION_ACTION_TYPES = {
   X_ITEMS_FOR_Y_PRICE: "X_ITEMS_FOR_Y_PRICE",
   /** 买X送Y（买X件送Y件，可累计） */
   BUY_X_GET_Y_FREE: "BUY_X_GET_Y_FREE",
-  /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
-  ITEM_REWARD: "ITEM_REWARD",
   /** 固定折扣 */
   DISCOUNT_RATE: "DISCOUNT_RATE",
   /** 固定减价 */

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

@@ -184,7 +184,7 @@ function synthesizeProductResourceFromBooking(booking) {
   };
 }
 function buildCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   const { product, booking, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
@@ -259,7 +259,6 @@ function buildCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,
-    ...Number(((_g = product.product_sku) == null ? void 0 : _g.open_sold_weight) || 0) === 1 ? { product_sku: JSON.parse(JSON.stringify(product.product_sku)) } : {},
     ...productOptionString ? { product_option_string: productOptionString } : {},
     _extend: extend,
     new: 0,

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

@@ -78,7 +78,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 function buildNormalProductCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e;
   const { product, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const sourcePrice = resolveSourceProductPrice(product, sourceProduct);
@@ -144,7 +144,6 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
     discount_list: discountList,
-    ...Number(((_f = product.product_sku) == null ? void 0 : _f.open_sold_weight) || 0) === 1 ? { product_sku: JSON.parse(JSON.stringify(product.product_sku)) } : {},
     new: 0,
     autoClose: true,
     _extend: extend

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

@@ -32,6 +32,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         customerId?: number;
         orderId?: number;
     }): Promise<DiscountWithReason>;
+    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;

package/lib/modules/Discount/index.js

@@ -147,6 +147,15 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountWithReason;
   }
+  async batchSearchByProductIds(productIds) {
+    const result = await this.request.get(`/machinecode/batch-search`, {
+      ids: productIds,
+      translate_flag: 1,
+      tags: ["good_pass", "product_discount_card"],
+      relation_product: 1
+    });
+    return (result == null ? void 0 : result.data) || [];
+  }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
       (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)

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

@@ -157,6 +157,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
     unified_available_status?: number | undefined | null;
 }

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

@@ -0,0 +1,48 @@
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, IRefreshAllFormRecordsParams, HolderModuleAPI, HolderFormMap } from './types';
+export * from './types';
+export * from './utils';
+export declare class HolderModule extends BaseModule implements Module, HolderModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    private request;
+    private cacheId;
+    private openCache;
+    private fatherModule;
+    private isLoading;
+    private error;
+    /** 已加载过表单数据的 form_id 缓存标记 */
+    private loadedFormIds;
+    private window;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /** 统一提交 formMap，仅此处触发 store changed */
+    private commitFormMap;
+    /** 通知 UI 刷新（数据未变但需要 re-read 的场景） */
+    private notifyFormMapChanged;
+    getHolderFormMap(): HolderFormMap;
+    getHolderFormData(formId: number | string): IFormItemData | undefined;
+    setFormData(formId: number | string, data: Partial<IFormItemData>): void;
+    private ensureFormItem;
+    private hasFormData;
+    private patchFormMap;
+    fetchFormInfo(params: IFetchFormInfoParams): Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords(params: IFetchFormRecordsParams): Promise<any>;
+    ensureFormData(params: IEnsureFormDataParams): Promise<IFormItemData>;
+    ensureFormByProduct(params: IEnsureFormByProductParams): Promise<IFormItemData | null>;
+    addFormRecord(params: IAddFormRecordParams): Promise<any>;
+    /**
+     * UI 层自行请求添加接口后，将返回记录合并到 holderMap 对应 form_id 的 records 中
+     */
+    appendFormRecord(params: IAppendFormRecordParams): IFormRecord;
+    removeFormRecord(formId: number | string, formRecordId: number): void;
+    clearFormData(formId?: number | string): void;
+    /**
+     * 登录后按当前 holderMap 批量刷新所有表单的 records。
+     * 遍历 holderMap，从 form.form 中读取 form_id、shop_id，结合 customer_id 重新拉取记录。
+     */
+    refreshAllFormRecords(params?: IRefreshAllFormRecordsParams): Promise<HolderFormMap>;
+    storeChange(path?: string): void;
+}