@pisell/pisellos 0.0.568 → 0.10.1

package/dist/solution/Checkout/utils/index.js

@@ -30,10 +30,10 @@ export function validateCheckoutData(params) {
     });
   }
 
-  // 验证订单类型
-  if (params.orderType && !['virtual', 'appointment_booking'].includes(params.orderType)) {
-    errors.push('订单类型无效，必须是 virtual 或 appointment_booking');
-  }
+  // // 验证订单类型
+  // if (params.orderType && !['virtual', 'appointment_booking'].includes(params.orderType)) {
+  //   errors.push('订单类型无效，必须是 virtual 或 appointment_booking');
+  // }
 
   // 验证平台类型
   if (params.platform && !['pc', 'h5'].includes(params.platform)) {
@@ -284,29 +284,33 @@ export function isProduction() {
  */
 export var logger = {
   info: function info(message) {
+    var _console;
     for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
       args[_key3 - 1] = arguments[_key3];
     }
+    (_console = console).log.apply(_console, ["[Checkout] ".concat(message)].concat(args));
   },
   warn: function warn(message) {
-    var _console;
+    var _console2;
     for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
       args[_key4 - 1] = arguments[_key4];
     }
-    (_console = console).warn.apply(_console, ["[Checkout] ".concat(message)].concat(args));
+    (_console2 = console).warn.apply(_console2, ["[Checkout] ".concat(message)].concat(args));
   },
   error: function error(message) {
-    var _console2;
+    var _console3;
     for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
       args[_key5 - 1] = arguments[_key5];
     }
-    (_console2 = console).error.apply(_console2, ["[Checkout] ".concat(message)].concat(args));
+    (_console3 = console).error.apply(_console3, ["[Checkout] ".concat(message)].concat(args));
   },
   debug: function debug(message) {
     if (!isProduction()) {
+      var _console4;
       for (var _len6 = arguments.length, args = new Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
         args[_key6 - 1] = arguments[_key6];
       }
+      (_console4 = console).debug.apply(_console4, ["[Checkout] ".concat(message)].concat(args));
     }
   }
 };
@@ -420,6 +424,14 @@ export function extractAmountFromCartSummary(cartSummary) {
         break;
     }
   });
+  console.log('[Checkout] 从购物车小计提取金额信息:', {
+    totalAmount: result.totalAmount,
+    subTotal: result.subTotal,
+    taxAmount: result.taxAmount,
+    discountAmount: result.discountAmount,
+    shopDiscountAmount: result.shopDiscountAmount,
+    roundingAmount: result.roundingAmount
+  });
   return result;
 }
 

package/dist/solution/RegisterAndLogin/config.js

@@ -742,11 +742,7 @@ var webposConfig = {
         // withCredentials: true,
         prefix: false,
         isDefaultSaasDomain: true,
-        cache: {
-          mode: "remote_local",
-          type: "indexDB",
-          cacheKeyData: values
-        }
+        cache: false
       };
     }
   },
@@ -1079,11 +1075,7 @@ var shopWebposConfig = {
       return {
         // withCredentials: true,
         prefix: false,
-        cache: {
-          mode: "remote_local",
-          type: "indexDB",
-          cacheKeyData: values
-        }
+        cache: false
       };
     }
   },

package/dist/solution/RegisterAndLogin/index.js

@@ -331,9 +331,10 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
             case 13:
               // 预先调用获取区号的方法，初始内存缓存
               this.getCountries();
-              _context4.next = 16;
+              console.log('[RegisterAndLogin] 初始化完成');
+              _context4.next = 17;
               return this.core.effects.emit(RegisterAndLoginHooks.onInited, {});
-            case 16:
+            case 17:
             case "end":
               return _context4.stop();
           }
@@ -2249,46 +2250,63 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
-              _context35.next = 2;
+              console.log('[RegisterAndLogin] Facebook 登录开始', {
+                tokenLength: (token === null || token === void 0 ? void 0 : token.length) || 0,
+                timestamp: Date.now()
+              });
+              _context35.next = 3;
               return this.initFacebookSDK(token);
-            case 2:
+            case 3:
+              console.log('[RegisterAndLogin] Facebook SDK 初始化完成，准备调用 FB.login');
               return _context35.abrupt("return", new Promise(function (resolve, reject) {
+                console.log('[RegisterAndLogin] 调用 FB.login', {
+                  scope: 'email,public_profile'
+                });
                 window.FB.login( /*#__PURE__*/function () {
                   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(response) {
                     var result;
                     return _regeneratorRuntime().wrap(function _callee34$(_context34) {
                       while (1) switch (_context34.prev = _context34.next) {
                         case 0:
+                          console.log('[RegisterAndLogin] FB.login 回调触发', {
+                            hasAuthResponse: Boolean(response === null || response === void 0 ? void 0 : response.authResponse),
+                            status: response === null || response === void 0 ? void 0 : response.status
+                          });
                           if (!response.authResponse) {
-                            _context34.next = 14;
+                            _context34.next = 17;
                             break;
                           }
-                          _context34.prev = 1;
-                          _context34.next = 4;
+                          _context34.prev = 2;
+                          // 直接调用 /auth/facebook/login 接口
+                          console.log('[RegisterAndLogin] 调用后端 facebookLogin 接口');
+                          _context34.next = 6;
                           return _this2.apiCaller.call('facebookLogin', {
                             token: response.authResponse.accessToken
                           });
-                        case 4:
+                        case 6:
                           result = _context34.sent;
+                          console.log('[RegisterAndLogin] facebookLogin 接口返回成功', {
+                            hasResult: Boolean(result)
+                          });
                           resolve(result);
-                          _context34.next = 12;
+                          _context34.next = 15;
                           break;
-                        case 8:
-                          _context34.prev = 8;
-                          _context34.t0 = _context34["catch"](1);
+                        case 11:
+                          _context34.prev = 11;
+                          _context34.t0 = _context34["catch"](2);
                           console.error('[RegisterAndLogin] facebookLogin 接口调用失败', _context34.t0);
                           reject(_context34.t0);
-                        case 12:
-                          _context34.next = 16;
+                        case 15:
+                          _context34.next = 19;
                           break;
-                        case 14:
+                        case 17:
                           console.warn('[RegisterAndLogin] FB.login 用户取消授权或无 authResponse', response);
                           reject(new Error('facebook_login_cancel'));
-                        case 16:
+                        case 19:
                         case "end":
                           return _context34.stop();
                       }
-                    }, _callee34, null, [[1, 8]]);
+                    }, _callee34, null, [[2, 11]]);
                   }));
                   return function (_x31) {
                     return _ref.apply(this, arguments);
@@ -2297,7 +2315,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   scope: 'email,public_profile'
                 });
               }));
-            case 3:
+            case 5:
             case "end":
               return _context35.stop();
           }
@@ -2320,14 +2338,20 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              _context37.next = 2;
+              // 先加载 Apple SDK
+              console.log('[RegisterAndLogin] Apple 登录开始', {
+                tokenLength: (token === null || token === void 0 ? void 0 : token.length) || 0,
+                timestamp: Date.now()
+              });
+              _context37.next = 3;
               return this.initAppleSDK();
-            case 2:
+            case 3:
+              console.log('[RegisterAndLogin] Apple SDK 初始化完成');
               return _context37.abrupt("return", new Promise(function (resolve, reject) {
                 try {
                   var _AppleID, _AppleID2;
                   // 动态创建 Apple 登录按钮元素
-
+                  console.log('[RegisterAndLogin] 创建临时 Apple SignIn 按钮节点');
                   var appleSignInDiv = document.createElement('div');
                   appleSignInDiv.id = 'appleid-signin-temp';
                   appleSignInDiv.setAttribute('data-color', 'black');
@@ -2344,8 +2368,11 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
 
                   // 将元素添加到 body 中
                   document.body.appendChild(appleSignInDiv);
+                  console.log('[RegisterAndLogin] Apple SignIn 按钮已添加到文档');
+
                   // 初始化 Apple ID 按钮
                   if ((_AppleID = window.AppleID) !== null && _AppleID !== void 0 && (_AppleID = _AppleID.auth) !== null && _AppleID !== void 0 && _AppleID.init) {
+                    console.log('[RegisterAndLogin] 调用 AppleID.auth.init');
                     window.AppleID.auth.init({
                       clientId: token,
                       // 使用传入的 token 作为 clientId
@@ -2360,6 +2387,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
 
                   // 直接调用 Apple ID 登录，并处理 Promise
                   if ((_AppleID2 = window.AppleID) !== null && _AppleID2 !== void 0 && (_AppleID2 = _AppleID2.auth) !== null && _AppleID2 !== void 0 && _AppleID2.signIn) {
+                    console.log('[RegisterAndLogin] 调用 AppleID.auth.signIn');
                     window.AppleID.auth.signIn().then( /*#__PURE__*/function () {
                       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(authResult) {
                         var _authResult$authoriza, _authResult$authoriza2, authorizationCode, identityToken, result;
@@ -2371,29 +2399,44 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                               if (document.body.contains(appleSignInDiv)) {
                                 document.body.removeChild(appleSignInDiv);
                               }
+                              console.log('[RegisterAndLogin] Apple SignIn 成功，临时节点已移除', {
+                                hasAuthorization: Boolean(authResult === null || authResult === void 0 ? void 0 : authResult.authorization),
+                                hasUser: Boolean(authResult === null || authResult === void 0 ? void 0 : authResult.user)
+                              });
+
                               // 获取授权码或令牌
                               authorizationCode = (_authResult$authoriza = authResult.authorization) === null || _authResult$authoriza === void 0 ? void 0 : _authResult$authoriza.code;
-                              identityToken = (_authResult$authoriza2 = authResult.authorization) === null || _authResult$authoriza2 === void 0 ? void 0 : _authResult$authoriza2.id_token; // 使用授权码或身份令牌调用后端接口
-                              _context36.next = 6;
+                              identityToken = (_authResult$authoriza2 = authResult.authorization) === null || _authResult$authoriza2 === void 0 ? void 0 : _authResult$authoriza2.id_token;
+                              console.log('[RegisterAndLogin] Apple 授权结果解析', {
+                                hasAuthorizationCode: Boolean(authorizationCode),
+                                hasIdentityToken: Boolean(identityToken)
+                              });
+
+                              // 使用授权码或身份令牌调用后端接口
+                              console.log('[RegisterAndLogin] 调用后端 appleLogin 接口');
+                              _context36.next = 9;
                               return _this3.apiCaller.call('appleLogin', {
                                 code: identityToken || authorizationCode,
                                 login_channel: _this3.channel
                               });
-                            case 6:
+                            case 9:
                               result = _context36.sent;
+                              console.log('[RegisterAndLogin] appleLogin 接口返回成功', {
+                                hasResult: Boolean(result)
+                              });
                               resolve(result);
-                              _context36.next = 14;
+                              _context36.next = 18;
                               break;
-                            case 10:
-                              _context36.prev = 10;
+                            case 14:
+                              _context36.prev = 14;
                               _context36.t0 = _context36["catch"](0);
                               console.error('[RegisterAndLogin] 处理 Apple 登录结果失败', _context36.t0);
                               reject(_context36.t0);
-                            case 14:
+                            case 18:
                             case "end":
                               return _context36.stop();
                           }
-                        }, _callee36, null, [[0, 10]]);
+                        }, _callee36, null, [[0, 14]]);
                       }));
                       return function (_x33) {
                         return _ref2.apply(this, arguments);
@@ -2415,7 +2458,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   reject(error);
                 }
               }));
-            case 3:
+            case 5:
             case "end":
               return _context37.stop();
           }
@@ -2577,6 +2620,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   } catch (error) {
                     console.warn('[RegisterAndLogin] localStorage 更新失败:', error);
                   }
+                  console.log('[RegisterAndLogin] 国家数据已更新');
                 }
               }
               _context39.next = 10;
@@ -2606,6 +2650,8 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
               _context40.next = 2;
               return this.core.effects.emit(RegisterAndLoginHooks.onDestroy, {});
             case 2:
+              console.log('[RegisterAndLogin] 已销毁');
+            case 3:
             case "end":
               return _context40.stop();
           }

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import type { RequestPlugin } from '../../plugins/request';
-import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesTimelineHighlights } from './types';
+import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams } from './types';
 import type { BookingData } from '../../server/modules/order/types';
 export * from './types';
 /**
@@ -14,6 +14,7 @@ export * from './types';
  * - 基础生命周期占位
  *
  * 不提前实现 store 编排、初始化流程细节、状态计算逻辑。
+ * TIPS：这块应该改名叫 ReservationModule 更合适一些，目前这边只服务于 Reservation 的 floormap 展示。
  */
 export declare class SalesImpl extends BaseModule implements Module, SalesModuleAPI {
     protected defaultName: string;
@@ -24,6 +25,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     protected options: ModuleOptions;
     protected otherParams: Record<string, any>;
     protected request: RequestPlugin;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /** 获取当前 store 快照 */
@@ -38,6 +40,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     setReservationList(reservationList: Reservation[]): Reservation[];
     /** 重置预约列表为空 */
     resetReservationList(): Reservation[];
+    cancelOrder(orderIds: Array<number | string>): Promise<any>;
+    changeBookingStatus(params: ChangeBookingStatusParams): Promise<any>;
     destroy(): Promise<void>;
     /**
      * 时间轴粒度（分钟）
@@ -76,6 +80,14 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getBookingStatus;
     private getResourceId;
+    private getBookingAppointmentStatus;
+    private isBookingIncludedInStats;
+    private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
+    private isBookingMatchedResource;
+    private sortMatchedBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -85,12 +97,45 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private pickBookingsForCurrentPoint;
     /**
-     * 标准化单条 booking：
-     * - 过滤终态（rejected/cancelled/completed）
-     * - 注入 status / isTimeout / reserved_status
+     * 计算 booking 在 current 时刻的执行进度百分比（0-100）。
+     * - startAt/endAt 非法或 totalMinutes <= 0 返回 0
+     * - current 早于 startAt 返回 0，晚于 endAt 返回 100
+     */
+    private calcProgressPercent;
+    /**
+     * 标准化单条 booking 的分发入口：
+     * - 统一过滤 rejected / cancelled（视为没来过）
+     * - current === deviceCurrent 走实时分支（信任 appointment_status）
+     * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
      */
     private normalizeMatchedBooking;
-    getResourceBookingList(currentTime: string, bookingList?: BookingData[]): Promise<SalesResourceBookingItem[]>;
+    private normalizeResourceBookings;
+    private buildCompletedBooking;
+    /**
+     * 实时模式（current === deviceCurrent）：信任 appointment_status
+     * - 过滤 new / completed（实时视角下视为非活跃数据）
+     * - status 由 getBookingStatus 映射
+     * - occupied 且 current > endAt 标记 isTimeout + timeoutTime
+     * - reserved 且 current < startAt 标记 not_arrived，否则标记 late
+     */
+    private buildRealtimeBooking;
+    /**
+     * 快照模式（current !== deviceCurrent，过去或未来）：忽略 appointment_status
+     * 的实时态差异，仅按 booking 时间窗判定，为 current 提供时间点快照视图。
+     *
+     * - new：视作尚未成为真实预约，过滤
+     * - locked：保留 status=locked，不计算 timeout/late/progress
+     * - 其他非终态：
+     *   - startAt/endAt 非法 → 过滤
+     *   - current > endAt → 过滤（已结束，不入池）
+     *   - current ∈ [startAt, endAt] → occupied，附带 progressPercent
+     *   - current < startAt → reserved + not_arrived，附带 remainingReserveTime
+     *
+     * 快照模式下 isTimeout 恒为 false，lateTime / timeoutTime 始终置空。
+     */
+    private buildSnapshotBooking;
+    getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
+    getResourceBookingItem(params: GetResourceBookingItemParams): Promise<SalesResourceBookingItemWithGroups | null>;
 }
 export { SalesImpl as Sales };
 export default SalesImpl;