@pisell/pisellos 1.0.83 → 1.0.85

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.
Files changed (5) hide show
  1. package/dist/modules/Rules/index.js +2 -2
  2. package/dist/solution/ShopDiscount/index.js +6 -5
  3. package/lib/modules/Rules/index.js +2 -2
  4. package/lib/solution/ShopDiscount/index.js +7 -7
  5. package/package.json +1 -1
package/dist/modules/Rules/index.js CHANGED
@@ -229,7 +229,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
229
229
  original_price: bundleItem.original_price,
230
230
  // 继承主商品属性
231
231
  booking_id: product.booking_id,
232
- discount_list: []
232
+ discount_list: bundleItem.discount_list || []
233
233
  });
234
234
  });
235
235
  }
@@ -396,7 +396,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
396
396
  total: flatItem.total,
397
397
  origin_total: flatItem.origin_total,
398
398
  booking_id: flatItem.booking_id,
399
- discount_list: []
399
+ discount_list: flatItem.discount_list || []
400
400
  };
401
401
  originProduct = flatItem.originProduct;
402
402
  }
package/dist/solution/ShopDiscount/index.js CHANGED
@@ -495,13 +495,12 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
495
495
  return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
496
496
  });
497
497
  if (index !== -1) {
498
- var _discount$metadata;
499
498
  editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
500
499
  amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
501
- savedAmount: new Decimal(discount.amount || 0).times((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
500
+ savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
502
501
  });
503
502
  } else {
504
- var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
503
+ var _discount$discount2, _discount$discount3, _discount$discount4;
505
504
  if (discount.type && !discount.tag) {
506
505
  discount.tag = discount.type;
507
506
  }
@@ -509,7 +508,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
509
508
  name: discount.name || discount.discount.title.auto,
510
509
  isEditMode: true,
511
510
  limited_relation_product_data: {},
512
- savedAmount: discount.amount * ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) || (product === null || product === void 0 ? void 0 : product.num) || 1),
511
+ savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1),
513
512
  isAvailable: true,
514
513
  id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
515
514
  format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -536,7 +535,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
536
535
  // 如果 product.vouchersApplicable是布尔值，并且是 false，也当做免费商品处理，此商品不可用优惠券或折扣卡
537
536
  return Number(product === null || product === void 0 ? void 0 : product.total) <= 0 && (Number(product === null || product === void 0 ? void 0 : product.origin_total) <= 0 || !(product !== null && product !== void 0 && product.origin_total)) || isBoolean(product === null || product === void 0 ? void 0 : product.vouchersApplicable) && !(product !== null && product !== void 0 && product.vouchersApplicable);
538
537
  };
539
- var allUsedProductIds = newDiscountList.map(function (n) {
538
+ var allUsedProductIds = newDiscountList.filter(function (item) {
539
+ return !(item !== null && item !== void 0 && item.isEditMode);
540
+ }).map(function (n) {
540
541
  var _n$appliedProductDeta;
541
542
  return n.isSelected ? ((_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
542
543
  var _n$discount;
package/lib/modules/Rules/index.js CHANGED
@@ -167,7 +167,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
167
167
  original_price: bundleItem.original_price,
168
168
  // 继承主商品属性
169
169
  booking_id: product.booking_id,
170
- discount_list: []
170
+ discount_list: bundleItem.discount_list || []
171
171
  });
172
172
  });
173
173
  }
@@ -260,7 +260,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
260
260
  total: flatItem.total,
261
261
  origin_total: flatItem.origin_total,
262
262
  booking_id: flatItem.booking_id,
263
- discount_list: []
263
+ discount_list: flatItem.discount_list || []
264
264
  };
265
265
  originProduct = flatItem.originProduct;
266
266
  }
package/lib/solution/ShopDiscount/index.js CHANGED
@@ -314,7 +314,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
314
314
  if (item.booking_id) {
315
315
  const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
316
316
  (item.discount_list || []).forEach((discount) => {
317
- var _a3, _b, _c, _d, _e;
317
+ var _a3, _b, _c;
318
318
  if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
319
319
  const index = editModeDiscountList.findIndex((n) => {
320
320
  var _a4;
@@ -324,7 +324,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
324
324
  editModeDiscountList[index] = {
325
325
  ...editModeDiscountList[index],
326
326
  amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
327
- savedAmount: new import_decimal.default(discount.amount || 0).times(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.num) || (product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
327
+ savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
328
328
  };
329
329
  } else {
330
330
  if (discount.type && !discount.tag) {
@@ -335,13 +335,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
335
335
  name: discount.name || discount.discount.title.auto,
336
336
  isEditMode: true,
337
337
  limited_relation_product_data: {},
338
- savedAmount: discount.amount * (((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.num) || (product == null ? void 0 : product.num) || 1),
338
+ savedAmount: discount.amount * ((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1),
339
339
  isAvailable: true,
340
- id: ((_c = discount.discount) == null ? void 0 : _c.resource_id) || discount.id,
341
- format_title: ((_d = discount.discount) == null ? void 0 : _d.title) || discount.format_title,
340
+ id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
341
+ format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
342
342
  isDisabled: true,
343
343
  isSelected: true,
344
- product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
344
+ product_id: ((_c = discount.discount) == null ? void 0 : _c.product_id) || discount.product_id
345
345
  });
346
346
  }
347
347
  }
@@ -360,7 +360,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
360
360
  const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
361
361
  return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
362
362
  };
363
- const allUsedProductIds = newDiscountList.map((n) => {
363
+ const allUsedProductIds = newDiscountList.filter((item) => !(item == null ? void 0 : item.isEditMode)).map((n) => {
364
364
  var _a2;
365
365
  return n.isSelected ? ((_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
366
366
  var _a3;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "@pisell/pisellos",
4
- "version": "1.0.83",
4
+ "version": "1.0.85",
5
5
  "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",