@pisell/pisellos 3.0.63 → 3.0.64
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.
|
@@ -343,7 +343,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
343
343
|
console.log(sortedProductList, 'sortedProductListsortedProductList');
|
|
344
344
|
|
|
345
345
|
// 然后再处理应用哪些优惠券,此时只考虑filteredDiscountList中的优惠券
|
|
346
|
-
sortedProductList.forEach(function (originProduct,
|
|
346
|
+
sortedProductList.forEach(function (originProduct, index) {
|
|
347
347
|
var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10;
|
|
348
348
|
var product = _this3.hooks.getProduct(originProduct);
|
|
349
349
|
if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
|
|
@@ -425,7 +425,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
425
425
|
}))]);
|
|
426
426
|
} else {
|
|
427
427
|
processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
|
|
428
|
-
_id: product._id.split('___')[0] + '___' +
|
|
428
|
+
_id: product._id.split('___')[0] + '___' + index,
|
|
429
429
|
total: product.origin_total || product.total,
|
|
430
430
|
price: product.price
|
|
431
431
|
}), {}, {
|
|
@@ -453,10 +453,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
453
453
|
_id: product._id.split('___')[0]
|
|
454
454
|
}));
|
|
455
455
|
}
|
|
456
|
-
for (var
|
|
456
|
+
for (var i = 0; i < splitCount; i++) {
|
|
457
457
|
var _product$discount_lis11, _originProduct$_produ, _selectedDiscount$met;
|
|
458
458
|
// 如果用过折扣卡,也就不存在拆分的情况了,这里直接使用上面计算出来的折扣卡
|
|
459
|
-
var _selectedDiscount = selectedDiscountCard || applicableDiscounts[
|
|
459
|
+
var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
|
|
460
460
|
// 标记优惠券为已使用
|
|
461
461
|
usedDiscounts.set(_selectedDiscount.id, true);
|
|
462
462
|
|
|
@@ -514,7 +514,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
514
514
|
} else {
|
|
515
515
|
arr.push(_this3.hooks.setProduct(originProduct, {
|
|
516
516
|
discount_list: [discountDetail],
|
|
517
|
-
_id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
|
|
517
|
+
_id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
|
|
518
518
|
price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
|
|
519
519
|
quantity: isNeedSplit ? 1 : product.quantity,
|
|
520
520
|
total: targetProductTotal,
|
|
@@ -224,7 +224,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
224
224
|
});
|
|
225
225
|
});
|
|
226
226
|
console.log(sortedProductList, "sortedProductListsortedProductList");
|
|
227
|
-
sortedProductList.forEach((originProduct,
|
|
227
|
+
sortedProductList.forEach((originProduct, index) => {
|
|
228
228
|
var _a, _b, _c, _d, _e, _f, _g, _h, _i;
|
|
229
229
|
const product = this.hooks.getProduct(originProduct);
|
|
230
230
|
if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
|
|
@@ -292,7 +292,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
292
292
|
product._id,
|
|
293
293
|
[this.hooks.setProduct(originProduct, {
|
|
294
294
|
...isManualDiscount ? {} : {
|
|
295
|
-
_id: product._id.split("___")[0] + "___" +
|
|
295
|
+
_id: product._id.split("___")[0] + "___" + index,
|
|
296
296
|
total: product.origin_total || product.total,
|
|
297
297
|
price: product.price
|
|
298
298
|
},
|
|
@@ -315,8 +315,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
315
315
|
_id: product._id.split("___")[0]
|
|
316
316
|
}));
|
|
317
317
|
}
|
|
318
|
-
for (let
|
|
319
|
-
const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[
|
|
318
|
+
for (let i = 0; i < splitCount; i++) {
|
|
319
|
+
const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
|
|
320
320
|
usedDiscounts.set(selectedDiscount2.id, true);
|
|
321
321
|
const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
|
|
322
322
|
let productOriginTotal = product.origin_total || product.total || 0;
|
|
@@ -362,7 +362,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
362
362
|
} else {
|
|
363
363
|
arr.push(this.hooks.setProduct(originProduct, {
|
|
364
364
|
discount_list: [discountDetail],
|
|
365
|
-
_id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
|
|
365
|
+
_id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
|
|
366
366
|
price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
|
|
367
367
|
quantity: isNeedSplit ? 1 : product.quantity,
|
|
368
368
|
total: targetProductTotal,
|