@pisell/pisellos 0.10.39 → 0.10.41

package/dist/modules/BookingContext/index.js

@@ -26,7 +26,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { BaseModule } from "../BaseModule";
 import { RequestModeENUM } from "../../plugins/request";
-import { normalizeRuntimePlatform } from "../../utils/platform";
+import { isCustomerUserPlatform } from "../../utils/platform";
 import { BookingContextEvent } from "./types";
 import { formatResourceListAndMap } from "./utils/formatResourceList";
 export * from "./types";
@@ -158,9 +158,9 @@ export function buildBookingConfigQueryKey() {
 }
 function resolveBookingConfigRequest(platform) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var isH5 = normalizeRuntimePlatform(platform) === 'h5';
-  var endpoint = isH5 ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
-  var query = isH5 ? {
+  var isCustomerPlatform = isCustomerUserPlatform(platform);
+  var endpoint = isCustomerPlatform ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
+  var query = isCustomerPlatform ? {
     item_type: params.item_type || DEFAULT_BOOKING_CONFIG_PARAMS.item_type
   } : _objectSpread(_objectSpread({}, DEFAULT_BOOKING_CONFIG_PARAMS), params);
   var keys = Object.keys(query).sort();

package/dist/modules/Customer/index.js

@@ -197,7 +197,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 url = '/franchisee/customer/select-list';
               }
               _params$skip = params.skip, skip = _params$skip === void 0 ? 1 : _params$skip, _params$num = params.num, num = _params$num === void 0 ? DEFAULT_PAGE_SIZE : _params$num, search = params.search, _otherParams = _objectWithoutProperties(params, _excluded);
-              queryParams = _objectSpread(_objectSpread({
+              queryParams = _objectSpread(_objectSpread(_objectSpread({
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
@@ -206,7 +206,9 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 search_wallet_pass_flag: 1
               }, search && {
                 search: search
-              }), _otherParams);
+              }), _otherParams), url === '/customer/select-list' ? {
+                with_franchisor_data: 1
+              } : {});
               _context2.next = 7;
               return this.request.get(url, queryParams, {
                 cache: {

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

@@ -50,6 +50,8 @@ export interface ShopGetCustomerListParams {
     search_wallet_flag?: 0 | 1;
     /** wallet pass搜索标识 */
     search_wallet_pass_flag?: 0 | 1;
+    /** 是否查询连锁加盟组合店铺数据 */
+    with_franchisor_data?: boolean | 0 | 1;
     /** 其他筛选参数 */
     [key: string]: any;
 }

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

@@ -412,6 +412,8 @@ export interface WalletAssetsBehaviorOptions {
 export interface RefreshWalletAssetsOptions {
     /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
     preserveSelection?: boolean;
+    /** 客户变化时，仅保留与本次扫码匹配的搜索结果；其他搜索缓存仍会清空。 */
+    retainSearchResultCodes?: string[];
 }
 export interface SelectWalletAssetOptions {
     selected: boolean;
@@ -419,6 +421,8 @@ export interface SelectWalletAssetOptions {
 }
 export interface ScanWalletAssetResult {
     type: SearchIdentificationCodeResult['type'];
+    /** walletCode 时保留完整 Wallet Detail，供客户解析与客户选择器使用。 */
+    data?: WalletDetailSearchData;
     asset?: any;
     selected: boolean;
     state: WalletAssetsState;
@@ -864,6 +868,8 @@ export interface SearchIdentificationCodeParams extends WalletDeductionRecommend
  * 搜索识别码响应数据
  */
 export interface SearchIdentificationCodeResponse {
+    /** 业务是否成功 */
+    status?: boolean;
     /** 响应状态码 */
     code?: number;
     /** 响应消息 */
@@ -871,12 +877,26 @@ export interface SearchIdentificationCodeResponse {
     /** 响应数据 */
     data?: SearchIdentificationCodeItem[];
 }
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
+export interface WalletDetailSearchData {
+    id?: string | number;
+    customer_id?: string | number;
+    customer?: Record<string, any> | null;
+    is_cross_shop_wallet?: boolean | 0 | 1;
+    [key: string]: any;
+}
+export interface WalletDetailSearchResponse {
+    status?: boolean;
+    code?: number;
+    message?: string;
+    data?: WalletDetailSearchData | null;
+}
 /**
  * 搜索识别码结果类型
  */
 export type SearchIdentificationCodeResult = {
     type: 'walletCode';
-    data: SearchIdentificationCodeItem[];
+    data: WalletDetailSearchData;
 } | {
     type: 'normalCode';
     data: SearchIdentificationCodeItem[];

package/dist/modules/Payment/types.js

@@ -262,6 +262,8 @@ export var PaymentHooks = /*#__PURE__*/function (PaymentHooks) {
  * 搜索识别码响应数据
  */
 
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
+
 /**
  * 搜索识别码结果类型
  */

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

@@ -96,7 +96,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
-     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+     * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
      */
     searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
         noCache?: boolean;

package/dist/modules/Payment/walletpass.js

@@ -933,7 +933,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
-     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+     * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
      */
   }, {
     key: "searchIdentificationCodeAsync",
@@ -957,7 +957,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
           isWalletCode,
           walletDetailParams,
           _response,
-          _searchResults,
+          walletDetail,
           baseWalletParams,
           searchParams,
           response,
@@ -981,13 +981,14 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               // 新钱包规则
               isWalletCode = code.startsWith('WL') || code.startsWith('200') && code.length === 10;
               if (!isWalletCode) {
-                _context7.next = 14;
+                _context7.next = 16;
                 break;
               }
               // 钱包识别码直接调用专门接口，不缓存，直接返回
               walletDetailParams = {
                 code: code,
                 with_customer: 1,
+                with_franchisor_data: 1,
                 with: ['wallet']
               };
               this.paymentModule.logInfo('[WalletPass] 搜索钱包识别码', {
@@ -999,17 +1000,23 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               return this.paymentModule.request.post('/wallet/detail/search', walletDetailParams);
             case 10:
               _response = _context7.sent;
-              _searchResults = (_response === null || _response === void 0 ? void 0 : _response.data) || [];
+              walletDetail = _response === null || _response === void 0 ? void 0 : _response.data;
+              if (!((_response === null || _response === void 0 ? void 0 : _response.status) !== true || (_response === null || _response === void 0 ? void 0 : _response.code) !== 200 || !walletDetail || _typeof(walletDetail) !== 'object' || Array.isArray(walletDetail))) {
+                _context7.next = 14;
+                break;
+              }
+              throw new Error((_response === null || _response === void 0 ? void 0 : _response.message) || 'Wallet detail search failed');
+            case 14:
               this.paymentModule.logInfo('[WalletPass] 钱包识别码搜索完成', {
                 code: code,
-                results_count: _searchResults.length,
+                results_count: 1,
                 type: 'walletCode'
               });
               return _context7.abrupt("return", {
                 type: 'walletCode',
-                data: _searchResults
+                data: walletDetail
               });
-            case 14:
+            case 16:
               // 合并钱包参数和搜索参数
               baseWalletParams = this.walletParams; // 构建完整的搜索参数，包含钱包扣款推荐的所有参数
               searchParams = {
@@ -1037,20 +1044,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               if (typeof searchParams.payment_order_id === 'string' && searchParams.payment_order_id.startsWith('LOCAL_')) {
                 searchParams.payment_order_id = undefined;
               }
-              _context7.next = 20;
+              _context7.next = 22;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);
-            case 20:
+            case 22:
               response = _context7.sent;
               searchResults = (response === null || response === void 0 ? void 0 : response.data) || [];
               if (!config.noCache) {
-                _context7.next = 24;
+                _context7.next = 26;
                 break;
               }
               return _context7.abrupt("return", {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 24:
+            case 26:
               // 将搜索结果存储到缓存数组中
               if (searchResults.length > 0) {
                 // 避免重复存储相同的识别码
@@ -1080,8 +1087,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 30:
-              _context7.prev = 30;
+            case 32:
+              _context7.prev = 32;
               _context7.t0 = _context7["catch"](1);
               this.paymentModule.logError('[WalletPass] 搜索识别码信息失败', _context7.t0, {
                 code: params.code,
@@ -1089,11 +1096,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 order_expect_amount: params.order_expect_amount
               });
               throw _context7.t0;
-            case 34:
+            case 36:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 30]]);
+        }, _callee7, this, [[1, 32]]);
       }));
       function searchIdentificationCodeAsync(_x8) {
         return _searchIdentificationCodeAsync.apply(this, arguments);
@@ -1119,6 +1126,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
           previousCustomerId,
           customerChanged,
           preserveSelection,
+          retainedSearchCodeKeys,
+          retainedSearchResults,
+          preserveSearchContext,
           committedKeys,
           committedItems,
           selectedIds,
@@ -1153,9 +1163,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               previousCustomerId = this.walletAssetsState.customerId;
               customerChanged = String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '');
               preserveSelection = options.preserveSelection !== false && !customerChanged;
+              retainedSearchCodeKeys = new Set((options.retainSearchResultCodes || []).map(normalizeWalletAssetCode).filter(Boolean));
+              retainedSearchResults = customerChanged && retainedSearchCodeKeys.size > 0 ? this.searchResults.filter(function (item) {
+                return isWalletPaymentAsset(item) && getWalletAssetCodeKeys(item).some(function (code) {
+                  return retainedSearchCodeKeys.has(code);
+                });
+              }) : [];
               if (customerChanged) {
                 this.clearSearchResults();
+                if (retainedSearchResults.length > 0) {
+                  this.searchResults = mergeWalletAssets(retainedSearchResults);
+                  this.queuePendingAutoSelectForAssets(retainedSearchResults);
+                }
               }
+              preserveSearchContext = preserveSelection || retainedSearchResults.length > 0;
               committedKeys = new Set(this.walletAssetsState.committedIds.map(function (id) {
                 return String(id);
               }));
@@ -1180,7 +1201,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               // 清空购物车时保留扫码资产供后续加购恢复；只有手动 Remove/Clear
               // 会取消自动应用资格，商品变化导致的自动失效需要重新进入待选队列。
               if ((_businessData$product2 = businessData.products) !== null && _businessData$product2 !== void 0 && _businessData$product2.length) {
-                _context8.next = 24;
+                _context8.next = 27;
                 break;
               }
               this.queuePendingAutoSelectForAssets(scanSelectedAssets);
@@ -1218,7 +1239,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 totalSelectedAmount: 0,
                 error: null
               }));
-            case 24:
+            case 27:
               this.publishWalletAssetsState({
                 status: 'loading',
                 customerId: nextCustomerId,
@@ -1229,40 +1250,40 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 totalSelectedAmount: preserveSelection ? this.walletAssetsState.totalSelectedAmount : 0,
                 error: null
               });
-              _context8.prev = 25;
-              searchedWalletAssetCodes = preserveSelection ? this.getSearchedWalletAssetCodes() : [];
-              useAggregateRecalculate = preserveSelection && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
+              _context8.prev = 28;
+              searchedWalletAssetCodes = preserveSearchContext ? this.getSearchedWalletAssetCodes() : [];
+              useAggregateRecalculate = preserveSearchContext && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
               if (!useAggregateRecalculate) {
-                _context8.next = 34;
+                _context8.next = 37;
                 break;
               }
-              _context8.next = 31;
+              _context8.next = 34;
               return this.aggregateRecalculateWalletAssetsAsync(businessData, selectedIds);
-            case 31:
+            case 34:
               _context8.t0 = _context8.sent;
-              _context8.next = 35;
+              _context8.next = 38;
               break;
-            case 34:
+            case 37:
               _context8.t0 = null;
-            case 35:
+            case 38:
               aggregateResult = _context8.t0;
               _context8.t1 = aggregateResult;
               if (_context8.t1) {
-                _context8.next = 41;
+                _context8.next = 44;
                 break;
               }
-              _context8.next = 40;
+              _context8.next = 43;
               return this.initializeWalletDataFromBusinessAsync(businessData);
-            case 40:
+            case 43:
               _context8.t1 = _context8.sent;
-            case 41:
+            case 44:
               result = _context8.t1;
               if (!(requestSequence !== this.walletAssetsRequestSequence)) {
-                _context8.next = 44;
+                _context8.next = 47;
                 break;
               }
               return _context8.abrupt("return", this.getWalletAssetsState());
-            case 44:
+            case 47:
               this.walletAssetsCalculationContext = {
                 orderTotalAmount: Number(businessData.order_wait_pay_amount || 0),
                 products: result.products || businessData.products || []
@@ -1283,13 +1304,13 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                   });
                 }
               }
-              searchedWalletAssets = preserveSelection ? this.syncSearchedWalletAssets([].concat(_toConsumableArray(result.transformList || []), _toConsumableArray(result.noApplicableVoucher || []))) : [];
+              searchedWalletAssets = preserveSearchContext ? this.syncSearchedWalletAssets([].concat(_toConsumableArray(result.transformList || []), _toConsumableArray(result.noApplicableVoucher || []))) : [];
               if (!(requestSequence !== this.walletAssetsRequestSequence)) {
-                _context8.next = 50;
+                _context8.next = 53;
                 break;
               }
               return _context8.abrupt("return", this.getWalletAssetsState());
-            case 50:
+            case 53:
               recommendedKeys = new Set((result.walletRecommendList || []).map(function (asset) {
                 return getWalletAssetKey(asset);
               }));
@@ -1335,15 +1356,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
               this.queuePendingAutoSelectForAssets(droppedScanSelectedAssets);
               return _context8.abrupt("return", nextState);
-            case 65:
-              _context8.prev = 65;
-              _context8.t2 = _context8["catch"](25);
+            case 68:
+              _context8.prev = 68;
+              _context8.t2 = _context8["catch"](28);
               if (!(requestSequence !== this.walletAssetsRequestSequence)) {
-                _context8.next = 69;
+                _context8.next = 72;
                 break;
               }
               return _context8.abrupt("return", this.getWalletAssetsState());
-            case 69:
+            case 72:
               this.paymentModule.logError('[WalletPass] 刷新共享钱包资产失败，保留刷新前状态', _context8.t2, {
                 customer_id: businessData.customer_id,
                 selected_ids: selectedIds,
@@ -1359,11 +1380,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 customerId: nextCustomerId,
                 error: _context8.t2 instanceof Error ? _context8.t2.message : String(_context8.t2)
               }));
-            case 71:
+            case 74:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[25, 65]]);
+        }, _callee8, this, [[28, 68]]);
       }));
       function refreshWalletAssetsFromBusinessAsync(_x9) {
         return _refreshWalletAssetsFromBusinessAsync.apply(this, arguments);
@@ -1541,6 +1562,18 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               }));
             case 9:
               result = _context9.sent;
+              if (!(result.type === 'walletCode')) {
+                _context9.next = 12;
+                break;
+              }
+              return _context9.abrupt("return", {
+                type: 'walletCode',
+                data: result.data,
+                asset: result.data,
+                selected: false,
+                state: this.getWalletAssetsState()
+              });
+            case 12:
               paymentAssets = this.formatSearchedWalletPaymentAssets(result.data.filter(isWalletPaymentAsset));
               if (paymentAssets.length > 0) {
                 this.searchResults = mergeWalletAssets(this.searchResults, paymentAssets);
@@ -1548,17 +1581,17 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               asset = paymentAssets.find(function (item) {
                 return String((item === null || item === void 0 ? void 0 : item.code) || '') === normalizedCode;
               }) || paymentAssets[0];
-              if (!(!asset || result.type === 'walletCode')) {
-                _context9.next = 15;
+              if (asset) {
+                _context9.next = 17;
                 break;
               }
               return _context9.abrupt("return", {
-                type: result.type,
+                type: 'normalCode',
                 asset: asset,
                 selected: false,
                 state: this.getWalletAssetsState()
               });
-            case 15:
+            case 17:
               items = mergeWalletAssets(this.walletAssetsState.items, [asset]);
               recalculatedState = this.recalculateWalletAssets(items, this.walletAssetsState.selectedIds, this.walletAssetsState.selectionSources);
               assetId = getWalletAssetId(asset);
@@ -1588,7 +1621,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 selected: isSelected,
                 state: selected
               });
-            case 25:
+            case 27:
             case "end":
               return _context9.stop();
           }

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

@@ -397,6 +397,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     refreshWalletAssets(params?: {
         order_wait_pay_amount?: number;
         preserveSelection?: boolean;
+        retainSearchResultCodes?: string[];
     }): Promise<WalletAssetsState>;
     /** 选择或取消单张钱包资产，并立即同步 pending wallet payments。 */
     selectWalletAsset(params: {