@pisell/pisellos 1.0.94 → 1.0.95

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

@@ -64,7 +64,9 @@ export interface Product {
         surcharge_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;

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());
@@ -818,14 +819,17 @@ 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);
+  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);
 
@@ -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/Rules/index.d.ts

@@ -16,7 +16,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     getRulesList(): Rules[];
     private checkHolderMatch;
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, orderTotalAmount, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, orderTotalAmount, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
@@ -24,18 +24,20 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
             form_record_id: number;
         }[];
         orderTotalAmount: number;
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, holders, orderTotalAmount }: {
+    calcDiscount({ discountList, productList, holders, orderTotalAmount, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
         orderTotalAmount: number;
+        isFormSubject: boolean;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/dist/modules/Rules/index.js

@@ -130,7 +130,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
         holders = _ref.holders,
-        orderTotalAmount = _ref.orderTotalAmount;
+        orderTotalAmount = _ref.orderTotalAmount,
+        isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
         return {
@@ -162,7 +163,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
         holders: holders,
-        orderTotalAmount: orderTotalAmount
+        orderTotalAmount: orderTotalAmount,
+        isFormSubject: isFormSubject
       }, {
         scan: true
       });
@@ -206,7 +208,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
-        orderTotalAmount = _ref2.orderTotalAmount;
+        orderTotalAmount = _ref2.orderTotalAmount,
+        isFormSubject = _ref2.isFormSubject;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -501,7 +504,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: _tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
@@ -643,7 +646,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: _tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           // 如果 holder 不匹配，则不适用

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

@@ -26,6 +26,7 @@ export interface RulesModuleAPI {
             form_record_id: number;
         }[];
         orderTotalAmount: number;
+        isFormSubject: boolean;
     }) => DiscountResult;
 }
 type ProductDetail = {

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/dist/solution/ShopDiscount/index.d.ts

@@ -25,6 +25,10 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -55,7 +55,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      orderTotalAmount: 0
+      orderTotalAmount: 0,
+      bookingSubject: undefined
     };
     return _this;
   }
@@ -300,11 +301,17 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setHolders(holders) {
       this.store.holders = holders;
     }
+  }, {
+    key: "setBookingSubject",
+    value: function setBookingSubject(bookingSubject) {
+      this.store.bookingSubject = bookingSubject;
+    }
 
     // 计算优惠券
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
+      var _this$store$bookingSu;
       this.store.productList = productList;
       var rulesModule = this.core.getModule("".concat(this.name, "_rules"));
       if (!rulesModule) {
@@ -317,7 +324,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           productList: productList,
           discountList: this.getDiscountList(),
           holders: this.store.holders || [],
-          orderTotalAmount: this.store.orderTotalAmount || 0
+          orderTotalAmount: this.store.orderTotalAmount || 0,
+          isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -390,7 +398,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -457,7 +465,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
                 holders: this.store.holders || [],
-                orderTotalAmount: this.store.orderTotalAmount || 0
+                orderTotalAmount: this.store.orderTotalAmount || 0,
+                isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],

package/dist/solution/ShopDiscount/types.d.ts

@@ -32,6 +32,10 @@ export interface ShopDiscountState {
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
     orderTotalAmount?: number;
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

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

@@ -64,7 +64,9 @@ export interface Product {
         surcharge_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;

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;
@@ -555,7 +555,10 @@ 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);
+  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);
+  if (product.is_price_include_tax === 1) {
+    taxFee = new import_decimal.default(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);
   const taxAndFeeTotal = taxFee.add(surchargeFee);
   if (isDeductTaxAndFee) {
@@ -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/Rules/index.d.ts

@@ -16,7 +16,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     getRulesList(): Rules[];
     private checkHolderMatch;
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, orderTotalAmount, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, orderTotalAmount, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
@@ -24,18 +24,20 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
             form_record_id: number;
         }[];
         orderTotalAmount: number;
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, holders, orderTotalAmount }: {
+    calcDiscount({ discountList, productList, holders, orderTotalAmount, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
         orderTotalAmount: number;
+        isFormSubject: boolean;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/lib/modules/Rules/index.js

@@ -81,7 +81,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     newDiscountList,
     productList,
     holders,
-    orderTotalAmount
+    orderTotalAmount,
+    isFormSubject
   }) {
     if (!newDiscountList || newDiscountList.length === 0) {
       return {
@@ -112,7 +113,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       discountList: mergedDiscountList,
       productList: [...productList],
       holders,
-      orderTotalAmount
+      orderTotalAmount,
+      isFormSubject
     }, {
       scan: true
     });
@@ -146,7 +148,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList,
     holders,
-    orderTotalAmount
+    orderTotalAmount,
+    isFormSubject
   }, options) {
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
@@ -344,7 +347,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: _tempVar == null ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
@@ -465,7 +468,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: _tempVar == null ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders

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

@@ -26,6 +26,7 @@ export interface RulesModuleAPI {
             form_record_id: number;
         }[];
         orderTotalAmount: number;
+        isFormSubject: boolean;
     }) => DiscountResult;
 }
 type ProductDetail = {

package/lib/solution/BookingTicket/index.js

@@ -122,6 +122,12 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 初始化外设扫码结果监听
+   */
+  initPeripheralsListener() {
+    this.scan.initPeripheralsListener();
+  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表

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/lib/solution/ShopDiscount/index.d.ts

@@ -25,6 +25,10 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -55,7 +55,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      orderTotalAmount: 0
+      orderTotalAmount: 0,
+      bookingSubject: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -200,8 +201,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setHolders(holders) {
     this.store.holders = holders;
   }
+  setBookingSubject(bookingSubject) {
+    this.store.bookingSubject = bookingSubject;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
+    var _a;
     this.store.productList = productList;
     const rulesModule = this.core.getModule(`${this.name}_rules`);
     if (!rulesModule) {
@@ -212,7 +217,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList,
         discountList: this.getDiscountList(),
         holders: this.store.holders || [],
-        orderTotalAmount: this.store.orderTotalAmount || 0
+        orderTotalAmount: this.store.orderTotalAmount || 0,
+        isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
       options
     ) || { productList, discountList: this.getDiscountList() };
@@ -259,7 +265,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 扫码输入code
   async scanCode(code, customerId) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
       const rulesModule = this.store.rules;
@@ -303,7 +309,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
         holders: this.store.holders || [],
-        orderTotalAmount: this.store.orderTotalAmount || 0
+        orderTotalAmount: this.store.orderTotalAmount || 0,
+        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -313,7 +320,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && ((_b = this.options.otherParams) == null ? void 0 : _b.platform) === "shop") {
+        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
           await this.getCustomerWallet(
             resultDiscountList[0].customer_id
           );

package/lib/solution/ShopDiscount/types.d.ts

@@ -32,6 +32,10 @@ export interface ShopDiscountState {
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
     orderTotalAmount?: number;
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/package.json

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