@pisell/pisellos 2.2.9 → 2.2.10

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

@@ -623,7 +623,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       this.logInfo("更新订单支付项完成", {
         orderUuid
       });
-      this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
+      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         payment: newPaymentItem
       });

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

@@ -671,6 +671,7 @@ export interface WalletInitBusinessData {
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
+    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/lib/modules/Payment/walletpass.js

@@ -51,10 +51,19 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a, _b;
-    const { customer_id, holder, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
+    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

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

@@ -37,6 +37,13 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
+    /**
+     * 检查优惠是否符合 PackageSubItemUsageRules 配置
+     * @param discount 优惠券
+     * @param flatItem 扁平化后的商品项（可能是主商品或bundle子商品）
+     * @returns 是否可用
+     */
+    private checkPackageSubItemUsageRules;
     destroy(): Promise<void>;
     clear(): Promise<void>;
 }