@pisell/pisellos 2.0.42 → 2.0.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -330,7 +330,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
330
330
|
// 找到适用于此商品的所有优惠券,仅考虑isSelected不为false的优惠券
|
|
331
331
|
var applicableDiscounts = sortedDiscountList.filter(function (discount) {
|
|
332
332
|
// 如果商品价格为 0,其实不需要使用任何优惠券,直接 return true
|
|
333
|
-
if (Number(product.price) === 0 || !product.price) return false;
|
|
333
|
+
if (Number(product.price) === 0 && discount.tag === 'good_pass' || Number(product.total) === 0 && discount.tag !== 'good_pass' || !product.price) return false;
|
|
334
334
|
// 如果优惠券已被使用,则跳过
|
|
335
335
|
var targetUsedDiscounts = usedDiscounts.get(discount.id);
|
|
336
336
|
if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
|
|
@@ -504,7 +504,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
504
504
|
return n.id === id;
|
|
505
505
|
});
|
|
506
506
|
var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
|
|
507
|
-
return Number(product === null || product === void 0 ? void 0 : product.
|
|
507
|
+
return Number(product === null || product === void 0 ? void 0 : product.total) === 0;
|
|
508
508
|
};
|
|
509
509
|
var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
|
|
510
510
|
var _item$applicableProdu2;
|
|
@@ -213,7 +213,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
213
213
|
return;
|
|
214
214
|
}
|
|
215
215
|
const applicableDiscounts = sortedDiscountList.filter((discount) => {
|
|
216
|
-
if (Number(product.price) === 0 || !product.price)
|
|
216
|
+
if (Number(product.price) === 0 && discount.tag === "good_pass" || Number(product.total) === 0 && discount.tag !== "good_pass" || !product.price)
|
|
217
217
|
return false;
|
|
218
218
|
const targetUsedDiscounts = usedDiscounts.get(discount.id);
|
|
219
219
|
if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
|
|
@@ -346,7 +346,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
|
|
|
346
346
|
var _a3;
|
|
347
347
|
const targetProduct = productList.find((n) => n.id === id);
|
|
348
348
|
const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
|
|
349
|
-
return Number(product == null ? void 0 : product.
|
|
349
|
+
return Number(product == null ? void 0 : product.total) === 0;
|
|
350
350
|
};
|
|
351
351
|
const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
|
|
352
352
|
var _a3;
|