@pisell/pisellos 0.0.228 → 0.0.230

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

@@ -20,8 +20,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string): Promise<Discount[]>;
+    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
+    private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/dist/modules/Discount/index.js

@@ -145,7 +145,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchSearch",
     value: function () {
-      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code) {
+      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(code, customerId) {
         var result, resultDiscountList;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -156,7 +156,10 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 translate_flag: 1,
                 tags: ['good_pass', 'product_discount_card'],
                 available: 1,
-                relation_product: 1
+                relation_product: 1,
+                with: ['extensionData'],
+                order_behavior_count: 1,
+                order_behavior_count_customer_id: customerId || 1
               });
             case 2:
               result = _context4.sent;
@@ -168,7 +171,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this);
       }));
-      function batchSearch(_x5) {
+      function batchSearch(_x5, _x6) {
         return _batchSearch.apply(this, arguments);
       }
       return batchSearch;
@@ -176,11 +179,71 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
+      var _this2 = this;
       return discountList.filter(function (discount) {
-        return discount.limit_status === 'enable' && new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
+        return discount.limit_status === 'enable' && new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && _this2.checkUsageCreditsLimit(discount);
       });
     }
 
+    // 检查使用次数限制
+  }, {
+    key: "checkUsageCreditsLimit",
+    value: function checkUsageCreditsLimit(discount) {
+      // 如果没有 extension_data，则不需要限制
+      if (!discount.extension_data || discount.extension_data.length === 0) {
+        return true;
+      }
+
+      // 查找 field_key 为 usage_credits 的数据
+      var usageCreditsData = discount.extension_data.find(function (data) {
+        return data.field_key === 'usage_credits';
+      });
+
+      // 如果没有找到 usage_credits 数据，则不需要限制
+      if (!usageCreditsData) {
+        return true;
+      }
+      var value = usageCreditsData.value;
+
+      // 检查总次数限制
+      if (value.total_credits && value.total_credits > 0) {
+        if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
+          return false;
+        }
+      }
+
+      // 检查单用户限制
+      if (value.per_user_limit && value.per_user_limit > 0) {
+        if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
+          return false;
+        }
+      }
+
+      // 检查单日限制
+      if (value.max_per_day && value.max_per_day > 0) {
+        if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
+          return false;
+        }
+      }
+
+      // 检查单周限制
+      if (value.max_per_week && value.max_per_week > 0) {
+        if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
+          return false;
+        }
+      }
+
+      // 检查单月限制
+      if (value.max_per_month && value.max_per_month > 0) {
+        if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
+          return false;
+        }
+      }
+
+      // 所有检查都通过
+      return true;
+    }
+
     // 根据productIds去重
   }, {
     key: "uniqueByProductId",

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

@@ -36,6 +36,25 @@ interface ApplicableProductDetails {
         title?: string;
     };
 }
+interface UsageCreditsValue {
+    total_credits: number;
+    per_user_limit: number;
+    max_per_day: number;
+    max_per_week: number;
+    max_per_month: number;
+}
+interface ExtensionData {
+    id: number;
+    shop_id: number;
+    product_id: number;
+    field_id: number;
+    field_key: string;
+    type: string;
+    value: UsageCreditsValue | Record<string, any> | string | number | boolean | any[];
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 export interface Discount {
     id: number;
     product_name: string;
@@ -70,6 +89,12 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    extension_data?: ExtensionData[];
+    total_order_behavior_count?: number;
+    today_order_behavior_count?: number;
+    week_order_behavior_count?: number;
+    month_order_behavior_count?: number;
+    customer_order_behavior_count?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -86,15 +86,25 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      */
     getOrderListAsync(): Promise<PaymentOrder[]>;
     /**
-     * 根据uuid获取指定订单
+     * 根据订单UUID获取支付订单（新方法）
      */
-    getOrderByUuidAsync(orderUuid: string): Promise<PaymentOrder | null>;
+    getPaymentOrderByUuidAsync(orderUuid: string): Promise<PaymentOrder | null>;
     /**
-     * 往交易组中添加订单
+     * 创建支付订单（新方法，专注支付数据）
+     */
+    createPaymentOrderAsync(params: PushOrderParams): Promise<PaymentOrder>;
+    /**
+     * 往交易组中添加订单（兼容性方法）
+     * @deprecated 使用 createPaymentOrderAsync 替代
      */
     pushOrderAsync(params: PushOrderParams): Promise<PaymentOrder>;
     /**
-     * 删除订单
+     * 删除支付订单（新方法）
+     */
+    deletePaymentOrderAsync(orderUuid: string): Promise<void>;
+    /**
+     * 删除订单（兼容性方法）
+     * @deprecated 使用 deletePaymentOrderAsync 替代
      */
     deleteOrderAsync(orderUuid: string): Promise<void>;
     /**
@@ -102,11 +112,32 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      */
     updateOrderAsync(orderUuid: string, params: Partial<PaymentOrder>): Promise<void>;
     /**
-     * 获取支付项
+     * 基于UUID替换订单ID
+     *
+     * 此方法用于将本地虚拟订单ID替换为真实的订单ID。
+     * 当前端模拟下单流程完成后，后端返回真实订单ID时调用此方法。
+     *
+     * @param orderUuid 订单的UUID
+     * @param newOrderId 新的订单ID (来自后端)
+     * @returns 更新后的订单对象，如果订单不存在则返回null
+     */
+    replaceOrderIdByUuidAsync(orderUuid: string, newOrderId: string): Promise<PaymentOrder | null>;
+    /**
+     * 获取支付项（新方法）
+     */
+    getPaymentItemsAsync(orderUuid: string): Promise<PaymentItem[]>;
+    /**
+     * 获取支付项（兼容性方法）
+     * @deprecated 使用 getPaymentItemsAsync 替代
      */
     getPaymentAsync(orderUuid: string): Promise<PaymentItem[]>;
     /**
-     * 为某个订单设置一个支付项
+     * 为某个订单添加支付项（新方法）
+     */
+    addPaymentItemAsync(orderUuid: string, paymentItem: PaymentItemInput): Promise<void>;
+    /**
+     * 为某个订单设置一个支付项（兼容性方法）
+     * @deprecated 使用 addPaymentItemAsync 替代
      */
     pushPaymentAsync(orderUuid: string, paymentItem: PaymentItemInput): Promise<void>;
     /**
@@ -224,4 +255,26 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * @returns Promise<boolean> 是否成功添加到队列
      */
     private reAddOrderToSyncQueue;
+    /**
+     * 删除支付项（新方法）
+     */
+    deletePaymentItemAsync(orderUuid: string, paymentUuid: string): Promise<void>;
+    /**
+     * 更新支付项（新方法）
+     */
+    updatePaymentItemAsync(orderUuid: string, paymentUuid: string, params: PaymentUpdateFields): Promise<void>;
+    /**
+     * 获取订单剩余待付金额（新方法）
+     */
+    getRemainingAmountAsync(orderUuid: string): Promise<number>;
+    /**
+     * 获取订单剩余待付金额（基于用户输入的金额）（新方法）
+     */
+    getRemainingAmountWithInputAsync(inputAmount: string | number, orderUuid: string): Promise<number>;
+    /**
+     * 提交支付（新方法）
+     */
+    submitPaymentAsync(orderUuid: string): Promise<{
+        status: 'success' | 'failed';
+    }>;
 }