@pisell/pisellos 1.0.82 → 1.0.83

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 (3) hide show
  1. package/dist/modules/Rules/index.js +21 -13
  2. package/lib/modules/Rules/index.js +38 -24
  3. package/package.json +1 -1
package/dist/modules/Rules/index.js CHANGED
@@ -974,9 +974,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
974
974
  processedItems.forEach(function (item) {
975
975
  // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
976
976
  var updatedDiscountList = (item.discount_list || []).map(function (discount) {
977
+ var _item$metadata;
977
978
  return _objectSpread(_objectSpread({}, discount), {}, {
978
979
  metadata: {
979
- num: item.num
980
+ num: item.num,
981
+ custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
980
982
  }
981
983
  // num: item.num, // 使用拆分后的 num
982
984
  });
@@ -995,9 +997,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
995
997
  if (item.processed) {
996
998
  // 🔥 同样需要更新 discount_list 中的 num
997
999
  var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
1000
+ var _item$metadata2;
998
1001
  return _objectSpread(_objectSpread({}, discount), {}, {
999
1002
  metadata: {
1000
- num: item.num
1003
+ num: item.num,
1004
+ custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
1001
1005
  }
1002
1006
  // num: item.num, // 使用当前的 num
1003
1007
  });
@@ -1021,7 +1025,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1021
1025
 
1022
1026
  // 🔥 更新主商品自己的 discount_list 中的 num（quantity=1）
1023
1027
  var updatedMainDiscountList = mainProductData.discount_list.map(function (discount) {
1024
- var _discount$metadata2;
1028
+ var _discount$metadata2, _discount$metadata3;
1025
1029
  if (discount !== null && discount !== void 0 && (_discount$metadata2 = discount.metadata) !== null && _discount$metadata2 !== void 0 && _discount$metadata2.custom_product_bundle_map_id) {
1026
1030
  // bundle的discount_list保持不变
1027
1031
  return discount;
@@ -1030,6 +1034,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1030
1034
  return _objectSpread(_objectSpread({}, discount), {}, {
1031
1035
  // num: 1,
1032
1036
  metadata: {
1037
+ custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.custom_product_bundle_map_id,
1033
1038
  num: 1
1034
1039
  }
1035
1040
  });
@@ -1037,8 +1042,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1037
1042
 
1038
1043
  // 🔥 使用更新后的列表计算折扣金额
1039
1044
  var mainDiscountList = updatedMainDiscountList.filter(function (item) {
1040
- var _item$metadata;
1041
- return !(item !== null && item !== void 0 && (_item$metadata = item.metadata) !== null && _item$metadata !== void 0 && _item$metadata.custom_product_bundle_map_id);
1045
+ var _item$metadata3;
1046
+ return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
1042
1047
  });
1043
1048
  if (mainDiscountList && mainDiscountList.length > 0) {
1044
1049
  var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1085,15 +1090,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1085
1090
 
1086
1091
  // 🔥 更新主商品自己的 discount_list 中的 num（quantity=原quantity-1）
1087
1092
  var updatedMainDiscountListOriginal = mainProductData.discount_list.map(function (discount) {
1088
- var _discount$metadata3;
1089
- if (discount !== null && discount !== void 0 && (_discount$metadata3 = discount.metadata) !== null && _discount$metadata3 !== void 0 && _discount$metadata3.custom_product_bundle_map_id) {
1093
+ var _discount$metadata4, _discount$metadata5;
1094
+ if (discount !== null && discount !== void 0 && (_discount$metadata4 = discount.metadata) !== null && _discount$metadata4 !== void 0 && _discount$metadata4.custom_product_bundle_map_id) {
1090
1095
  // bundle的discount_list保持不变
1091
1096
  return discount;
1092
1097
  }
1093
1098
  // 主商品自己的discount，更新num为 mainProductQuantity - 1
1094
1099
  return _objectSpread(_objectSpread({}, discount), {}, {
1095
1100
  metadata: {
1096
- num: mainProductQuantity - 1
1101
+ num: mainProductQuantity - 1,
1102
+ custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.custom_product_bundle_map_id
1097
1103
  }
1098
1104
  // num: mainProductQuantity - 1,
1099
1105
  });
@@ -1101,8 +1107,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1101
1107
 
1102
1108
  // 🔥 使用更新后的列表计算折扣金额
1103
1109
  var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
1104
- var _item$metadata2;
1105
- return !(item !== null && item !== void 0 && (_item$metadata2 = item.metadata) !== null && _item$metadata2 !== void 0 && _item$metadata2.custom_product_bundle_map_id);
1110
+ var _item$metadata4;
1111
+ return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
1106
1112
  });
1107
1113
  if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
1108
1114
  var _Decimal$minus$toNumb2, _mainProductData$orig2;
@@ -1149,9 +1155,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1149
1155
  processedBundleItems.forEach(function (item) {
1150
1156
  // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
1151
1157
  var updatedDiscountList = (item.discount_list || []).map(function (discount) {
1158
+ var _discount$metadata6;
1152
1159
  return _objectSpread(_objectSpread({}, discount), {}, {
1153
1160
  metadata: {
1154
- num: item.num
1161
+ num: item.num,
1162
+ custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata6 = discount.metadata) === null || _discount$metadata6 === void 0 ? void 0 : _discount$metadata6.custom_product_bundle_map_id
1155
1163
  }
1156
1164
  // num: item.num, // 使用拆分后的 num
1157
1165
  });
@@ -1185,8 +1193,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
1185
1193
  } else {
1186
1194
  // 不是手动折扣时，才重新计算
1187
1195
  var _mainDiscountList = mainProductData.discount_list.filter(function (item) {
1188
- var _item$metadata3;
1189
- return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
1196
+ var _item$metadata5;
1197
+ return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
1190
1198
  });
1191
1199
 
1192
1200
  // 如果主商品本身有折扣，需要重新计算主商品价格
package/lib/modules/Rules/index.js CHANGED
@@ -728,13 +728,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
728
728
  const processedItems = bundleProcessingInfo.get(bundleIndex) || [bundleItem];
729
729
  if (processedItems.length > 1) {
730
730
  processedItems.forEach((item) => {
731
- const updatedDiscountList2 = (item.discount_list || []).map((discount) => ({
732
- ...discount,
733
- metadata: {
734
- num: item.num
735
- }
736
- // num: item.num, // 使用拆分后的 num
737
- }));
731
+ const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
732
+ var _a;
733
+ return {
734
+ ...discount,
735
+ metadata: {
736
+ num: item.num,
737
+ custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
738
+ }
739
+ // num: item.num, // 使用拆分后的 num
740
+ };
741
+ });
738
742
  newBundleWithDiscount.push({
739
743
  ...bundleItem,
740
744
  _id: item._id,
@@ -747,13 +751,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
747
751
  } else {
748
752
  const item = processedItems[0];
749
753
  if (item.processed) {
750
- const updatedDiscountList2 = (item.discount_list || []).map((discount) => ({
751
- ...discount,
752
- metadata: {
753
- num: item.num
754
- }
755
- // num: item.num, // 使用当前的 num
756
- }));
754
+ const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
755
+ var _a;
756
+ return {
757
+ ...discount,
758
+ metadata: {
759
+ num: item.num,
760
+ custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
761
+ }
762
+ // num: item.num, // 使用当前的 num
763
+ };
764
+ });
757
765
  newBundleWithDiscount.push({
758
766
  ...bundleItem,
759
767
  _id: item._id,
@@ -770,7 +778,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
770
778
  let newTotalWithDiscount = Number(mainProductData.price || 0);
771
779
  let newOriginTotalWithDiscount = Number(mainProductData.original_price || mainProductData.price || 0);
772
780
  const updatedMainDiscountList = mainProductData.discount_list.map((discount) => {
773
- var _a;
781
+ var _a, _b;
774
782
  if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
775
783
  return discount;
776
784
  }
@@ -778,6 +786,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
778
786
  ...discount,
779
787
  // num: 1,
780
788
  metadata: {
789
+ custom_product_bundle_map_id: (_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.custom_product_bundle_map_id,
781
790
  num: 1
782
791
  }
783
792
  };
@@ -823,14 +832,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
823
832
  let newTotalOriginal = Number(mainProductData.price || 0);
824
833
  let newOriginTotalOriginal = Number(mainProductData.original_price || mainProductData.price || 0);
825
834
  const updatedMainDiscountListOriginal = mainProductData.discount_list.map((discount) => {
826
- var _a;
835
+ var _a, _b;
827
836
  if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
828
837
  return discount;
829
838
  }
830
839
  return {
831
840
  ...discount,
832
841
  metadata: {
833
- num: mainProductQuantity - 1
842
+ num: mainProductQuantity - 1,
843
+ custom_product_bundle_map_id: (_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.custom_product_bundle_map_id
834
844
  }
835
845
  // num: mainProductQuantity - 1,
836
846
  };
@@ -875,13 +885,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
875
885
  newBundle.push(bundleItem);
876
886
  } else {
877
887
  processedBundleItems.forEach((item) => {
878
- const updatedDiscountList2 = (item.discount_list || []).map((discount) => ({
879
- ...discount,
880
- metadata: {
881
- num: item.num
882
- }
883
- // num: item.num, // 使用拆分后的 num
884
- }));
888
+ const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
889
+ var _a2;
890
+ return {
891
+ ...discount,
892
+ metadata: {
893
+ num: item.num,
894
+ custom_product_bundle_map_id: (_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
895
+ }
896
+ // num: item.num, // 使用拆分后的 num
897
+ };
898
+ });
885
899
  newBundle.push({
886
900
  ...bundleItem,
887
901
  _id: item._id,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "@pisell/pisellos",
4
- "version": "1.0.82",
4
+ "version": "1.0.83",
5
5
  "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",