@pisell/pisellos 0.0.559 → 0.0.561

package/lib/solution/ShopDiscount/index.js

@@ -527,7 +527,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     try {
       const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const prepareConfig = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -536,11 +536,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...orderId ? { order_id: orderId } : {}
       }));
+      const goodPassList = (prepareConfig == null ? void 0 : prepareConfig.discountList) || [];
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );
       const scanDiscountIds = scanDiscount.map((n) => n.id);
-      const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
+      const newGoodPassList = goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.store.originalDiscountList = newDiscountList;
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(newDiscountList));

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

@@ -84,6 +84,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private clearSlotPriceMapCache;
     /** 读取当前登录 customerId */
     private resolveCustomerIdForSmartPricing;
+    private resolveAvailableWalletIdsForSmartPricing;
     /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
     private getScheduleListForSmartPricing;
     /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */

package/lib/solution/VenueBooking/index.js

@@ -342,6 +342,9 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.customerLoginRefreshIdInFlight = params.customerId;
     const refreshTask = (async () => {
       var _a;
+      await this.store.order.loadDiscountConfig({
+        customerId: params.customerId
+      });
       this.clearSlotPriceMapCache();
       this.recalculateOrderPricesFromSmartPricing();
       if (this.store.holder) {
@@ -355,9 +358,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           channel: (_a = this.otherParams) == null ? void 0 : _a.channel
         });
       }
-      await this.store.order.loadDiscountConfig({
-        customerId: params.customerId
-      });
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
       await this.refreshItemRuleQuantityLimits();
@@ -624,6 +624,16 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       return void 0;
     }
   }
+  resolveAvailableWalletIdsForSmartPricing() {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const orderWalletIds = (_b = (_a = this.store.order) == null ? void 0 : _a.getAvailableWalletIds) == null ? void 0 : _b.call(_a);
+    const fallbackWalletIds = ((_c = this.otherParams) == null ? void 0 : _c.available_wallet_ids) || ((_d = this.otherParams) == null ? void 0 : _d.availableWalletIds) || ((_f = (_e = this.otherParams) == null ? void 0 : _e.strategy_context) == null ? void 0 : _f.available_wallet_ids) || ((_h = (_g = this.otherParams) == null ? void 0 : _g.strategy_context) == null ? void 0 : _h.availableWalletIds);
+    const source = Array.isArray(orderWalletIds) && orderWalletIds.length ? orderWalletIds : fallbackWalletIds;
+    if (!Array.isArray(source))
+      return [];
+    const ids = source.map((item) => Number(item)).filter((item) => Number.isFinite(item) && item > 0);
+    return Array.from(new Set(ids));
+  }
   /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
   getScheduleListForSmartPricing() {
     var _a;
@@ -640,6 +650,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       scheduleList: this.getScheduleListForSmartPricing(),
       menuList: ((_c = this.otherParams) == null ? void 0 : _c.menuList) || ((_e = (_d = this.otherParams) == null ? void 0 : _d.openData) == null ? void 0 : _e.menuList) || [],
       customerId: customerId ?? this.resolveCustomerIdForSmartPricing(),
+      availableWalletIds: this.resolveAvailableWalletIdsForSmartPricing(),
       channel: (_f = this.otherParams) == null ? void 0 : _f.channel,
       businessCode: (_g = this.otherParams) == null ? void 0 : _g.businessCode,
       orderType: ((_h = this.otherParams) == null ? void 0 : _h.orderType) || ((_i = this.otherParams) == null ? void 0 : _i.type),
@@ -659,6 +670,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     return [
       date,
       context.customerId ?? "",
+      (context.availableWalletIds || []).join(","),
       context.channel ?? "",
       context.businessCode ?? ""
     ].join("|");

package/lib/solution/VenueBooking/utils/smartPricing.d.ts

@@ -10,6 +10,7 @@ export interface VenueBookingSmartPricingContext {
     scheduleList?: ScheduleItem[];
     menuList?: DataVariantMenu[];
     customerId?: number | string;
+    availableWalletIds?: Array<number | string>;
     channel?: string;
     businessCode?: string;
     orderType?: string;

package/lib/solution/VenueBooking/utils/smartPricing.js

@@ -57,6 +57,7 @@ function buildDataVariantBusinessData(products, context, scheduleDateTime) {
     scheduleList: context.scheduleList || [],
     menuList: context.menuList || [],
     customerId: context.customerId,
+    availableWalletIds: context.availableWalletIds ?? strategyContext.available_wallet_ids ?? strategyContext.availableWalletIds,
     channel: context.channel ?? strategyContext.channel,
     orderType: context.orderType ?? strategyContext.orderType ?? strategyContext.order_type,
     businessCode: context.businessCode ?? strategyContext.business_code ?? strategyContext.businessCode,
@@ -71,7 +72,6 @@ function formatProductsWithDataVariant(products, context, scheduleDateTime) {
   }
   const resolvedAt = scheduleDateTime || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
   const businessData = buildDataVariantBusinessData(products, context, resolvedAt);
-  console.log(businessData, "businessData");
   const result = evaluator.resolveProducts(businessData);
   return Array.isArray(result == null ? void 0 : result.products) ? result.products : products;
 }

package/package.json

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