@pisell/pisellos 2.1.91 → 2.1.93

package/dist/modules/Discount/index.js

@@ -208,6 +208,35 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return batchSearch;
     }()
+  }, {
+    key: "batchSearchByProductIds",
+    value: function () {
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productIds) {
+        var result;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this.request.get("/machinecode/batch-search", {
+                ids: productIds,
+                translate_flag: 1,
+                tags: ['good_pass', 'product_discount_card'],
+                relation_product: 1
+              });
+            case 2:
+              result = _context6.sent;
+              return _context6.abrupt("return", (result === null || result === void 0 ? void 0 : result.data) || []);
+            case 4:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function batchSearchByProductIds(_x8) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }()
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
@@ -309,21 +338,21 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context6.next = 4;
+              _context7.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -333,18 +362,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.store.discountList = [];
               this.store.originalDiscountList = [];
               console.log('[Discount] clear');
             case 3:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -25,6 +25,8 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
+    filter: 0 | 1;
+    exclude_product_ids: number[];
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -81,6 +83,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     metadata?: {
+        num?: number;
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
@@ -105,6 +108,19 @@ export interface Discount {
     isSelected?: boolean;
     isAvailable?: boolean;
     isUsed?: boolean;
+    config?: {
+        isAvailable?: boolean;
+        /** 最大抵扣金额 */
+        maxDeductionAmount?: number;
+        /** 每单最多使用张数 */
+        maxUsagePerOrder?: number;
+        /** 是否抵扣税费与附加费 */
+        deductTaxAndFee?: boolean;
+        /** 适用粒度（多商品共用） */
+        allowCrossProduct?: boolean;
+        /** 可用商品数量上限 */
+        applicableProductLimit?: number;
+    };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
@@ -122,6 +138,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
-import { RequestPlugin } from '../../plugins';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval, RoundingResult } from './types';
 export * from './types';
@@ -21,6 +21,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     request: RequestPlugin;
     private app;
     private store;
+    window: WindowPlugin;
     private dbManager;
     private logger;
     protected otherParams: any;

package/dist/modules/Payment/index.js

@@ -81,6 +81,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "app", void 0);
     // App instance
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "window", void 0);
+    // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
@@ -110,26 +112,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
+              this.window = core.getPlugin('window');
               if (this.request) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 7:
+            case 8:
               if (appPlugin) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 9:
+            case 10:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 14;
+              _context.next = 15;
               return this.ensurePaymentTables();
-            case 14:
+            case 15:
               this.registerNetworkHandlers();
 
               // // 预连接数据库
@@ -137,7 +140,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 17:
+            case 18:
             case "end":
               return _context.stop();
           }

package/dist/modules/Payment/utils.js

@@ -1,5 +1,8 @@
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (typeof data._available_max_amount === 'number') {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 

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

@@ -9,6 +9,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private userIdentificationCodes;
     private searchResults;
     private walletParams;
+    private walletInitData;
     constructor(paymentModule: PaymentModule);
     /**
      * 发送事件的辅助方法
@@ -37,7 +38,14 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataFromBusinessAsync(businessData: WalletInitBusinessData): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
+        transformList: any[];
+        noApplicableVoucher: any[];
+        products: any[];
     }>;
+    /**
+     * 获取订单基础详情
+     */
+    getOrderBasicDetailAsync(orderId: string): Promise<any>;
     /**
      * 初始化钱包数据
      * 先获取推荐列表，再获取用户识别码列表（顺序执行）
@@ -45,6 +53,9 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataAsync(baseParams: WalletDeductionRecommendParams): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
+        transformList: any[];
+        noApplicableVoucher: any[];
+        products: any[];
     }>;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
@@ -92,6 +103,18 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 清除搜索结果缓存
      */
     clearSearchResults(): void;
+    /**
+     * 获取存储的钱包初始化数据
+     */
+    getStoredWalletInitData(): {
+        transformList: any[];
+        noApplicableVoucher: any[];
+        products: any[];
+    } | null;
+    /**
+     * 清除存储的钱包初始化数据
+     */
+    clearStoredWalletInitData(): void;
     /**
      * 清除所有缓存数据
      */