@pisell/pisellos 0.0.202 → 0.0.207

package/lib/modules/Discount/index.js

@@ -37,11 +37,16 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_decimal = __toESM(require("decimal.js"));
 var DiscountModule = class extends import_BaseModule.BaseModule {
+  defaultName = "discount";
+  defaultVersion = "1.0.0";
+  request;
+  window;
+  store;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "discount";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b, _c;
@@ -62,10 +67,10 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
-      throw new Error("discount模块需要 request 插件支持");
+      throw new Error("discount\u6A21\u5757\u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
     }
     if (!this.window) {
-      throw new Error("discount模块需要 window 插件支持");
+      throw new Error("discount\u6A21\u5757\u9700\u8981 window \u63D2\u4EF6\u652F\u6301");
     }
   }
   async setDiscountList(discountList) {
@@ -130,7 +135,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     this.store.discountList = [];
     this.core.effects.offByModuleDestroy(this.name);
     await this.core.effects.emit(import_types.DiscountHooks.OnDestroy, {});
-    console.log("[Discount] 已销毁");
+    console.log("[Discount] \u5DF2\u9500\u6BC1");
   }
   async clear() {
     this.store.discountList = [];

package/lib/modules/Guests/index.js

@@ -25,13 +25,13 @@ module.exports = __toCommonJS(Guests_exports);
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var GuestListModule = class extends import_BaseModule.BaseModule {
+  defaultName = "guestList";
+  defaultVersion = "1.0.0";
+  state = {
+    list: []
+  };
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "guestList";
-    this.defaultVersion = "1.0.0";
-    this.state = {
-      list: []
-    };
   }
   async initialize(core, options) {
     this.core = core;
@@ -46,8 +46,7 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
   }
   async updateGuest(id, updates) {
     const index = this.state.list.findIndex((g) => g.id === id);
-    if (index === -1)
-      return;
+    if (index === -1) return;
     this.state.list[index] = {
       ...this.state.list[index],
       ...updates
@@ -60,8 +59,7 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
   }
   async removeGuest(id) {
     const index = this.state.list.findIndex((g) => g.id === id);
-    if (index === -1)
-      return;
+    if (index === -1) return;
     const [removed] = this.state.list.splice(index, 1);
     await this.core.effects.emit(import_types.GuestHooks.OnGuestRemove, removed);
     await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
@@ -74,19 +72,16 @@ var GuestListModule = class extends import_BaseModule.BaseModule {
   }
   async addItemToGuest(guestId, item) {
     const guest = this.state.list.find((g) => g.id === guestId);
-    if (!guest)
-      return;
+    if (!guest) return;
     guest.items.push(item);
     await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, guest);
     await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);
   }
   async removeItemFromGuest(guestId, itemId) {
     const guest = this.state.list.find((g) => g.id === guestId);
-    if (!guest)
-      return;
+    if (!guest) return;
     const index = guest.items.findIndex((i) => i.id === itemId);
-    if (index === -1)
-      return;
+    if (index === -1) return;
     guest.items.splice(index, 1);
     await this.core.effects.emit(import_types.GuestHooks.OnGuestUpdate, guest);
     await this.core.effects.emit(import_types.GuestHooks.OnGuestChange, this.state.list);

package/lib/modules/Order/index.js

@@ -26,10 +26,12 @@ var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var OrderModule = class extends import_BaseModule.BaseModule {
+  defaultName = "order";
+  defaultVersion = "1.0.0";
+  store;
+  request;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "order";
-    this.defaultVersion = "1.0.0";
   }
   async initialize(core, options) {
     this.core = core;
@@ -65,6 +67,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           order.relation_forms.push(...relationForms);
           delete item._origin.relation_forms;
         } else {
+          const relationForms = (0, import_utils.mergeRelationForms)(item._origin.relation_forms || []);
+          item._origin.relation_forms = relationForms;
           order.bookings.push(item._origin);
         }
         if (item == null ? void 0 : item.deposit) {

package/lib/modules/Order/utils.d.ts

@@ -8,3 +8,15 @@ export declare const generateDuration: (cartItem: CartItem) => {
     duration: number;
     durationType: string;
 };
+/**
+ * 合并关联表单
+ * @param relationForms 关联表单
+ * @returns 合并后的关联表单
+ */
+export declare const mergeRelationForms: (relationForms: {
+    form_id: number;
+    form_record_ids: number[];
+}[]) => {
+    form_id: number;
+    form_record_ids: number[];
+}[];

package/lib/modules/Order/utils.js

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Order/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  generateDuration: () => generateDuration
+  generateDuration: () => generateDuration,
+  mergeRelationForms: () => mergeRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -39,7 +40,23 @@ var generateDuration = (cartItem) => {
   const duration = endDate.diff(startDate, "minutes");
   return { duration, durationType: "minutes" };
 };
+var mergeRelationForms = (relationForms) => {
+  return Object.values(
+    relationForms.reduce((acc, cur) => {
+      const { form_id, form_record_ids } = cur;
+      if (!acc[form_id]) {
+        acc[form_id] = { form_id, form_record_ids: [] };
+      }
+      const ids = Array.isArray(form_record_ids) ? form_record_ids : [form_record_ids];
+      const validIds = ids.filter((id) => id != null);
+      acc[form_id].form_record_ids.push(...validIds);
+      acc[form_id].form_record_ids = [...new Set(acc[form_id].form_record_ids)];
+      return acc;
+    }, {})
+  ).filter((item) => item.form_record_ids.length > 0);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  generateDuration
+  generateDuration,
+  mergeRelationForms
 });

package/lib/modules/Payment/cash.js

@@ -29,7 +29,7 @@ var CashPaymentImpl = class {
   async processCashPayment(amount, orderUuid) {
     const cashMethod = await this.paymentModule.getCashPaymentMethod();
     if (!cashMethod) {
-      throw new Error("现金支付方式未找到");
+      throw new Error("\u73B0\u91D1\u652F\u4ED8\u65B9\u5F0F\u672A\u627E\u5230");
     }
     const paymentItem = {
       amount: amount.toString(),

package/lib/modules/Payment/eftpos.js

@@ -29,7 +29,7 @@ var EftposPaymentImpl = class {
   async processEftposPayment(amount, orderUuid) {
     const eftposMethod = await this.paymentModule.getEftposPaymentMethod();
     if (!eftposMethod) {
-      throw new Error("Eftpos支付方式未找到");
+      throw new Error("Eftpos\u652F\u4ED8\u65B9\u5F0F\u672A\u627E\u5230");
     }
     const paymentItem = {
       amount: amount.toString(),