@pisell/pisellos 0.0.320 → 0.0.324

package/lib/modules/Cart/utils/cartProduct.js

@@ -218,8 +218,7 @@ var getProductOriginTotalPrice = (params) => {
   return price;
 };
 var formatOptions = (options) => {
-  if (!(options == null ? void 0 : options.length))
-    return [];
+  if (!(options == null ? void 0 : options.length)) return [];
   return options.map((item) => {
     return {
       id: item == null ? void 0 : item.id,
@@ -244,8 +243,7 @@ var formatOptionsToOrigin = (options) => {
   });
 };
 var formatBundle = (bundle) => {
-  if (!(bundle == null ? void 0 : bundle.length))
-    return [];
+  if (!(bundle == null ? void 0 : bundle.length)) return [];
   return bundle.map((item) => {
     return {
       id: item == null ? void 0 : item.id,
@@ -261,8 +259,7 @@ var formatBundle = (bundle) => {
   });
 };
 var formatBundleToOrigin = (bundle) => {
-  if (!(bundle == null ? void 0 : bundle.length))
-    return [];
+  if (!(bundle == null ? void 0 : bundle.length)) return [];
   return bundle.map((d) => {
     return {
       bundle_group_id: d.group_id,

package/lib/modules/Customer/constants.js

@@ -29,7 +29,7 @@ var DEFAULT_PAGE_SIZE = 20;
 var DEFAULT_CUSTOMER = {
   "id": 1,
   "nickname": "Select a customer",
-  "name": "选择一个客户"
+  "name": "\u9009\u62E9\u4E00\u4E2A\u5BA2\u6237"
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Customer/index.js

@@ -29,23 +29,26 @@ var import_types = require("./types");
 var import_constants = require("./constants");
 __reExport(Customer_exports, require("./types"), module.exports);
 var CustomerModule = class extends import_BaseModule.BaseModule {
+  defaultName = "customer";
+  defaultVersion = "1.0.0";
+  store = {
+    customerList: [],
+    selectedCustomer: null,
+    total: 0,
+    currentPage: 1,
+    pageSize: import_constants.DEFAULT_PAGE_SIZE,
+    loading: false,
+    error: null,
+    hasMore: true,
+    loadingMore: false,
+    searchParams: {}
+  };
+  request;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "customer";
-    this.defaultVersion = "1.0.0";
-    this.store = {
-      customerList: [],
-      selectedCustomer: null,
-      total: 0,
-      currentPage: 1,
-      pageSize: import_constants.DEFAULT_PAGE_SIZE,
-      loading: false,
-      error: null,
-      hasMore: true,
-      loadingMore: false,
-      searchParams: {}
-    };
-    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;

package/lib/modules/Customer/types.d.ts

@@ -33,7 +33,7 @@ export interface ShopCustomer extends ICustomer {
  * walletDetails.wallet: 用户所有wallet
  * latestWalletDetail.wallet: 用户最新wallet
  */
-type CustomerWith = 'formRecord' | 'walletDetails.wallet' | 'latestWalletDetail.wallet';
+declare type CustomerWith = 'formRecord' | 'walletDetails.wallet' | 'latestWalletDetail.wallet';
 /**
  * 获取客户列表参数
  */

package/lib/modules/Date/index.js

@@ -37,11 +37,15 @@ var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var import_cloneDeep = __toESM(require("lodash-es/cloneDeep"));
 var DateModule = class extends import_BaseModule.BaseModule {
+  defaultName = "date";
+  defaultVersion = "1.0.0";
+  store;
+  request;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "date";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b;
@@ -53,7 +57,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
       this.store.dateList = options.initialState.dateList;
     }
     if (!this.request) {
-      throw new Error("DateModule 需要 request 插件支持");
+      throw new Error("DateModule \u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
     }
     if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
       this.openCache = options.otherParams.openCache;
@@ -191,13 +195,13 @@ var DateModule = class extends import_BaseModule.BaseModule {
         if (startAt.isBefore(resourceStartTime)) {
           const roundedStartTime = this.roundUpToNext10Minutes(resourceStartTime);
           const roundedStartTimeDayjs = (0, import_dayjs.default)(roundedStartTime);
-          console.log(`[DateModule] 修正时间段开始时间: ${timeSlot.start_at} -> ${roundedStartTime} (资源ID: ${resource.id}, 原始start_time: ${resource.start_time})`);
+          console.log(`[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ${timeSlot.start_at} -> ${roundedStartTime} (\u8D44\u6E90ID: ${resource.id}, \u539F\u59CBstart_time: ${resource.start_time})`);
           const correctedTimeSlot = {
             ...timeSlot,
             start_at: roundedStartTime
           };
           if (endAt.isBefore(roundedStartTimeDayjs)) {
-            console.log(`[DateModule] 时间段无效，将被删除: ${timeSlot.start_at} - ${timeSlot.end_at} (资源ID: ${resource.id}, 修正后start_time: ${roundedStartTime})`);
+            console.log(`[DateModule] \u65F6\u95F4\u6BB5\u65E0\u6548\uFF0C\u5C06\u88AB\u5220\u9664: ${timeSlot.start_at} - ${timeSlot.end_at} (\u8D44\u6E90ID: ${resource.id}, \u4FEE\u6B63\u540Estart_time: ${roundedStartTime})`);
             return null;
           }
           return correctedTimeSlot;

package/lib/modules/Date/types.js

@@ -23,6 +23,7 @@ __export(types_exports, {
 });
 module.exports = __toCommonJS(types_exports);
 var DateHooks = /* @__PURE__ */ ((DateHooks2) => {
+  return DateHooks2;
 })(DateHooks || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Discount/index.d.ts

@@ -14,6 +14,8 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setDiscountList(discountList: Discount[]): Promise<void>;
     getDiscountList(): Discount[];
+    setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
+    getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;

package/lib/modules/Discount/index.js

@@ -37,14 +37,19 @@ 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;
+    var _a, _b, _c, _d;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.discountList)) {
@@ -52,20 +57,25 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.discountList = [];
     }
-    if ((_b = options == null ? void 0 : options.otherParams) == null ? void 0 : _b.cacheId) {
+    if (Array.isArray((_b = options == null ? void 0 : options.initialState) == null ? void 0 : _b.originalDiscountList)) {
+      this.store.originalDiscountList = options == null ? void 0 : options.initialState.originalDiscountList;
+    } else {
+      this.store.originalDiscountList = [];
+    }
+    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.fatherModule) {
+    if ((_d = options == null ? void 0 : options.otherParams) == null ? void 0 : _d.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
     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) {
@@ -78,6 +88,14 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   getDiscountList() {
     return this.store.discountList;
   }
+  // 设置原始优惠券列表
+  async setOriginalDiscountList(originalDiscountList) {
+    this.store.originalDiscountList = originalDiscountList;
+  }
+  // 获取原始优惠券列表
+  getOriginalDiscountList() {
+    return this.store.originalDiscountList || [];
+  }
   async loadPrepareConfig(params) {
     var _a, _b;
     const prepareConfig = await this.request.post(
@@ -172,10 +190,11 @@ 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 = [];
+    this.store.originalDiscountList = [];
     console.log("[Discount] clear");
   }
   storeChange() {

package/lib/modules/Discount/types.d.ts

@@ -72,6 +72,7 @@ export interface Discount {
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
+        validity_type?: "custom_schedule_validity" | "fixed_validity";
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -98,9 +99,13 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
 }
 export interface DiscountState {
     discountList: Discount[];
+    originalDiscountList?: Discount[];
 }
 export interface DiscountModuleAPI {
     setDiscountList: (discountList: Discount[]) => Promise<void>;

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

@@ -37,11 +37,14 @@ var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var OrderModule = class extends import_BaseModule.BaseModule {
+  defaultName = "order";
+  defaultVersion = "1.0.0";
+  store;
+  request;
+  logger;
   // LoggerManager 实例
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "order";
-    this.defaultVersion = "1.0.0";
   }
   async initialize(core, options) {
     this.core = core;
@@ -49,11 +52,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.request = this.core.getPlugin("request");
     const appPlugin = this.core.getPlugin("app");
     if (!appPlugin) {
-      console.warn("Order 模块需要 app 插件支持");
+      console.warn("Order \u6A21\u5757\u9700\u8981 app \u63D2\u4EF6\u652F\u6301");
     }
     const app = appPlugin == null ? void 0 : appPlugin.getApp();
-    if (app)
-      this.logger = app.logger;
+    if (app) this.logger = app.logger;
     this.logInfo("OrderModule initialized successfully");
   }
   /**
@@ -206,7 +208,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       orderIdIncluded: params.order_id,
       paymentMethods: ((_d = params.payments) == null ? void 0 : _d.map((p) => p.code)) || []
     });
-    console.log("[Order] createOrderByCheckout 开始创建订单:", {
+    console.log("[Order] createOrderByCheckout \u5F00\u59CB\u521B\u5EFA\u8BA2\u5355:", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
@@ -236,7 +238,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if (!params.order_id && !orderData.schedule_date) {
         orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
       }
-      console.log("[Order] 调用后端接口创建订单:", {
+      console.log("[Order] \u8C03\u7528\u540E\u7AEF\u63A5\u53E3\u521B\u5EFA\u8BA2\u5355:", {
         url: "/order/checkout",
         orderType: orderData.type,
         platform: orderData.platform,
@@ -274,13 +276,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.logInfo("Order API called successfully", {
         response
       });
-      console.log("[Order] 订单创建成功，后端响应:", {
+      console.log("[Order] \u8BA2\u5355\u521B\u5EFA\u6210\u529F\uFF0C\u540E\u7AEF\u54CD\u5E94:", {
         success: !!response,
         hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
       });
       return response;
     } catch (error) {
-      console.error("[Order] createOrderByCheckout 创建订单失败:", error);
+      console.error("[Order] createOrderByCheckout \u521B\u5EFA\u8BA2\u5355\u5931\u8D25:", error);
       this.logInfo("Order API called failed", {
         error: error instanceof Error ? error.message : String(error)
       });

package/lib/modules/Payment/cash.js

@@ -30,7 +30,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/cashRecommendationAlgorithm.js

@@ -213,7 +213,7 @@ function recommendOptimalPayments(targetAmount, denominations) {
     }
     return finalResults.sort((a, b) => a - b);
   } catch (error) {
-    console.warn("推荐支付金额计算出错:", error);
+    console.warn("\u63A8\u8350\u652F\u4ED8\u91D1\u989D\u8BA1\u7B97\u51FA\u9519:", error);
     const safeAmount = Math.ceil(targetAmount);
     return [targetAmount, safeAmount];
   }

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(),