@pisell/pisellos 0.0.430 → 0.0.432

package/dist/model/strategy/adapter/walletPass/evaluator.js

@@ -78,6 +78,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
           var _item$strategyResult2;
           return _objectSpread(_objectSpread({}, item.voucher), {}, {
             config: _objectSpread({}, item === null || item === void 0 || (_item$strategyResult2 = item.strategyResult) === null || _item$strategyResult2 === void 0 ? void 0 : _item$strategyResult2.config.metadata.custom),
+            _unified_available_status: 0,
             reason: item.reason,
             reasonCode: item.reasonCode
           });

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -62,9 +62,12 @@ export interface Product {
         main_product_attached_bundle_tax_fee?: number;
         main_product_attached_bundle_surcharge_fee?: number;
         surcharge_rounding_remainder?: number;
+        tax_fee_rounding_remainder?: number;
         main_product_selling_price: number;
     };
+    is_price_include_tax: 0 | 1;
     product_bundle: {
+        is_price_include_tax: 0 | 1;
         bundle_id: number;
         bundle_product_id: number;
         bundle_variant_id: number;
@@ -77,6 +80,7 @@ export interface Product {
         metadata: {
             surcharge_fee: number;
             surcharge_rounding_remainder?: number;
+            tax_fee_rounding_remainder?: number;
         };
     }[];
 }

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -154,9 +154,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     if (allowCrossProduct) {
       // 跨商品券：可以抵扣多个商品
       if (applicableProductLimit > 0) {
-        // 有数量限制：按单价从高到低排序，按动态计算的可抵扣数量累计直到达到 limit
+        // 有数量限制：按剩余金额从高到低排序，按动态计算的可抵扣数量累计直到达到 limit
         var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-          return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+          return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
         });
         var remainingLimit = applicableProductLimit;
         var _iterator = _createForOfIteratorHelper(sortedProducts),
@@ -185,9 +185,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         }, new Decimal(0));
       }
     } else {
-      // 非跨商品券：只能抵扣单个商品（单价最高的）
+      // 非跨商品券：只能抵扣单个商品（剩余金额最高的）
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
       // 动态计算当前可抵扣数量
       var _currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
@@ -337,8 +337,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     if (allowCrossProduct) {
       // 跨商品券：按 quantity 限制计算可抵扣金额
       if (applicableProductLimit > 0) {
+        // 按剩余金额从高到低排序
         var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-          return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+          return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
         });
         var remainingLimit = applicableProductLimit;
         var _iterator2 = _createForOfIteratorHelper(sortedProducts),
@@ -367,9 +368,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         }, new Decimal(0));
       }
     } else {
-      // 非跨商品券：单个最高单价商品，也受 applicableProductLimit 限制
+      // 非跨商品券：单个剩余金额最高的商品，也受 applicableProductLimit 限制
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
       // 动态计算当前可抵扣数量
       var _currentAvailableQty2 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
@@ -387,9 +388,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
-      // 跨商品券：按单价从高到低抵扣，受 applicableProductLimit 限制
+      // 跨商品券：按剩余金额从高到低抵扣，受 applicableProductLimit 限制
       var _sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-        return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
       });
       var _remainingLimit = applicableProductLimit > 0 ? applicableProductLimit : Infinity;
       var _iterator3 = _createForOfIteratorHelper(_sortedProducts),
@@ -429,9 +430,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         _iterator3.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（单价最高的），也受 applicableProductLimit 限制
+      // 非跨商品券：只抵扣一个商品（剩余金额最高的），也受 applicableProductLimit 限制
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
 
       // 动态计算当前可抵扣数量
@@ -583,9 +584,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
-      // 跨商品券：按单价从高到低抵扣，受 applicableProductLimit 限制
+      // 跨商品券：按剩余金额从高到低抵扣，受 applicableProductLimit 限制
       var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-        return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+        return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
       });
       var remainingLimit = applicableProductLimit > 0 ? applicableProductLimit : Infinity;
       var _iterator4 = _createForOfIteratorHelper(sortedProducts),
@@ -625,9 +626,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         _iterator4.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（单价最高的），也受 applicableProductLimit 限制
+      // 非跨商品券：只抵扣一个商品（剩余金额最高的），也受 applicableProductLimit 限制
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
+        return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
 
       // 动态计算当前可抵扣数量
@@ -733,9 +734,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
           var baseAmount = Decimal.min(new Decimal(recommendedAmount), new Decimal(maxDeductionAmount));
           if (allowCrossProduct) {
             if (applicableProductLimit > 0) {
-              // 按单价从高到低排序，按动态计算的可抵扣数量累计直到达到 limit
+              // 按剩余金额从高到低排序，按动态计算的可抵扣数量累计直到达到 limit
               var sortedProducts = _toConsumableArray(applicableProducts).sort(function (a, b) {
-                return a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1;
+                return a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1;
               });
               var remainingLimit = applicableProductLimit;
               var _iterator5 = _createForOfIteratorHelper(sortedProducts),
@@ -764,9 +765,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
               }, new Decimal(0));
             }
           } else {
-            // 非跨商品券：单个最高单价商品，也受 applicableProductLimit 限制
+            // 非跨商品券：单个剩余金额最高的商品，也受 applicableProductLimit 限制
             var maxProduct = applicableProducts.reduce(function (max, p) {
-              return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
+              return p[amountField].greaterThan(max[amountField]) ? p : max;
             });
             // 动态计算当前可抵扣数量
             var _currentAvailableQty6 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
@@ -803,7 +804,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
  * @returns 商品价格
  */
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
-  var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4;
+  var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
   var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.main_product_selling_price) || 0);
   var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
     _step6;
@@ -818,16 +819,19 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
         mainProductPrice = mainProductPrice.add(bundleItemPrice.times(bundleItem.num));
       }
     }
-
-    // 税费
   } catch (err) {
     _iterator6.e(err);
   } finally {
     _iterator6.f();
   }
-  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_attached_bundle_tax_fee) || 0);
+  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_attached_bundle_tax_fee) || 0).add((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.tax_fee_rounding_remainder) || 0);
+  if (product.is_price_include_tax === 1) {
+    taxFee = new Decimal(0);
+  }
+
+  // 税费
   // 附加费
-  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.main_product_attached_bundle_surcharge_fee) || 0).add((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.surcharge_rounding_remainder) || 0);
+  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_attached_bundle_surcharge_fee) || 0).add((product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.surcharge_rounding_remainder) || 0);
 
   // 税费附加费总额
   var taxAndFeeTotal = taxFee.add(surchargeFee);
@@ -857,6 +861,9 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
     var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata;
     // 税费
     var taxFee = new Decimal((_bundleItem$tax_fee = bundleItem.tax_fee) !== null && _bundleItem$tax_fee !== void 0 ? _bundleItem$tax_fee : 0).times(totalQuantity);
+    if (bundleItem.is_price_include_tax === 1) {
+      taxFee = new Decimal(0);
+    }
     // 附加费
     var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
     bundleItemPrice = bundleItemPrice.add(taxFee).add(surchargeFee);

package/dist/modules/Payment/index.js

@@ -1186,6 +1186,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 创建时间
                 updated_at: currentTime,
                 // 更新时间
+                wallet_pass_usage_unit: paymentItem === null || paymentItem === void 0 ? void 0 : paymentItem.wallet_pass_usage_unit,
+                wallet_pass_use_value: paymentItem === null || paymentItem === void 0 ? void 0 : paymentItem.wallet_pass_use_value,
                 metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
                   // 保留传入的所有 metadata 字段
                   unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid

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

@@ -142,6 +142,10 @@ export interface PaymentItem {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
     updated_at?: string;
+    /** 钱包支付使用金额 */
+    wallet_pass_use_value?: any;
+    /** 钱包支付使用单位 */
+    wallet_pass_usage_unit?: any;
 }
 /**
  * 订单信息
@@ -258,6 +262,10 @@ export interface PaymentItemInput {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     updated_at?: string;
+    /** 钱包支付使用金额 */
+    wallet_pass_use_value?: any;
+    /** 钱包支付使用单位 */
+    wallet_pass_usage_unit?: any;
 }
 /**
  * 推送支付项参数
@@ -295,6 +303,10 @@ export interface PaymentUpdateFields {
         statusCode?: number;
         timestamp: number;
     };
+    /** 钱包支付使用金额 */
+    wallet_pass_use_value?: any;
+    /** 钱包支付使用单位 */
+    wallet_pass_usage_unit?: any;
 }
 /**
  * 更新支付项参数

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -403,6 +403,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             product_id: item.product_id,
             product_variant_id: item.product_variant_id,
             quantity: item.num,
+            is_price_include_tax: item.is_price_include_tax,
             // 商品是否含税：1；0
             is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -427,6 +428,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             },
             product_bundle: item.product_bundle.map(function (bundle) {
               return {
+                is_price_include_tax: item.is_price_include_tax,
                 bundle_id: bundle.bundle_id,
                 bundle_product_id: bundle.bundle_product_id,
                 bundle_variant_id: bundle.bundle_variant_id,

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -87,6 +87,7 @@ var WalletPassEvaluator = class {
           config: {
             ...(_b = item == null ? void 0 : item.strategyResult) == null ? void 0 : _b.config.metadata.custom
           },
+          _unified_available_status: 0,
           reason: item.reason,
           reasonCode: item.reasonCode
         };

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

@@ -62,9 +62,12 @@ export interface Product {
         main_product_attached_bundle_tax_fee?: number;
         main_product_attached_bundle_surcharge_fee?: number;
         surcharge_rounding_remainder?: number;
+        tax_fee_rounding_remainder?: number;
         main_product_selling_price: number;
     };
+    is_price_include_tax: 0 | 1;
     product_bundle: {
+        is_price_include_tax: 0 | 1;
         bundle_id: number;
         bundle_product_id: number;
         bundle_variant_id: number;
@@ -77,6 +80,7 @@ export interface Product {
         metadata: {
             surcharge_fee: number;
             surcharge_rounding_remainder?: number;
+            tax_fee_rounding_remainder?: number;
         };
     }[];
 }

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -103,7 +103,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     let finalApplicableAmount = new import_decimal.default(0);
     if (allowCrossProduct) {
       if (applicableProductLimit > 0) {
-        const sortedProducts = [...applicableProducts].sort((a, b) => a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1);
+        const sortedProducts = [...applicableProducts].sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1);
         let remainingLimit = applicableProductLimit;
         for (const product of sortedProducts) {
           if (remainingLimit <= 0)
@@ -125,7 +125,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
       const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
       const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
@@ -208,7 +208,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     let calculatedAvailableMaxAmount = new import_decimal.default(0);
     if (allowCrossProduct) {
       if (applicableProductLimit > 0) {
-        const sortedProducts = [...applicableProducts].sort((a, b) => a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1);
+        const sortedProducts = [...applicableProducts].sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1);
         let remainingLimit = applicableProductLimit;
         for (const product of sortedProducts) {
           if (remainingLimit <= 0)
@@ -230,7 +230,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
       const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
       const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
@@ -252,7 +252,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     const deductionDetails = [];
     if (allowCrossProduct) {
       const sortedProducts = [...applicableProducts].sort(
-        (a, b) => a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1
+        (a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1
       );
       let remainingLimit = applicableProductLimit > 0 ? applicableProductLimit : Infinity;
       for (const product of sortedProducts) {
@@ -281,7 +281,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
       const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
       const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
@@ -378,7 +378,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     const deductionDetails = [];
     if (allowCrossProduct) {
       const sortedProducts = [...applicableProducts].sort(
-        (a, b) => a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1
+        (a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1
       );
       let remainingLimit = applicableProductLimit > 0 ? applicableProductLimit : Infinity;
       for (const product of sortedProducts) {
@@ -407,7 +407,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
+        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
       const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
       const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
@@ -490,7 +490,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
           );
           if (allowCrossProduct) {
             if (applicableProductLimit > 0) {
-              const sortedProducts = [...applicableProducts].sort((a, b) => a[unitPriceField].comparedTo(b[unitPriceField]) > 0 ? -1 : 1);
+              const sortedProducts = [...applicableProducts].sort((a, b) => a[amountField].comparedTo(b[amountField]) > 0 ? -1 : 1);
               let remainingLimit = applicableProductLimit;
               for (const product of sortedProducts) {
                 if (remainingLimit <= 0)
@@ -512,7 +512,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
             }
           } else {
             const maxProduct = applicableProducts.reduce(
-              (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
+              (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
             );
             const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
             const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
@@ -547,7 +547,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
   };
 }
 var getMainProductPrice = (product, isDeductTaxAndFee) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   let mainProductPrice = new import_decimal.default((product == null ? void 0 : product.main_product_selling_price) || ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) || 0);
   for (let bundleItem of (product == null ? void 0 : product.product_bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
@@ -555,8 +555,11 @@ var getMainProductPrice = (product, isDeductTaxAndFee) => {
       mainProductPrice = mainProductPrice.add(bundleItemPrice.times(bundleItem.num));
     }
   }
-  const taxFee = new import_decimal.default((product == null ? void 0 : product.tax_fee) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.main_product_attached_bundle_tax_fee) || 0);
-  const surchargeFee = new import_decimal.default(((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.main_product_attached_bundle_surcharge_fee) || 0).add(((_d = product == null ? void 0 : product.metadata) == null ? void 0 : _d.surcharge_rounding_remainder) || 0);
+  let taxFee = new import_decimal.default((product == null ? void 0 : product.tax_fee) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.main_product_attached_bundle_tax_fee) || 0).add(((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.tax_fee_rounding_remainder) || 0);
+  if (product.is_price_include_tax === 1) {
+    taxFee = new import_decimal.default(0);
+  }
+  const surchargeFee = new import_decimal.default(((_d = product == null ? void 0 : product.metadata) == null ? void 0 : _d.main_product_attached_bundle_surcharge_fee) || 0).add(((_e = product == null ? void 0 : product.metadata) == null ? void 0 : _e.surcharge_rounding_remainder) || 0);
   const taxAndFeeTotal = taxFee.add(surchargeFee);
   if (isDeductTaxAndFee) {
     mainProductPrice = mainProductPrice.add(taxAndFeeTotal);
@@ -568,7 +571,10 @@ var getBundleItemPrice = (bundleItem, parentQuantity, isDeductTaxAndFee) => {
   const totalQuantity = bundleItem.num * parentQuantity;
   let bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? 0).times(totalQuantity);
   if (isDeductTaxAndFee) {
-    const taxFee = new import_decimal.default(bundleItem.tax_fee ?? 0).times(totalQuantity);
+    let taxFee = new import_decimal.default(bundleItem.tax_fee ?? 0).times(totalQuantity);
+    if (bundleItem.is_price_include_tax === 1) {
+      taxFee = new import_decimal.default(0);
+    }
     const surchargeFee = new import_decimal.default(((_a = bundleItem.metadata) == null ? void 0 : _a.surcharge_fee) ?? 0).times(totalQuantity);
     bundleItemPrice = bundleItemPrice.add(taxFee).add(surchargeFee);
   }

package/lib/modules/Payment/index.js

@@ -607,6 +607,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         // 创建时间
         updated_at: currentTime,
         // 更新时间
+        wallet_pass_usage_unit: paymentItem == null ? void 0 : paymentItem.wallet_pass_usage_unit,
+        wallet_pass_use_value: paymentItem == null ? void 0 : paymentItem.wallet_pass_use_value,
         metadata: {
           ...paymentItem.metadata,
           // 保留传入的所有 metadata 字段

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

@@ -142,6 +142,10 @@ export interface PaymentItem {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
     updated_at?: string;
+    /** 钱包支付使用金额 */
+    wallet_pass_use_value?: any;
+    /** 钱包支付使用单位 */
+    wallet_pass_usage_unit?: any;
 }
 /**
  * 订单信息
@@ -258,6 +262,10 @@ export interface PaymentItemInput {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     updated_at?: string;
+    /** 钱包支付使用金额 */
+    wallet_pass_use_value?: any;
+    /** 钱包支付使用单位 */
+    wallet_pass_usage_unit?: any;
 }
 /**
  * 推送支付项参数
@@ -295,6 +303,10 @@ export interface PaymentUpdateFields {
         statusCode?: number;
         timestamp: number;
     };
+    /** 钱包支付使用金额 */
+    wallet_pass_use_value?: any;
+    /** 钱包支付使用单位 */
+    wallet_pass_usage_unit?: any;
 }
 /**
  * 更新支付项参数

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/Checkout/index.js

@@ -222,6 +222,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           product_id: item.product_id,
           product_variant_id: item.product_variant_id,
           quantity: item.num,
+          is_price_include_tax: item.is_price_include_tax,
           // 商品是否含税：1；0
           is_charge_tax: item.is_charge_tax ?? 0,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -246,6 +247,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           },
           product_bundle: item.product_bundle.map((bundle) => {
             return {
+              is_price_include_tax: item.is_price_include_tax,
               bundle_id: bundle.bundle_id,
               bundle_product_id: bundle.bundle_product_id,
               bundle_variant_id: bundle.bundle_variant_id,

package/package.json

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