@pisell/pisellos 0.0.256 → 0.0.258

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

@@ -70,6 +70,9 @@ export interface Discount {
     limited_relation_product_data: Limitedrelationproductdata;
     balance: string;
     format_title: Formattitle;
+    metadata?: {
+        discount_card_type?: 'fixed_amount' | 'percent';
+    };
     product: Product;
     type: "product" | 'good_pass';
     resource_id?: number;

package/dist/modules/Order/index.js

@@ -354,21 +354,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post('/order/checkout', orderData);
             case 11:
               response = _context3.sent;
+              this.logInfo('Order API called successfully', {
+                response: response
+              });
               console.log('[Order] 订单创建成功，后端响应:', {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
               return _context3.abrupt("return", response);
-            case 16:
-              _context3.prev = 16;
+            case 17:
+              _context3.prev = 17;
               _context3.t0 = _context3["catch"](2);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
+              this.logInfo('Order API called failed', {
+                error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
+              });
               throw _context3.t0;
-            case 20:
+            case 22:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 16]]);
+        }, _callee3, this, [[2, 17]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

package/dist/modules/Payment/index.d.ts

@@ -23,6 +23,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private store;
     private dbManager;
     private logger;
+    protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
     wallet: WalletPassPayment;

package/dist/modules/Payment/index.js

@@ -85,6 +85,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     // 支付方式实例
     _defineProperty(_assertThisInitialized(_this), "cash", void 0);
     _defineProperty(_assertThisInitialized(_this), "eftpos", void 0);
@@ -104,34 +105,35 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.otherParams = options.otherParams || {};
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
               if (this.request) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 6:
+            case 7:
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 8:
+            case 9:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 13;
+              _context.next = 14;
               return this.ensurePaymentTables();
-            case 13:
+            case 14:
               this.registerNetworkHandlers();
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 16:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -148,6 +150,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {
+      var _this$otherParams;
+      if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.fatherModule) {
+        var _this$otherParams2;
+        var fatherModule = this.core.getModule((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule);
+        if (fatherModule) {
+          fatherModule.logInfo("".concat(title), metadata);
+          return;
+        }
+      }
       if (this.logger) {
         this.logger.addLog({
           type: 'info',
@@ -646,7 +657,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "createPaymentOrderAsync",
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var existingOrders, existingOrder, originalOrder, newOrder;
+        var existingOrder, newOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -656,19 +667,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               _context7.prev = 1;
               _context7.next = 4;
-              return this.dbManager.getAll('order');
+              return this.dbManager.get('order', params.order_id);
             case 4:
-              existingOrders = _context7.sent;
-              existingOrder = existingOrders.find(function (order) {
-                return String(order.id) === String(params.order_id);
-              });
+              existingOrder = _context7.sent;
               if (!existingOrder) {
-                _context7.next = 21;
+                _context7.next = 19;
                 break;
               }
               // 如果存在相同 order_id 的订单，更新该订单信息
               console.log("[PaymentModule] \u53D1\u73B0\u91CD\u590D\u8BA2\u5355 ID: ".concat(params.order_id, "\uFF0C\u66F4\u65B0\u73B0\u6709\u652F\u4ED8\u8BA2\u5355"));
-              originalOrder = _objectSpread({}, existingOrder);
+
+              // const originalOrder = { ...existingOrder };
               existingOrder.order_info = params.order_info;
               existingOrder.total_amount = params.total_amount;
               existingOrder.is_deposit = params.is_deposit || 0;
@@ -678,14 +687,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(existingOrder);
 
               // 更新到数据库
-              _context7.next = 16;
+              _context7.next = 14;
               return this.dbManager.update('order', existingOrder);
-            case 16:
-              _context7.next = 18;
+            case 14:
+              _context7.next = 16;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 18:
+            case 16:
               return _context7.abrupt("return", existingOrder);
-            case 21:
+            case 19:
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -701,33 +710,31 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
               };
-              _context7.next = 24;
+              _context7.next = 22;
               return this.dbManager.add('order', newOrder);
-            case 24:
-              _context7.next = 26;
-              return this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
-            case 26:
+            case 22:
+              this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
               this.logInfo('createPaymentOrderAsync completed - new payment order created', {
                 orderUuid: newOrder.uuid,
                 orderId: newOrder.id
               });
               return _context7.abrupt("return", newOrder);
-            case 28:
-              _context7.next = 35;
+            case 25:
+              _context7.next = 32;
               break;
-            case 30:
-              _context7.prev = 30;
+            case 27:
+              _context7.prev = 27;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 35:
+            case 32:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 30]]);
+        }, _callee7, this, [[1, 27]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);

package/dist/modules/Payment/walletpass.js

@@ -443,7 +443,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               baseWalletParams = this.walletParams; // 构建完整的搜索参数，包含钱包扣款推荐的所有参数
               searchParams = {
                 // 基础钱包参数
-                sale_channel: params.sale_channel || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.sale_channel),
+                sale_channel: params.sale_channel || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.sale_channel) || "pos",
                 customer_id: params.customer_id || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.customer_id),
                 order_expect_amount: params.order_expect_amount || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.order_expect_amount),
                 order_product_amount: params.order_product_amount || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.order_product_amount),

package/dist/modules/Rules/index.js

@@ -25,7 +25,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
-import { uniqueById } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
@@ -189,8 +189,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
 
       // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
-      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
-      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
+      // 1. 商品券（n.tag=good_pass）视为最优惠（免费）
+      // 2. 折扣券（n.tag=product_discount_card）按照新的优先级排序：
+      //    - 固定金额优先于百分比（固定金额 > 百分比）
+      //    - 固定金额内部：金额越大越优先
+      //    - 百分比内部：折扣越大越优先（par_value越小越优先）
+      // 3. 相同类型和金额的情况下，按照过期时间(n.expire_time)排序
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
         // 1. 商品券优先级最高
         if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
@@ -201,13 +205,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 都是商品券，按照过期时间排序
           return compareByExpireTime(a, b);
         } else if (a.tag === 'product_discount_card' && b.tag === 'product_discount_card') {
-          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
-          if (a.par_value !== b.par_value) {
-            var valueA = new Decimal(100).minus(a.par_value || 0);
-            var valueB = new Decimal(100).minus(b.par_value || 0);
-            return valueA.minus(valueB).toNumber();
+          var _a$metadata, _b$metadata;
+          // 都是折扣券，按照新的优先级排序：固定金额优先于百分比
+          var typeA = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 ? void 0 : _a$metadata.discount_card_type) || 'percent'; // 默认为百分比
+          var typeB = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 ? void 0 : _b$metadata.discount_card_type) || 'percent'; // 默认为百分比
+
+          // 1. 固定金额优先于百分比
+          if (typeA === 'fixed_amount' && typeB === 'percent') return -1;
+          if (typeA === 'percent' && typeB === 'fixed_amount') return 1;
+
+          // 2. 都是固定金额时，金额越大越优先
+          if (typeA === 'fixed_amount' && typeB === 'fixed_amount') {
+            if (a.par_value !== b.par_value) {
+              var valueA = new Decimal(a.par_value || 0);
+              var valueB = new Decimal(b.par_value || 0);
+              return valueB.minus(valueA).toNumber(); // 金额大的在前
+            }
           }
-          // 相同折扣的情况下，按照过期时间排序
+
+          // 3. 都是百分比时，折扣越大越优先（par_value越小越优先）
+          if (typeA === 'percent' && typeB === 'percent') {
+            if (a.par_value !== b.par_value) {
+              var _valueA = new Decimal(100).minus(a.par_value || 0);
+              var _valueB = new Decimal(100).minus(b.par_value || 0);
+              return _valueB.minus(_valueA).toNumber(); // 折扣大的在前
+            }
+          }
+
+          // 相同类型和金额的情况下，按照过期时间排序
           return compareByExpireTime(a, b);
         }
 
@@ -465,7 +490,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
+          var targetProductTotal = getDiscountAmount(_selectedDiscount, productOriginTotal, product.price);
           var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),

package/dist/modules/Schedule/index.d.ts

@@ -33,5 +33,5 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;
-    }): true | undefined;
+    }): boolean | undefined;
 }

package/dist/modules/Schedule/index.js

@@ -254,6 +254,15 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       var _schedule$repeat_rule, _schedule$repeat_rule2;
       var date = _ref2.date,
         schedule = _ref2.schedule;
+      if (schedule.start_time && schedule.end_time) {
+        var isBeforeStartTime = dayjs(date).isBefore(dayjs(schedule.start_time));
+        var isAfterEndTime = dayjs(date).isAfter(dayjs(schedule.end_time));
+        // 如果不在 schedule 日期区间内直接返回false
+        if (isBeforeStartTime || isAfterEndTime) {
+          return false;
+        }
+      }
+
       // 节约性能, 强制将schedule的时间范围改为前后一天，避免大量计算.
       var _schedule = _objectSpread(_objectSpread({}, schedule), {}, {
         // 开始时间向前推一天

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

@@ -2,7 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { OrderModule } from '../../modules/Order';
 import { PaymentModule } from '../../modules/Payment';
-import { CheckoutModuleAPI, CheckoutStep, CheckoutInitParams, CreateLocalOrderParams, PlaceOrderParams, CreateOrderParams, ProcessPaymentParams, CheckoutStatusInfo, CheckoutSummary, CurrentOrderInfo, CartSummaryItem, ExtractedAmountInfo, SendCustomerPayLinkParams } from './types';
+import { CheckoutModuleAPI, CheckoutInitParams, CreateLocalOrderParams, CurrentOrderInfo, CartSummaryItem, SendCustomerPayLinkParams } from './types';
 import { PaymentOrder, PaymentMethod, PaymentItem, PaymentItemInput } from '../../modules/Payment/types';
 export * from './types';
 /**
@@ -64,24 +64,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 方法会记录参数并创建本地虚拟订单，然后用 Payment 模块管理支付流程。
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
-    /**
-     * 手动下单 (根据虚拟订单生成实际订单)
-     *
-     * 使用当前存储的本地订单数据调用 Order 模块创建真实订单
-     */
-    placeOrderAsync(params?: PlaceOrderParams): Promise<{
-        success: boolean;
-        orderId?: string;
-        error?: string;
-    }>;
-    /**
-     * 创建订单
-     */
-    createOrderAsync(params: CreateOrderParams): Promise<PaymentOrder>;
-    /**
-     * 处理支付
-     */
-    processPaymentAsync(params: ProcessPaymentParams): Promise<void>;
     /**
      * 完成结账
      */
@@ -89,28 +71,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
         success: boolean;
         orderId?: string;
     }>;
-    /**
-     * 取消结账
-     */
-    cancelCheckoutAsync(): Promise<void>;
-    /**
-     * 获取结账状态
-     */
-    getCheckoutStatus(): CheckoutStatusInfo;
-    /**
-     * 获取结账摘要
-     */
-    getCheckoutSummaryAsync(): Promise<CheckoutSummary>;
-    /**
-     * 获取可用支付方式
-     */
-    getAvailablePaymentMethodsAsync(): Promise<PaymentMethod[]>;
-    /**
-     * 刷新支付方式缓存
-     *
-     * 强制重新从服务器获取支付方式列表，更新本地缓存
-     */
-    refreshPaymentMethodsAsync(): Promise<PaymentMethod[]>;
     /**
      * 获取订单原始数据
      */
@@ -127,21 +87,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 返回当前订单的所有支付项，包括活跃和已撤销的支付项
      */
     getCurrentOrderPaymentItemsAsync(): Promise<PaymentItem[]>;
-    /**
-     * 验证结账前置条件
-     */
-    validateCheckoutAsync(): Promise<{
-        valid: boolean;
-        errors: string[];
-    }>;
-    /**
-     * 重试失败的操作
-     */
-    retryFailedOperationAsync(): Promise<void>;
-    /**
-     * 设置当前步骤
-     */
-    setCurrentStep(step: CheckoutStep): void;
     /**
      * 获取订单模块
      */
@@ -181,12 +126,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 当前系统计算的待付金额
      */
     getBalanceDueAmount(): string;
-    /**
-     * 刷新 stateAmount 为当前剩余未支付金额
-     *
-     * UI 可以调用此方法来主动刷新支付金额状态
-     */
-    refreshStateAmountAsync(): Promise<void>;
     /**
      * 获取购物车小计数据
      *
@@ -195,14 +134,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 购物车小计数据数组，如果没有则返回 null
      */
     getCartSummary(): CartSummaryItem[] | null;
-    /**
-     * 获取提取的金额详细信息
-     *
-     * 从当前的购物车小计数据中提取结构化的金额信息
-     *
-     * @returns 提取的金额信息对象，如果没有小计数据则返回 null
-     */
-    getExtractedAmountInfo(): ExtractedAmountInfo | null;
     /**
      * 获取支付方式列表
      *
@@ -251,34 +182,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @throws 当前没有活跃订单时抛出错误
      */
     updateOrderDepositStatusAsync(isDeposit: number): Promise<void>;
-    /**
-     * 更新当前订单的客户信息
-     *
-     * 更新当前订单关联的客户信息，用于标识订单的所属客户
-     *
-     * @param customer 客户信息 (customer_id 和/或 customer_name)
-     * @throws 当前没有活跃订单时抛出错误
-     */
-    updateOrderCustomerAsync(customer: {
-        customer_id?: string;
-        customer_name?: string;
-    }): Promise<void>;
-    /**
-     * 获取当前订单的客户信息
-     *
-     * @returns 当前客户信息，如果没有则返回 null
-     */
-    getCurrentCustomer(): {
-        customer_id?: string;
-        customer_name?: string;
-    } | null;
-    /**
-     * 检查订单是否需要手动同步（异步版本）
-     *
-     * 返回订单是否为纯代金券支付且待付金额<=0但未同步的状态
-     * 从 Payment 模块获取最新的支付项数据
-     */
-    needsManualSyncAsync(): Promise<boolean>;
     /**
      * 手动同步订单到后端
      *
@@ -335,34 +238,12 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
         orderUuid?: string;
         response?: any;
     }>;
-    /**
-     * 获取当前商店折扣金额
-     *
-     * @returns 当前的商店折扣金额，如果没有则返回0
-     */
-    getShopDiscount(): number;
-    /**
-     * 更新订单商店折扣
-     *
-     * 同时更新cartSummary和localOrderData中的shop_discount值
-     *
-     * @param discountAmount 商店折扣金额
-     */
-    updateShopDiscountAsync(discountAmount: number): Promise<void>;
     /**
      * 更新订单备注
      *
      * @param note 订单备注内容
      */
     updateOrderNoteAsync(note: string): Promise<void>;
-    /**
-     * 设置状态
-     */
-    private setStatus;
-    /**
-     * 设置步骤
-     */
-    private setStep;
     /**
      * 处理错误
      */
@@ -386,14 +267,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 处理后的支付项（包含找零信息）
      */
     private processCashPaymentItem;
-    /**
-     * 判断是否为现金支付
-     *
-     * @param paymentCode 支付代码
-     * @param paymentType 支付类型
-     * @returns 是否为现金支付
-     */
-    private isCashPayment;
     /**
      * 预加载支付方式（在初始化时调用）
      */
@@ -426,11 +299,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
      */
     private checkOrderPaymentCompletion;
-    /**
-     * 同步订单到后端
-     *
-     * 调用后端 /order/checkout 接口创建真实订单
-     */
     /**
      * 同步订单到后端并返回真实订单ID
      *
@@ -439,11 +307,6 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @returns 包含订单ID、UUID和完整后端响应的对象
      */
     private syncOrderToBackendWithReturn;
-    private syncOrderToBackend;
-    /**
-     * 获取状态消息
-     */
-    private getStatusMessage;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
@@ -491,19 +354,4 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 在创建新订单前调用，确保状态完全干净
      */
     private resetStoreStateAsync;
-    /**
-     * 手动清理已完成的订单状态（公开方法）
-     *
-     * 供UI层调用的公开方法，用于手动清理订单状态
-     *
-     * @returns 清理结果
-     */
-    clearCompletedOrderAsync(): Promise<{
-        success: boolean;
-        message?: string;
-        clearedOrder?: {
-            uuid: string;
-            orderId: string;
-        } | null;
-    }>;
 }