@pisell/pisellos 2.2.8 → 2.2.10

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

@@ -15,11 +15,16 @@ interface Formattitle {
     'zh-CN'?: any;
     'zh-HK'?: any;
 }
+interface PackageSubItemUsageRules {
+    type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
+    rules: ("original_price" | "markup_price")[];
+}
 interface Limitedrelationproductdata {
     id: number;
     type: 'product_all' | 'products' | 'product_collection';
     product_ids: number[];
     product_collection_id: number[];
+    package_sub_item_usage_rules?: PackageSubItemUsageRules;
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -29,12 +34,14 @@ interface ApplicableProductDetails {
     original_amount: string;
     num: number;
     discount?: {
+        fixed_amount?: number;
         product_id?: number;
         original_amount?: string;
         percent?: string;
         resource_id?: number;
         title?: string;
     };
+    _num: number;
 }
 interface UsageCreditsValue {
     total_credits: number;
@@ -72,6 +79,8 @@ export interface Discount {
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
+        custom_product_bundle_map_id?: string;
+        validity_type?: "custom_schedule_validity" | "fixed_validity";
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -98,9 +107,16 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    num?: number;
+    start_date?: string;
+    start_time?: string;
 }
 export interface DiscountState {
     discountList: Discount[];
+    originalDiscountList?: Discount[];
 }
 export interface DiscountModuleAPI {
     setDiscountList: (discountList: Discount[]) => Promise<void>;

package/lib/modules/Order/index.js

@@ -115,6 +115,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           item._origin.duration = duration;
           item._origin.sub_type = durationType;
         }
+        const discountList = (0, import_utils.getAllDiscountList)(item);
+        item._origin.product.discount_list = discountList;
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

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

@@ -20,3 +20,4 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export declare const getAllDiscountList: (cartItem: CartItem) => any;

package/lib/modules/Order/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   generateDuration: () => generateDuration,
+  getAllDiscountList: () => getAllDiscountList,
   mergeRelationForms: () => mergeRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
@@ -55,8 +56,18 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
+var getAllDiscountList = (cartItem) => {
+  var _a, _b, _c, _d;
+  let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
+  (((_d = (_c = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []).forEach((item) => {
+    discountList = [...discountList, ...item.discount_list || []];
+    item.discount_list = void 0;
+  });
+  return discountList;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateDuration,
+  getAllDiscountList,
   mergeRelationForms
 });

package/lib/modules/Payment/cash.js

@@ -35,7 +35,7 @@ var CashPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: cashMethod.code,
-      id: cashMethod.id,
+      custom_payment_id: cashMethod.id,
       name: cashMethod.name,
       type: cashMethod.type,
       voucher_id: ""

package/lib/modules/Payment/eftpos.js

@@ -34,7 +34,7 @@ var EftposPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: eftposMethod.code,
-      id: eftposMethod.id,
+      custom_payment_id: eftposMethod.id,
       name: eftposMethod.name,
       type: eftposMethod.type,
       voucher_id: ""

package/lib/modules/Payment/index.js

@@ -41,6 +41,15 @@ function formatAmount(amount) {
     return "0.00";
   }
 }
+function formatDateTime(date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
 function generateRequestUniqueId() {
   const now = /* @__PURE__ */ new Date();
   const year = now.getFullYear();
@@ -308,7 +317,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    */
   async getPaymentOrderByUuidAsync(orderUuid) {
     try {
-      return await this.dbManager.get("order", orderUuid);
+      return await this.dbManager.get("order", orderUuid, true);
     } catch (error) {
       console.error("[PaymentModule] 获取支付订单失败", error);
       return null;
@@ -337,8 +346,35 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         is_deposit: params.is_deposit || 0,
         deposit_amount: params.deposit_amount || "0.00"
       };
+      if (params.existPayment && params.existPayment.length > 0) {
+        const currentTime = formatDateTime(/* @__PURE__ */ new Date());
+        newOrder.payment = params.existPayment.map((payment) => ({
+          ...payment,
+          isSynced: true,
+          // 标记为已同步
+          status: payment.status || "active",
+          // 如果云端支付项已有时间戳，则保留；否则使用当前时间
+          created_at: payment.created_at || currentTime,
+          updated_at: payment.updated_at || currentTime
+        }));
+        this.recalculateOrderAmount(newOrder);
+        this.logInfo("创建订单时包含云端支付项", {
+          orderId: params.order_id,
+          existPaymentCount: params.existPayment.length,
+          totalAmount: newOrder.total_amount,
+          expectAmount: newOrder.expect_amount,
+          paymentDetails: params.existPayment.map((p) => ({
+            uuid: p.uuid,
+            code: p.code,
+            amount: p.amount,
+            status: p.status,
+            created_at: p.created_at,
+            updated_at: p.updated_at
+          }))
+        });
+      }
       const dbAddStartTime = Date.now();
-      await this.dbManager.add("order", newOrder);
+      await this.dbManager.add("order", newOrder, true);
       const dbAddDuration = Date.now() - dbAddStartTime;
       this.logInfo("Database add operation completed", {
         operation: "dbManager.add",
@@ -502,7 +538,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 为某个订单添加支付项（新方法）
    */
   async addPaymentItemAsync(orderUuid, paymentItem) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
@@ -510,7 +546,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       orderPaymentType: paymentItem.order_payment_type
     });
     try {
+      this.logInfo("准备获取订单", {
+        orderUuid
+      });
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
+      this.logInfo("获取订单信息成功", {
+        orderUuid,
+        order
+      });
       if (!order) {
         throw new Error(`Order not found: ${orderUuid}`);
       }
@@ -538,10 +581,16 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
+      const currentTime = formatDateTime(/* @__PURE__ */ new Date());
       const newPaymentItem = {
         uuid: paymentUuid,
-        id: paymentItem.id || 0,
+        custom_payment_id: paymentItem.custom_payment_id || 0,
         name: paymentItem.name,
         code: paymentItem.code,
         type: paymentItem.type,
@@ -553,6 +602,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         // 新支付项默认为活跃状态
         order_payment_type: paymentItem.order_payment_type || "normal",
         // 默认为正常支付
+        created_at: currentTime,
+        // 创建时间
+        updated_at: currentTime,
+        // 更新时间
         metadata: {
           ...paymentItem.metadata,
           // 保留传入的所有 metadata 字段
@@ -562,23 +615,30 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       };
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
-      await this.dbManager.update("order", order);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      this.logInfo("开始更新订单支付项", {
+        orderUuid,
+        order
+      });
+      await this.dbManager.update("order", order, true);
+      this.logInfo("更新订单支付项完成", {
+        orderUuid
+      });
+      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         payment: newPaymentItem
       });
       this.logInfo("addPaymentItemAsync completed successfully", {
         orderUuid,
         paymentUuid: newPaymentItem.uuid,
-        uniquePaymentNumber: (_a = newPaymentItem.metadata) == null ? void 0 : _a.unique_payment_number,
+        uniquePaymentNumber: (_b = newPaymentItem.metadata) == null ? void 0 : _b.unique_payment_number,
         newExpectAmount: order.expect_amount,
         paymentAmount: newPaymentItem.amount,
         paymentCode: newPaymentItem.code,
         orderPaymentType: newPaymentItem.order_payment_type,
         metadataFields: Object.keys(newPaymentItem.metadata || {}),
         // 现金支付找零信息
-        actualPaidAmount: (_b = newPaymentItem.metadata) == null ? void 0 : _b.actual_paid_amount,
-        changeGivenAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.change_given_amount
+        actualPaidAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
       });
     } catch (error) {
       console.error("[PaymentModule] 添加支付项失败", error);
@@ -797,7 +857,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           uuid: payment.uuid,
           amount: payment.amount,
           code: payment.code,
-          id: payment.id,
+          custom_payment_id: payment.custom_payment_id,
           name: payment.name,
           type: payment.type,
           voucher_id: payment.voucher_id,

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

@@ -96,7 +96,7 @@ export interface PaymentItem {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -138,6 +138,10 @@ export interface PaymentItem {
         statusCode?: number;
         timestamp: number;
     };
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    created_at?: string;
+    /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    updated_at?: string;
 }
 /**
  * 订单信息
@@ -200,6 +204,8 @@ export interface PushOrderParams {
     deposit_amount?: string;
     /** 原始订单数据（可选，由 Checkout 模块传入） */
     order_info?: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 更新订单参数
@@ -219,7 +225,7 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -248,6 +254,10 @@ export interface PaymentItemInput {
         /** 找零金额（现金支付时的找零金额） */
         change_given_amount?: number;
     };
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
+    created_at?: string;
+    /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
+    updated_at?: string;
 }
 /**
  * 推送支付项参数
@@ -598,6 +608,8 @@ export interface WalletDeductionRecommendParams {
     expect_columns?: string[];
     /** 客户id */
     customer_id?: number;
+    /** 客户holder_id */
+    holder_id?: number;
     /** 订单总计金额 */
     order_expect_amount: number;
     /** 订单小计金额 */
@@ -616,6 +628,8 @@ export interface WalletDeductionRecommendParams {
         quantity: number;
         /** 商品使用了所有优惠后的最终价格 */
         selling_price: number;
+        /** 客户holder_id */
+        holder_id?: number;
     }[];
     /** 预备支付 */
     prepare_payments?: {
@@ -633,6 +647,10 @@ export interface WalletDeductionRecommendParams {
 export interface WalletInitBusinessData {
     /** 客户ID（可选） */
     customer_id?: number;
+    /** 客户 holder */
+    holder?: {
+        form_record: number[];
+    };
     /** 金额信息 */
     amountInfo: {
         totalAmount: string;
@@ -648,10 +666,12 @@ export interface WalletInitBusinessData {
         product_variant_id: string;
         quantity: number;
         selling_price: number;
+        holder_id?: number;
     }[];
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
+    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/lib/modules/Payment/walletpass.js

@@ -50,14 +50,24 @@ var WalletPassPaymentImpl = class {
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
    */
   generateWalletParams(businessData) {
-    var _a;
-    const { customer_id, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
+    var _a, _b;
+    const {
+      customer_id,
+      holder,
+      amountInfo,
+      products,
+      order_wait_pay_amount,
+      payment_order_id,
+      is_price_include_tax
+    } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
+      is_price_include_tax,
       sale_channel: "pos",
       customer_id: customer_id || 0,
       // 提供默认值，确保类型为 number
+      holder_id: ((_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[0]) || void 0,
       order_expect_amount: totalAmount,
       // 订单小计金额
       order_product_amount: subTotal,
@@ -71,10 +81,11 @@ var WalletPassPaymentImpl = class {
     this.walletParams = walletParams;
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
       customer_id: walletParams.customer_id,
+      holder_id: walletParams.holder_id,
       order_expect_amount: walletParams.order_expect_amount,
       order_product_amount: walletParams.order_product_amount,
       order_wait_pay_amount: walletParams.order_wait_pay_amount,
-      products_count: ((_a = walletParams.products) == null ? void 0 : _a.length) || 0
+      products_count: ((_b = walletParams.products) == null ? void 0 : _b.length) || 0
     });
     return walletParams;
   }
@@ -387,7 +398,7 @@ var WalletPassPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: walletMethod.code,
-      id: walletMethod.id,
+      custom_payment_id: walletMethod.id,
       name: walletMethod.name,
       type: walletMethod.type,
       voucher_id: voucherId || ""

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/ProductList/index.js

@@ -103,13 +103,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { osServer: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    if (sortedList.length) {
-      sortedList.forEach((n) => {
-        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
-          n.is_eject = 1;
-        }
-      });
-    }
     this.addProduct(sortedList);
     return sortedList;
   }

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

@@ -12,24 +12,38 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, }: {
+    private checkHolderMatch;
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, }: {
+    calcDiscount({ discountList, productList, holders, }: {
         discountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
         selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
+    /**
+     * 检查优惠是否符合 PackageSubItemUsageRules 配置
+     * @param discount 优惠券
+     * @param flatItem 扁平化后的商品项（可能是主商品或bundle子商品）
+     * @returns 是否可用
+     */
+    private checkPackageSubItemUsageRules;
     destroy(): Promise<void>;
     clear(): Promise<void>;
 }