@pisell/pisellos 2.3.38 → 2.3.39

package/dist/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/dist/model/strategy/adapter/promotion/type.js

@@ -16,8 +16,6 @@ export 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',
   /** 固定减价 */
@@ -56,41 +54,6 @@ export var PROMOTION_ACTION_TYPES = {
  * 买X送Y - Action Config
  */
 
-/**
- * 商品奖励优惠方式
- *
- * - free: 目标商品最终价为 0
- * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
- * - amount_off: 每个目标商品固定减免 rewardValue
- * - fixed_price: 目标商品改为固定价 rewardValue
- */
-
-/**
- * 商品奖励数量规则
- *
- * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
- * - all_targets: 满足条件后奖励全部目标商品
- * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
- */
-
-/** 商品奖励目标选择规则 */
-
-/**
- * 商品奖励 - Action Value
- *
- * @example
- * value: {
- *   rewardMethod: 'free',
- *   quantityRule: 'per_condition_quantity',
- *   triggerQuantity: 1,
- *   rewardQuantity: 1,
- * }
- */
-
-/**
- * 商品奖励 - Action Config
- */
-
 // ============================================
 // 商品标识
 // ============================================
@@ -115,10 +78,6 @@ export var PROMOTION_ACTION_TYPES = {
  * 买X送Y Action
  */
 
-/**
- * 商品奖励 Action
- */
-
 /**
  * 促销活动 Action 联合类型
  */
@@ -187,10 +146,6 @@ var obj = {
  * 买X送Y Action 详情
  */
 
-/**
- * 商品奖励 Action 详情
- */
-
 // ============================================
 // 业务层输出类型（供参考）
 // ============================================

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

@@ -190,7 +190,7 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref12, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$order_detail, _ref12, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -257,7 +257,7 @@ export function buildCacheItemFromOrderLine(input) {
   if (Array.isArray(booking.relation_forms)) {
     extend.relation_forms = booking.relation_forms;
   }
-  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  var base = _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     extension_type: (_ref11 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
@@ -265,9 +265,7 @@ export function buildCacheItemFromOrderLine(input) {
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
     original_price: product.original_price
-  }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
-    product_sku: JSON.parse(JSON.stringify(product.product_sku))
-  } : {}), productOptionString ? {
+  }, productOptionString ? {
     product_option_string: productOptionString
   } : {}), {}, {
     _extend: extend,

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

@@ -75,7 +75,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail, _product$product_sku;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -127,7 +127,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend.skuValue = JSON.parse(JSON.stringify(originExtend.skuValue || originExtend._skuValue));
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  return _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
@@ -141,10 +141,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   } : {}), {}, {
     note: product.note,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    discount_list: discountList
-  }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
-    product_sku: JSON.parse(JSON.stringify(product.product_sku))
-  } : {}), {}, {
+    discount_list: discountList,
     new: 0,
     autoClose: true,
     _extend: extend

package/dist/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/dist/modules/Discount/index.js

@@ -244,6 +244,35 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return batchSearch;
     }()
+  }, {
+    key: "batchSearchByProductIds",
+    value: function () {
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productIds) {
+        var result;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this.request.get("/machinecode/batch-search", {
+                ids: productIds,
+                translate_flag: 1,
+                tags: ['good_pass', 'product_discount_card'],
+                relation_product: 1
+              });
+            case 2:
+              result = _context6.sent;
+              return _context6.abrupt("return", (result === null || result === void 0 ? void 0 : result.data) || []);
+            case 4:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function batchSearchByProductIds(_x8) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }()
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
@@ -430,22 +459,22 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context6.next = 4;
+              _context7.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
               _get(_getPrototypeOf(DiscountModule.prototype), "destroy", this).call(this);
             case 6:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -455,18 +484,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.store.discountList = [];
               this.store.originalDiscountList = [];
               console.log('[Discount] clear');
             case 3:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

package/dist/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/dist/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;
+}