@pisell/pisellos 0.0.391 → 0.0.392

package/dist/modules/Discount/index.js

@@ -301,7 +301,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
         return discount.appliedProductDetails.reduce(function (total, product) {
           var _product$discount, _product$metadata;
           var price = new Decimal((product === null || product === void 0 || (_product$discount = product.discount) === null || _product$discount === void 0 ? void 0 : _product$discount.fixed_amount) || 0).mul((product === null || product === void 0 ? void 0 : product._num) || 1);
-          return new Decimal(total).plus(price).minus((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_difference) || 0).toNumber();
+          return new Decimal(total).plus(price).add((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_difference) || 0).toNumber();
         }, 0);
       }
     }

package/dist/modules/Rules/index.js

@@ -1045,7 +1045,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
-                product_discount_difference: 0 - productDiscountDifference
+                product_discount_difference: productDiscountDifference
               })
             };
             appliedProducts.push(discountDetail);
@@ -1214,7 +1214,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 custom_product_bundle_map_id: _uniqueId,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
-                product_discount_difference: 0 - _productDiscountDifference
+                product_discount_difference: _productDiscountDifference
               }),
               config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
               _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu7 = flatItem.parentProduct) === null || _flatItem$parentProdu7 === void 0 ? void 0 : _flatItem$parentProdu7.num) || 1)

package/dist/modules/Summary/utils.js

@@ -69,7 +69,7 @@ export var calculateSubtotal = function calculateSubtotal(items) {
   var subtotal = items.reduce(function (sum, item) {
     var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var productDiscountProductDiscountDifference = getProductDiscountProductDiscountDifference(item);
-    return sum.plus(cartItemTotalPrice).add(productDiscountProductDiscountDifference);
+    return sum.plus(cartItemTotalPrice).sub(productDiscountProductDiscountDifference);
   }, new Decimal(0));
   return subtotal.toFixed(2);
 };

package/dist/solution/BookingByStep/index.d.ts

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/ShopDiscount/index.js

@@ -576,12 +576,13 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
+                var _discount$metadata;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  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()
+                  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((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
@@ -589,7 +590,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1),
+                  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((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,

package/lib/modules/Discount/index.js

@@ -178,7 +178,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       return discount.appliedProductDetails.reduce((total, product) => {
         var _a, _b;
         const price = new import_decimal.default(((_a = product == null ? void 0 : product.discount) == null ? void 0 : _a.fixed_amount) || 0).mul((product == null ? void 0 : product._num) || 1);
-        return new import_decimal.default(total).plus(price).minus(((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber();
+        return new import_decimal.default(total).plus(price).add(((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber();
       }, 0);
     }
   }

package/lib/modules/Rules/index.js

@@ -818,8 +818,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
             metadata: {
               num: 1,
-              // 🔥 order_level 分摊差值  后端问题 需要 优惠多了，要传大于0 优惠少了，要传小于0
-              ...productDiscountDifference !== void 0 && { product_discount_difference: 0 - productDiscountDifference }
+              // 🔥 order_level 分摊差值
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             }
           };
           appliedProducts.push(discountDetail);
@@ -972,8 +972,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
               num: product.num || 1,
-              // 🔥 order_level 分摊差值  后端问题 需要 优惠多了，要传大于0 优惠少了，要传小于0
-              ...productDiscountDifference !== void 0 && { product_discount_difference: 0 - productDiscountDifference }
+              // 🔥 order_level 分摊差值
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
             _num: (product.num || 1) * (((_y = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _y.num) || 1)

package/lib/modules/Summary/utils.js

@@ -83,7 +83,7 @@ var calculateSubtotal = (items) => {
   const subtotal = items.reduce((sum, item) => {
     const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     const productDiscountProductDiscountDifference = getProductDiscountProductDiscountDifference(item);
-    return sum.plus(cartItemTotalPrice).add(productDiscountProductDiscountDifference);
+    return sum.plus(cartItemTotalPrice).sub(productDiscountProductDiscountDifference);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };

package/lib/solution/BookingByStep/index.d.ts

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/ShopDiscount/index.js

@@ -375,7 +375,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a3, _b, _c;
+          var _a3, _b, _c, _d, _e;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
@@ -385,7 +385,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                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()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -396,13 +396,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount * ((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
                 isAvailable: true,
-                id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
-                format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
+                id: ((_c = discount.discount) == null ? void 0 : _c.resource_id) || discount.id,
+                format_title: ((_d = discount.discount) == null ? void 0 : _d.title) || discount.format_title,
                 isDisabled: true,
                 isSelected: true,
-                product_id: ((_c = discount.discount) == null ? void 0 : _c.product_id) || discount.product_id
+                product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
               });
             }
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.391",
+  "version": "0.0.392",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",