@pisell/pisellos 0.0.101 → 0.0.103
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.
|
@@ -180,6 +180,12 @@ export var formatDiscountToCartItemOrigin = function formatDiscountToCartItemOri
|
|
|
180
180
|
origin.product = {};
|
|
181
181
|
}
|
|
182
182
|
origin.product.discount_list = discounts;
|
|
183
|
+
} else {
|
|
184
|
+
// 如果折扣为空,则清空折扣列表
|
|
185
|
+
if (!origin.product) {
|
|
186
|
+
origin.product = {};
|
|
187
|
+
}
|
|
188
|
+
origin.product.discount_list = [];
|
|
183
189
|
}
|
|
184
190
|
return origin;
|
|
185
191
|
};
|
|
@@ -107,7 +107,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
// 合并新旧折扣列表,并计算折扣结果
|
|
110
|
-
var mergedDiscountList = uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList)));
|
|
110
|
+
var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
|
|
111
111
|
var result = this.calcDiscount({
|
|
112
112
|
discountList: mergedDiscountList,
|
|
113
113
|
productList: _toConsumableArray(productList)
|
|
@@ -187,6 +187,11 @@ var formatDiscountToCartItemOrigin = (params) => {
|
|
|
187
187
|
origin.product = {};
|
|
188
188
|
}
|
|
189
189
|
origin.product.discount_list = discounts;
|
|
190
|
+
} else {
|
|
191
|
+
if (!origin.product) {
|
|
192
|
+
origin.product = {};
|
|
193
|
+
}
|
|
194
|
+
origin.product.discount_list = [];
|
|
190
195
|
}
|
|
191
196
|
return origin;
|
|
192
197
|
};
|
|
@@ -58,10 +58,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
|
|
|
58
58
|
productList
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
-
const mergedDiscountList = (0, import_utils.uniqueById)([
|
|
61
|
+
const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
|
|
62
62
|
...oldDiscountList,
|
|
63
63
|
...newDiscountList
|
|
64
|
-
]);
|
|
64
|
+
]), "product_id");
|
|
65
65
|
const result = this.calcDiscount({
|
|
66
66
|
discountList: mergedDiscountList,
|
|
67
67
|
productList: [...productList]
|