@pisell/pisellos 2.1.173 → 2.1.174

package/dist/modules/Discount/index.js

@@ -1,4 +1,8 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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(); }
@@ -27,6 +31,8 @@ import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { BaseModule } from "../BaseModule";
 import { DiscountHooks } from "./types";
 import Decimal from 'decimal.js';
+import { isEntitlementPass } from "./entitlementPass";
+import { getDiscountLifecycleReason, getDiscountUsageLimitFailKey } from "./availability";
 export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(DiscountModule, _BaseModule);
   var _super = _createSuper(DiscountModule);
@@ -153,8 +159,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _prepareConfig$data, _prepareConfig$data2;
-        var prepareConfig, goodPassList;
+        var _prepareConfig$data3, _prepareConfig$data4, _prepareConfig$data5;
+        var prepareConfig, _prepareConfig$data, _prepareConfig$data2, entitlementPassList, ids, rawDiscountList, goodPassList;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -162,9 +168,29 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             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", goodPassList);
+              if (params.with_entitlement_pass) {
+                _context4.next = 5;
+                break;
+              }
+              return _context4.abrupt("return", 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) || [])).filter(function (item) {
+                return !isEntitlementPass(item);
+              })));
             case 5:
+              entitlementPassList = (prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data3 = prepareConfig.data) === null || _prepareConfig$data3 === void 0 ? void 0 : _prepareConfig$data3.entitlement_pass_list) || [];
+              ids = new Set(entitlementPassList.map(function (item) {
+                return String(item.id);
+              }));
+              rawDiscountList = [].concat(_toConsumableArray(entitlementPassList), _toConsumableArray(((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data4 = prepareConfig.data) === null || _prepareConfig$data4 === void 0 ? void 0 : _prepareConfig$data4.good_pass_list) || []).filter(function (item) {
+                return !ids.has(String(item.id));
+              })), _toConsumableArray(((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data5 = prepareConfig.data) === null || _prepareConfig$data5 === void 0 ? void 0 : _prepareConfig$data5.discount_card_list) || []).filter(function (item) {
+                return !ids.has(String(item.id));
+              })));
+              _context4.next = 10;
+              return this.setOriginalDiscountList(rawDiscountList);
+            case 10:
+              goodPassList = this.filterEnabledDiscountList(rawDiscountList); // this.setDiscountList(goodPassList);
+              return _context4.abrupt("return", goodPassList);
+            case 12:
             case "end":
               return _context4.stop();
           }
@@ -178,18 +204,22 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     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, customerIdOrOptions) {
+        var _this2 = this,
+          _entitlement$value,
+          _legacy$value;
+        var _ref, customerId, orderId, withEntitlementPass, params, _result, search, _yield$Promise$all, _yield$Promise$all2, legacy, entitlement, entitlementList, legacyList, ids, result;
         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({
+              _ref = typeof customerIdOrOptions === 'number' ? {
+                customerId: customerIdOrOptions,
+                orderId: undefined,
+                withEntitlementPass: false
+              } : customerIdOrOptions || {}, customerId = _ref.customerId, orderId = _ref.orderId, withEntitlementPass = _ref.withEntitlementPass;
+              params = _objectSpread(_objectSpread({
                 code: code,
                 translate_flag: 1,
-                tags: ['good_pass', 'product_discount_card'],
-                // available: 1,
                 relation_product: 1,
                 with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
                 order_behavior_count: 1,
@@ -199,12 +229,75 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               } : {}), {}, {
                 unified_status_info_flag: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+              });
+              if (withEntitlementPass) {
+                _context5.next = 7;
+                break;
+              }
+              _context5.next = 5;
+              return this.request.get("/machinecode/batch-search", _objectSpread(_objectSpread({}, params), {}, {
+                tags: ['good_pass', 'product_discount_card']
               }));
-            case 3:
-              result = _context5.sent;
-              resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result === null || result === void 0 ? void 0 : result.data) || []) || [];
-              return _context5.abrupt("return", resultDiscountWithReason);
-            case 6:
+            case 5:
+              _result = _context5.sent;
+              return _context5.abrupt("return", this.filterEnabledDiscountListWithReason(((_result === null || _result === void 0 ? void 0 : _result.data) || []).filter(function (item) {
+                return !isEntitlementPass(item);
+              })));
+            case 7:
+              // 旧券沿用统一状态校验；多次卡单独查询，保留暂不可用的卡供展示。
+              search = function search(query) {
+                return _this2.request.get("/machinecode/batch-search", query).then(function (value) {
+                  return {
+                    status: 'fulfilled',
+                    value: value
+                  };
+                }, function (reason) {
+                  return {
+                    status: 'rejected',
+                    reason: reason
+                  };
+                });
+              };
+              _context5.next = 10;
+              return Promise.all([search(_objectSpread(_objectSpread({}, params), {}, {
+                tags: ['good_pass', 'product_discount_card']
+              })), search(_objectSpread(_objectSpread({}, params), {}, {
+                tags: ['entitlement_pass'],
+                with_franchisor_data: 1,
+                unified_status_info_flag: 1,
+                with: [].concat(_toConsumableArray(params.with), ['franchiseeWalletPass:shop_id,source_shop_id,product_id,use'])
+              }))]);
+            case 10:
+              _yield$Promise$all = _context5.sent;
+              _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+              legacy = _yield$Promise$all2[0];
+              entitlement = _yield$Promise$all2[1];
+              entitlementList = (entitlement.status === 'fulfilled' ? ((_entitlement$value = entitlement.value) === null || _entitlement$value === void 0 ? void 0 : _entitlement$value.data) || [] : []).filter(isEntitlementPass);
+              legacyList = legacy.status === 'fulfilled' ? ((_legacy$value = legacy.value) === null || _legacy$value === void 0 ? void 0 : _legacy$value.data) || [] : [];
+              ids = new Set(entitlementList.map(function (item) {
+                return String(item.id);
+              }));
+              result = this.filterEnabledDiscountListWithReason([].concat(_toConsumableArray(entitlementList), _toConsumableArray(legacyList.filter(function (item) {
+                return !isEntitlementPass(item) && !ids.has(String(item.id));
+              })))); // 任一类型查到可用卡即可继续，另一类型的查询失败不阻断该卡。
+              if (result.discountList.length) {
+                _context5.next = 23;
+                break;
+              }
+              if (!(legacy.status === 'rejected')) {
+                _context5.next = 21;
+                break;
+              }
+              throw legacy.reason;
+            case 21:
+              if (!(entitlement.status === 'rejected')) {
+                _context5.next = 23;
+                break;
+              }
+              throw entitlement.reason;
+            case 23:
+              return _context5.abrupt("return", result);
+            case 24:
             case "end":
               return _context5.stop();
           }
@@ -247,9 +340,9 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
-      var _this2 = this;
+      var _this3 = 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) && _this2.checkUsageCreditsLimit(discount);
+        return isEntitlementPass(discount) ? !getDiscountLifecycleReason(discount) : 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) && _this3.checkUsageCreditsLimit(discount);
       });
     }
 
@@ -316,14 +409,19 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "filterEnabledDiscountListWithReason",
     value: function filterEnabledDiscountListWithReason(discountList) {
-      var _this3 = this;
-      var lists = discountList.filter(function (discount) {
+      var _this4 = this;
+      var entitlementPasses = discountList.filter(function (item) {
+        return isEntitlementPass(item) && !getDiscountLifecycleReason(item);
+      });
+      var lists = discountList.filter(function (item) {
+        return !isEntitlementPass(item);
+      }).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);
+        var limitFailKey = _this4.checkUsageCreditsLimitWithFailKey(discount);
         return _objectSpread(_objectSpread({}, discount), {}, {
           usageLimitFailKey: limitFailKey
         });
@@ -338,8 +436,12 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
         return item.usageLimitFailKey;
       });
       return {
-        discountList: availableLists,
-        unavailableReasonKey: currentFailDiscount === null || currentFailDiscount === void 0 ? void 0 : currentFailDiscount.usageLimitFailKey
+        discountList: [].concat(_toConsumableArray(entitlementPasses.map(function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            usageLimitFailKey: getDiscountUsageLimitFailKey(item)
+          });
+        })), _toConsumableArray(availableLists)),
+        unavailableReasonKey: (currentFailDiscount === null || currentFailDiscount === void 0 ? void 0 : currentFailDiscount.usageLimitFailKey) || discountList.filter(isEntitlementPass).map(getDiscountLifecycleReason).find(Boolean) || null
       };
     }
 

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

@@ -45,6 +45,8 @@ interface ApplicableProductDetails {
     num: number;
     metadata?: {
         product_discount_difference?: number;
+        num?: number;
+        custom_product_bundle_map_id?: string;
     };
     discount?: {
         fixed_amount?: number;
@@ -63,10 +65,17 @@ interface UsageCreditsValue {
     max_per_week: number;
     max_per_month: number;
 }
+export type IncludedUses = {
+    type: 'limited';
+    value: number;
+} | {
+    type: 'unlimited';
+    value: null;
+};
 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;
+    unavailableReasonKey: DiscountFilterRejectKey | string | null;
 }
 interface ExtensionData {
     id: number;
@@ -93,19 +102,39 @@ export interface Discount {
     used_par_value: string;
     limit_status: string;
     limited_relation_product_data: Limitedrelationproductdata;
-    balance: string;
+    balance?: string | number | null;
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
-        discount_calculation_mode: 'item_level' | 'order_level';
-        holder: {
+        included_uses?: IncludedUses;
+        discount_calculation_mode?: 'item_level' | 'order_level';
+        holder?: {
             type: "customer" | "custom";
         };
     };
     product: Product;
-    type: "product" | 'good_pass';
+    type?: 'product' | 'good_pass' | 'entitlement_pass' | 'discount_card' | 'product_discount_card';
+    shop_id?: number;
+    customer_id?: number | string | null;
+    holder?: {
+        holder_type?: string;
+        holder_id?: number | string | Array<number | string>;
+        [key: string]: any;
+    };
+    config?: {
+        isAvailable?: boolean;
+        maxUsagePerOrder?: number;
+        [key: string]: any;
+    };
+    reason?: string;
+    reasonCode?: string;
+    is_franchisor_pass?: number;
+    franchisee_wallet_pass?: {
+        use?: string;
+    };
+    committedAppliedProductDetails?: ApplicableProductDetails[];
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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

@@ -0,0 +1,48 @@
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { IFormInfo, IFormRecord, IFormItemData, IFetchFormInfoParams, IFetchFormRecordsParams, IAddFormRecordParams, IAppendFormRecordParams, IEnsureFormDataParams, IEnsureFormByProductParams, IRefreshAllFormRecordsParams, HolderModuleAPI, HolderFormMap } from './types';
+export * from './types';
+export * from './utils';
+export declare class HolderModule extends BaseModule implements Module, HolderModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    private request;
+    private cacheId;
+    private openCache;
+    private fatherModule;
+    private isLoading;
+    private error;
+    /** 已加载过表单数据的 form_id 缓存标记 */
+    private loadedFormIds;
+    private window;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /** 统一提交 formMap，仅此处触发 store changed */
+    private commitFormMap;
+    /** 通知 UI 刷新（数据未变但需要 re-read 的场景） */
+    private notifyFormMapChanged;
+    getHolderFormMap(): HolderFormMap;
+    getHolderFormData(formId: number | string): IFormItemData | undefined;
+    setFormData(formId: number | string, data: Partial<IFormItemData>): void;
+    private ensureFormItem;
+    private hasFormData;
+    private patchFormMap;
+    fetchFormInfo(params: IFetchFormInfoParams): Promise<IFormInfo | IFormInfo[]>;
+    fetchRecords(params: IFetchFormRecordsParams): Promise<any>;
+    ensureFormData(params: IEnsureFormDataParams): Promise<IFormItemData>;
+    ensureFormByProduct(params: IEnsureFormByProductParams): Promise<IFormItemData | null>;
+    addFormRecord(params: IAddFormRecordParams): Promise<any>;
+    /**
+     * UI 层自行请求添加接口后，将返回记录合并到 holderMap 对应 form_id 的 records 中
+     */
+    appendFormRecord(params: IAppendFormRecordParams): IFormRecord;
+    removeFormRecord(formId: number | string, formRecordId: number): void;
+    clearFormData(formId?: number | string): void;
+    /**
+     * 登录后按当前 holderMap 批量刷新所有表单的 records。
+     * 遍历 holderMap，从 form.form 中读取 form_id、shop_id，结合 customer_id 重新拉取记录。
+     */
+    refreshAllFormRecords(params?: IRefreshAllFormRecordsParams): Promise<HolderFormMap>;
+    storeChange(path?: string): void;
+}