@pisell/pisellos 0.0.465 → 0.0.467

package/dist/modules/BaseModule.d.ts

@@ -14,9 +14,9 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void): void;
+    effectsOn(eventType: string, callback: (payload: any) => void, force?: boolean): void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void, force?: boolean): void;
     effectsEmit(eventType: string, payload: any): Promise<{
         status: boolean;
         data: any;

package/dist/modules/BaseModule.js

@@ -68,8 +68,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOn",
-    value: function effectsOn(eventType, callback) {
-      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback);
+    value: function effectsOn(eventType, callback, force) {
+      return this.core.effects.on("".concat(this.name, ":").concat(eventType), callback, force);
     }
   }, {
     key: "effectsOff",
@@ -78,8 +78,8 @@ export var BaseModule = /*#__PURE__*/function () {
     }
   }, {
     key: "effectsOnce",
-    value: function effectsOnce(eventType, callback) {
-      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback);
+    value: function effectsOnce(eventType, callback, force) {
+      return this.core.effects.once("".concat(this.name, ":").concat(eventType), callback, force);
     }
   }, {
     key: "effectsEmit",

package/dist/modules/Rules/index.js

@@ -1325,12 +1325,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 前端使用的num数量，为了计算优惠金额（拆分时为1）
               _num: isNeedSplit ? 1 : product.num,
               config: currentSelectedDiscount === null || currentSelectedDiscount === void 0 ? void 0 : currentSelectedDiscount.config,
-              metadata: _objectSpread(_objectSpread({
-                num: 1
+              metadata: _objectSpread({
+                num: 1,
+                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
-              }), {}, {
-                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag
               })
             };
             appliedProducts.push(discountDetail);
@@ -1973,8 +1972,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: newTotalWithDiscount,
-                origin_total: newOriginTotalWithDiscount
+                total: new Decimal(newTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber(),
+                origin_total: new Decimal(newOriginTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber()
               })));
 
               // 第二个：包含原始bundle (qty=原quantity-1)
@@ -2036,6 +2035,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotalOriginal)).toNumber();
                 }
+                newTotalOriginal = new Decimal(newTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                newOriginTotalOriginal = new Decimal(newOriginTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 添加第二个主商品：qty=原quantity-1，包含原始bundle
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
@@ -2137,6 +2138,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotal)).toNumber();
                 }
+                newTotal = new Decimal(newTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                newOriginTotal = new Decimal(newOriginTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 生成最终的主商品
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {

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

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

package/dist/types/index.d.ts

@@ -38,9 +38,9 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        only: (event: string, callback: (payload: any) => void) => () => void;
         on: (event: string, callback: (payload: any) => void, force?: boolean) => void;
         once: (event: string, callback: (payload: any) => void, force?: boolean) => void;
+        only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/BaseModule.d.ts

@@ -14,9 +14,9 @@ export declare class BaseModule {
         store: any;
         cacheKey: string[];
     }): void;
-    effectsOn(eventType: string, callback: (payload: any) => void): void;
+    effectsOn(eventType: string, callback: (payload: any) => void, force?: boolean): void;
     effectsOff(eventType: string, callback: (payload: any) => void): void;
-    effectsOnce(eventType: string, callback: (payload: any) => void): void;
+    effectsOnce(eventType: string, callback: (payload: any) => void, force?: boolean): void;
     effectsEmit(eventType: string, payload: any): Promise<{
         status: boolean;
         data: any;

package/lib/modules/BaseModule.js

@@ -84,14 +84,14 @@ var BaseModule = class {
       }
     }
   }
-  effectsOn(eventType, callback) {
-    return this.core.effects.on(`${this.name}:${eventType}`, callback);
+  effectsOn(eventType, callback, force) {
+    return this.core.effects.on(`${this.name}:${eventType}`, callback, force);
   }
   effectsOff(eventType, callback) {
     return this.core.effects.off(`${this.name}:${eventType}`, callback);
   }
-  effectsOnce(eventType, callback) {
-    return this.core.effects.once(`${this.name}:${eventType}`, callback);
+  effectsOnce(eventType, callback, force) {
+    return this.core.effects.once(`${this.name}:${eventType}`, callback, force);
   }
   effectsEmit(eventType, payload) {
     return this.core.effects.emit(`${this.name}:${eventType}`, payload);

package/lib/modules/Rules/index.js

@@ -990,9 +990,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             config: currentSelectedDiscount == null ? void 0 : currentSelectedDiscount.config,
             metadata: {
               num: 1,
+              discount_rule_uncheck_flag: selectedDiscount == null ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
               // 🔥 order_level 分摊差值
-              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference },
-              discount_rule_uncheck_flag: selectedDiscount == null ? void 0 : selectedDiscount.discount_rule_uncheck_flag
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             }
           };
           appliedProducts.push(discountDetail);
@@ -1579,8 +1579,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: newTotalWithDiscount,
-                origin_total: newOriginTotalWithDiscount
+                total: new import_decimal.default(newTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber(),
+                origin_total: new import_decimal.default(newOriginTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber()
               })
             );
             if (mainProductQuantity > 1) {
@@ -1638,6 +1638,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   return accumulator.add(currentPrice.mul(currentNum));
                 }, new import_decimal.default(newTotalOriginal)).toNumber();
               }
+              newTotalOriginal = new import_decimal.default(newTotalOriginal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+              newOriginTotalOriginal = new import_decimal.default(newOriginTotalOriginal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,
@@ -1729,6 +1731,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   return accumulator.add(currentPrice.mul(currentNum));
                 }, new import_decimal.default(newTotal)).toNumber();
               }
+              newTotal = new import_decimal.default(newTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+              newOriginTotal = new import_decimal.default(newOriginTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,

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

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

package/lib/types/index.d.ts

@@ -38,9 +38,9 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        only: (event: string, callback: (payload: any) => void) => () => void;
         on: (event: string, callback: (payload: any) => void, force?: boolean) => void;
         once: (event: string, callback: (payload: any) => void, force?: boolean) => void;
+        only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;

package/package.json

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