@pisell/pisellos 2.1.170 → 2.1.172

package/dist/modules/Discount/index.js

@@ -1,6 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -163,10 +161,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               prepareConfig = _context4.sent;
               goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
-              return _context4.abrupt("return", {
-                discountList: goodPassList,
-                availableWalletIds: this.extractAvailableWalletIds(prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.data)
-              });
+              return _context4.abrupt("return", goodPassList);
             case 5:
             case "end":
               return _context4.stop();
@@ -178,53 +173,31 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return loadPrepareConfig;
     }()
-  }, {
-    key: "extractAvailableWalletIds",
-    value: function extractAvailableWalletIds(data) {
-      var availableWalletList = Array.isArray(data === null || data === void 0 ? void 0 : data.avaiable_wallet_list) ? data.avaiable_wallet_list : Array.isArray(data === null || data === void 0 ? void 0 : data.available_wallet_list) ? data.available_wallet_list : [];
-      var availableWalletPassList = Array.isArray(data === null || data === void 0 ? void 0 : data.available_wallet_pass_list) ? data.available_wallet_pass_list : [];
-      var walletIds = availableWalletList.map(function (item) {
-        return Number(item === null || item === void 0 ? void 0 : item.wallet_id);
-      }).filter(function (id) {
-        return Number.isFinite(id) && id > 0;
-      });
-      var walletPassProductIds = availableWalletPassList.map(function (item) {
-        return Number(item === null || item === void 0 ? void 0 : item.product_id);
-      }).filter(function (id) {
-        return Number.isFinite(id) && id > 0;
-      });
-      return Array.from(new Set([].concat(_toConsumableArray(walletIds), _toConsumableArray(walletPassProductIds))));
-    }
   }, {
     key: "batchSearch",
     value: function () {
-      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, options) {
-        var _ref, customerId, orderId, result, resultDiscountWithReason;
+      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
+        var result, resultDiscountList;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _ref = options || {}, customerId = _ref.customerId, orderId = _ref.orderId;
-              _context5.next = 3;
-              return this.request.get("/machinecode/batch-search", _objectSpread(_objectSpread({
+              _context5.next = 2;
+              return this.request.get("/machinecode/batch-search", {
                 code: code,
                 translate_flag: 1,
                 tags: ['good_pass', 'product_discount_card'],
-                // available: 1,
+                available: 1,
                 relation_product: 1,
                 with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
                 order_behavior_count: 1,
-                order_behavior_count_customer_id: customerId || 1
-              }, orderId ? {
-                order_behavior_count_order_id: orderId
-              } : {}), {}, {
-                unified_status_info_flag: 1,
+                order_behavior_count_customer_id: customerId || 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              }));
-            case 3:
+              });
+            case 2:
               result = _context5.sent;
-              resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result === null || result === void 0 ? void 0 : result.data) || []) || [];
-              return _context5.abrupt("return", resultDiscountWithReason);
-            case 6:
+              resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
+              return _context5.abrupt("return", resultDiscountList);
+            case 5:
             case "end":
               return _context5.stop();
           }
@@ -332,91 +305,6 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       return true;
     }
 
-    // 过滤启用且可用的优惠券，并返回校验失败原因
-  }, {
-    key: "filterEnabledDiscountListWithReason",
-    value: function filterEnabledDiscountListWithReason(discountList) {
-      var _this3 = this;
-      var lists = discountList.filter(function (discount) {
-        return discount.limit_status === 'enable';
-      }).filter(function (discount) {
-        var remaining = 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 remaining;
-      }).map(function (discount) {
-        var limitFailKey = _this3.checkUsageCreditsLimitWithFailKey(discount);
-        return _objectSpread(_objectSpread({}, discount), {}, {
-          usageLimitFailKey: limitFailKey
-        });
-      });
-
-      // 可用的列表
-      var availableLists = lists.filter(function (item) {
-        return !item.usageLimitFailKey && item.unified_available_status !== 0;
-      });
-      // 不可用数据
-      var currentFailDiscount = lists.find(function (item) {
-        return item.usageLimitFailKey;
-      });
-      return {
-        discountList: availableLists,
-        unavailableReasonKey: currentFailDiscount === null || currentFailDiscount === void 0 ? void 0 : currentFailDiscount.usageLimitFailKey
-      };
-    }
-
-    // 检查使用次数限制，并返回校验失败原因
-  }, {
-    key: "checkUsageCreditsLimitWithFailKey",
-    value: function checkUsageCreditsLimitWithFailKey(discount) {
-      if (!discount.extension_data || discount.extension_data.length === 0) {
-        return null;
-      }
-      var usageCreditsData = discount.extension_data.find(function (data) {
-        return data.field_key === 'usage_credits';
-      });
-      if (!usageCreditsData) {
-        return null;
-      }
-      var value = usageCreditsData.value;
-
-      // 总次数限制
-      if (value.total_credits && value.total_credits > 0) {
-        if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-          return 'total_credits';
-        }
-      }
-
-      // 单用户限制
-      if (value.per_user_limit && value.per_user_limit > 0) {
-        if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-          return 'per_user_limit';
-        }
-      }
-
-      // 单日限制
-      if (value.max_per_day && value.max_per_day > 0) {
-        if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-          return 'max_per_day';
-        }
-      }
-
-      // 单周限制
-      if (value.max_per_week && value.max_per_week > 0) {
-        if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-          return 'max_per_week';
-        }
-      }
-
-      // 单月限制
-      if (value.max_per_month && value.max_per_month > 0) {
-        if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-          return 'max_per_month';
-        }
-      }
-
-      // 全部通过
-      return null;
-    }
-
     // 根据productIds去重
   }, {
     key: "uniqueByProductId",

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

@@ -33,8 +33,8 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
-    exclude_product_ids?: number[];
-    filter?: 0 | 1;
+    filter: 0 | 1;
+    exclude_product_ids: number[];
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -63,15 +63,6 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
-export type DiscountFilterRejectKey = 'total_credits' | 'per_user_limit' | 'max_per_day' | 'max_per_week' | 'max_per_month';
-export interface DiscountWithReason {
-    discountList: Discount[];
-    unavailableReasonKey: DiscountFilterRejectKey | null;
-}
-export interface DiscountPrepareConfigResult {
-    discountList: Discount[];
-    availableWalletIds: number[];
-}
 interface ExtensionData {
     id: number;
     shop_id: number;
@@ -100,6 +91,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";
@@ -124,6 +116,21 @@ export interface Discount {
     isSelected?: boolean;
     isAvailable?: boolean;
     isUsed?: boolean;
+    config?: {
+        isAvailable?: boolean;
+        /** 最大抵扣金额 */
+        maxDeductionAmount?: number;
+        /** 每单最多使用张数 */
+        maxUsagePerOrder?: number;
+        /** 是否抵扣税费与附加费 */
+        deductTaxAndFee?: boolean;
+        /** 适用粒度（多商品共用） */
+        allowCrossProduct?: boolean;
+        /** 可用商品数量上限 */
+        applicableProductLimit?: number;
+        /** 是否抵扣单规格价格 (Option Price) */
+        deductOptionPrice?: boolean;
+    };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
@@ -142,8 +149,6 @@ export interface Discount {
     start_date?: string;
     start_time?: string;
     discount_rule_uncheck_flag?: boolean;
-    usageLimitFailKey?: string | null;
-    unified_available_status?: number | undefined | null;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -1,26 +1,13 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams, UpdateProductInOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
-import { type SubmitPayloadEnhancer } from './utils';
-import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
-import type { Discount } from '../Discount/types';
-import { UnavailableReason } from '../Rules/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
     private request;
     private logger;
-    private window;
-    private cacheId;
-    private salesSummaryModuleName;
-    private rulesHooksOverride?;
-    /**
-     * Populate `savedAmount` on each discount based on product-level discount details.
-     * Only selected discounts get a non-zero value.
-     */
-    static populateSavedAmounts(productList: Array<Record<string, any>>, discountList: Array<Record<string, any>>): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -35,54 +22,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 记录错误日志
      */
     private logError;
-    private registerDiscountModules;
-    private createDefaultRulesHooks;
-    loadDiscountConfig(params: {
-        customerId: number;
-        action?: 'create';
-    }): Promise<void>;
-    getDiscountList(): Discount[];
-    getAvailableWalletIds(): number[];
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: Discount[];
-        type: 'server' | 'clientCalc';
-        unavailableReason?: UnavailableReason;
-        unavailableReasonKey?: string | null;
-    }>;
-    applyDiscount(): void;
-    initTempOrder(params: {
-        cacheId?: string;
-        salesSummaryModuleName?: string;
-    }): void;
-    private getTempOrderStorageKey;
-    private restoreTempOrderFromStorage;
-    persistTempOrder(): void;
-    private createDefaultTempOrderInstance;
-    ensureTempOrder(): ScanOrderTempOrder;
-    restoreOrder(): ScanOrderTempOrder;
-    getTempOrder(): ScanOrderTempOrder | null;
-    addNewOrder(): Promise<ScanOrderTempOrder>;
-    getOrderProducts(): ScanOrderOrderProduct[];
-    private getSalesSummary;
-    recalculateSummary(options?: {
-        createIfMissing?: boolean;
-    }): Promise<ScanOrderSummary | null>;
-    getScanOrderSummary(): Promise<ScanOrderSummary>;
-    updateTempOrderNote(note: string): string;
-    updateTempOrderBuzzer(buzzer: string): string;
-    updateTempOrderContactsInfo(contactsInfo: any[]): any[];
-    addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
-    removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    submitTempOrder<T = any>(params?: {
-        cacheId?: string;
-        platform?: string;
-        businessCode?: string;
-        channel?: string;
-        type?: string;
-        enhancePayload?: SubmitPayloadEnhancer;
-    }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
         platform: string;
@@ -112,9 +51,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * @returns 后端返回的订单数据（包含订单ID等）
      */
     createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
-    submitScanOrder<T = any>(params: SubmitScanOrderParams): Promise<T>;
-    scanOrderMore<T = any>(params: ScanOrderMoreParams): Promise<T>;
-    getOrderInfoByRemote(order_id: number): Promise<any>;
-    getLastOrderInfo(): Record<string, any> | undefined;
 }
-export type { UpdateProductInOrderParams } from './types';