@pisell/pisellos 2.1.49 → 2.1.51

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

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

package/dist/modules/Payment/walletpass.js

@@ -63,12 +63,14 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         amountInfo = businessData.amountInfo,
         products = businessData.products,
         order_wait_pay_amount = businessData.order_wait_pay_amount,
-        payment_order_id = businessData.payment_order_id;
+        payment_order_id = businessData.payment_order_id,
+        is_price_include_tax = businessData.is_price_include_tax;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
       var subTotal = Number(amountInfo.subTotal);
       var walletParams = {
+        is_price_include_tax: is_price_include_tax,
         sale_channel: 'pos',
         customer_id: customer_id || 0,
         // 提供默认值，确保类型为 number

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

@@ -142,10 +142,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 遍历处理后的产品列表，检查是否有产品使用了新折扣
       result.productList.forEach(function (product) {
         var _this2$hooks$getProdu = _this2.hooks.getProduct(product),
-          discount_list = _this2$hooks$getProdu.discount_list;
-        if (discount_list && discount_list.length > 0) {
+          discount_list = _this2$hooks$getProdu.discount_list,
+          bundle = _this2$hooks$getProdu.bundle;
+        var allDiscountList = _toConsumableArray(discount_list || []);
+        (bundle || []).forEach(function (item) {
+          allDiscountList.push.apply(allDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+        });
+        if (allDiscountList && allDiscountList.length > 0) {
           // 检查是否有使用新折扣的情况
-          var usedNewDiscount = discount_list.some(function (discount) {
+          var usedNewDiscount = allDiscountList.some(function (discount) {
             var _discount$discount;
             return newDiscountIds.includes(discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id);
           });

package/dist/solution/BookingByStep/index.d.ts

@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -417,6 +417,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             main_product_original_price: item.price,
             // 主商品折扣后金额，不包含套餐子商品
             main_product_selling_price: item.main_product_selling_price,
+            metadata: {
+              // 主商品+非原价(加减价)子商品税费
+              "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+              // 主商品+非原价(加减价)子商品附加费
+              "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+              // 可选，附加费均摊舍入金额
+              "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+            },
             product_bundle: item.product_bundle.map(function (bundle) {
               return {
                 bundle_id: bundle.bundle_id,
@@ -428,7 +436,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 bundle_sum_price: bundle.bundle_sum_price,
                 // 套餐子商品折扣后金额
                 bundle_selling_price: bundle.bundle_selling_price,
-                num: bundle.num
+                num: bundle.num,
+                is_charge_tax: bundle.is_charge_tax,
+                tax_fee: bundle.tax_fee,
+                metadata: {
+                  // 子商品单数量附加费
+                  "surcharge_fee": bundle.metadata.surcharge_fee,
+                  // 可选，附加费均摊舍入金额
+                  "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+                }
               };
             })
           };
@@ -473,7 +489,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   depositAmount: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.deposit_amount,
                   isDeposit: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.is_deposit
                 },
-                products: this.getProductListByOrder()
+                products: this.getProductListByOrder(),
+                is_price_include_tax: this.otherParams.is_price_include_tax
               }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
               if (this.store.isOrderSynced) {
                 walletBusinessData.payment_order_id = (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_id;

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

@@ -652,6 +652,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,18 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a;
-    const { customer_id, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
+    const {
+      customer_id,
+      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/Rules/index.js

@@ -95,9 +95,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     let hasApplicableDiscount = false;
     const newDiscountIds = newDiscountList.map((discount) => discount.id);
     result.productList.forEach((product) => {
-      const { discount_list } = this.hooks.getProduct(product);
-      if (discount_list && discount_list.length > 0) {
-        const usedNewDiscount = discount_list.some(
+      const { discount_list, bundle } = this.hooks.getProduct(product);
+      const allDiscountList = [...discount_list || []];
+      (bundle || []).forEach((item) => {
+        allDiscountList.push(...(item == null ? void 0 : item.discount_list) || []);
+      });
+      if (allDiscountList && allDiscountList.length > 0) {
+        const usedNewDiscount = allDiscountList.some(
           (discount) => {
             var _a;
             return newDiscountIds.includes((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id);

package/lib/solution/BookingByStep/index.d.ts

@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/Checkout/index.js

@@ -236,6 +236,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           main_product_original_price: item.price,
           // 主商品折扣后金额，不包含套餐子商品
           main_product_selling_price: item.main_product_selling_price,
+          metadata: {
+            // 主商品+非原价(加减价)子商品税费
+            "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+            // 主商品+非原价(加减价)子商品附加费
+            "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+            // 可选，附加费均摊舍入金额
+            "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+          },
           product_bundle: item.product_bundle.map((bundle) => {
             return {
               bundle_id: bundle.bundle_id,
@@ -247,7 +255,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
               bundle_sum_price: bundle.bundle_sum_price,
               // 套餐子商品折扣后金额
               bundle_selling_price: bundle.bundle_selling_price,
-              num: bundle.num
+              num: bundle.num,
+              is_charge_tax: bundle.is_charge_tax,
+              tax_fee: bundle.tax_fee,
+              metadata: {
+                // 子商品单数量附加费
+                "surcharge_fee": bundle.metadata.surcharge_fee,
+                // 可选，附加费均摊舍入金额
+                "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+              }
             };
           })
         })
@@ -287,6 +303,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         isDeposit: (_e = this.store.currentOrder) == null ? void 0 : _e.is_deposit
       },
       products: this.getProductListByOrder(),
+      is_price_include_tax: this.otherParams.is_price_include_tax,
+      // core 有
       ...params
     };
     if (this.store.isOrderSynced) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.49",
+  "version": "2.1.51",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",