@pisell/pisellos 0.0.265 → 0.0.266
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.
|
@@ -349,7 +349,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
349
349
|
console.log(sortedProductList, 'sortedProductListsortedProductList');
|
|
350
350
|
|
|
351
351
|
// 然后再处理应用哪些优惠券,此时只考虑filteredDiscountList中的优惠券
|
|
352
|
-
sortedProductList.forEach(function (originProduct,
|
|
352
|
+
sortedProductList.forEach(function (originProduct, index) {
|
|
353
353
|
var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10, _product$discount_lis11;
|
|
354
354
|
var product = _this3.hooks.getProduct(originProduct);
|
|
355
355
|
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) {
|
|
@@ -441,7 +441,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
441
441
|
}))]);
|
|
442
442
|
} else {
|
|
443
443
|
processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
|
|
444
|
-
_id: product._id.split('___')[0] + '___' +
|
|
444
|
+
_id: product._id.split('___')[0] + '___' + index,
|
|
445
445
|
total: product.origin_total || product.total,
|
|
446
446
|
price: product.price
|
|
447
447
|
}), {}, {
|
|
@@ -469,10 +469,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
469
469
|
_id: product._id.split('___')[0]
|
|
470
470
|
}));
|
|
471
471
|
}
|
|
472
|
-
for (var
|
|
472
|
+
for (var i = 0; i < splitCount; i++) {
|
|
473
473
|
var _product$discount_lis12, _originProduct$_produ, _selectedDiscount$met;
|
|
474
474
|
// 如果用过折扣卡,也就不存在拆分的情况了,这里直接使用上面计算出来的折扣卡
|
|
475
|
-
var _selectedDiscount = selectedDiscountCard || applicableDiscounts[
|
|
475
|
+
var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
|
|
476
476
|
// 标记优惠券为已使用
|
|
477
477
|
usedDiscounts.set(_selectedDiscount.id, true);
|
|
478
478
|
|
|
@@ -534,7 +534,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
534
534
|
} else {
|
|
535
535
|
arr.push(_this3.hooks.setProduct(originProduct, {
|
|
536
536
|
discount_list: [discountDetail],
|
|
537
|
-
_id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
|
|
537
|
+
_id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
|
|
538
538
|
price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
|
|
539
539
|
quantity: isNeedSplit ? 1 : product.quantity,
|
|
540
540
|
total: targetProductTotal,
|
|
@@ -228,7 +228,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
228
228
|
});
|
|
229
229
|
});
|
|
230
230
|
console.log(sortedProductList, "sortedProductListsortedProductList");
|
|
231
|
-
sortedProductList.forEach((originProduct,
|
|
231
|
+
sortedProductList.forEach((originProduct, index) => {
|
|
232
232
|
var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
|
|
233
233
|
const product = this.hooks.getProduct(originProduct);
|
|
234
234
|
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)))) {
|
|
@@ -305,7 +305,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
305
305
|
product._id,
|
|
306
306
|
[this.hooks.setProduct(originProduct, {
|
|
307
307
|
...isManualDiscount ? {} : {
|
|
308
|
-
_id: product._id.split("___")[0] + "___" +
|
|
308
|
+
_id: product._id.split("___")[0] + "___" + index,
|
|
309
309
|
total: product.origin_total || product.total,
|
|
310
310
|
price: product.price
|
|
311
311
|
},
|
|
@@ -328,8 +328,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
328
328
|
_id: product._id.split("___")[0]
|
|
329
329
|
}));
|
|
330
330
|
}
|
|
331
|
-
for (let
|
|
332
|
-
const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[
|
|
331
|
+
for (let i = 0; i < splitCount; i++) {
|
|
332
|
+
const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
|
|
333
333
|
usedDiscounts.set(selectedDiscount2.id, true);
|
|
334
334
|
const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
|
|
335
335
|
let productOriginTotal = product.origin_total || product.total || 0;
|
|
@@ -377,7 +377,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
377
377
|
} else {
|
|
378
378
|
arr.push(this.hooks.setProduct(originProduct, {
|
|
379
379
|
discount_list: [discountDetail],
|
|
380
|
-
_id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
|
|
380
|
+
_id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
|
|
381
381
|
price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
|
|
382
382
|
quantity: isNeedSplit ? 1 : product.quantity,
|
|
383
383
|
total: targetProductTotal,
|