@pisell/pisellos 0.0.231 → 0.0.233

package/dist/modules/Order/index.js

@@ -170,7 +170,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _params$bookings, _params$relation_prod, _params$payments;
-        var _orderData$bookings, _orderData$relation_p, _orderData$payments, _orderData$payments2, _response$data, orderData, response;
+        var _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _response$data, orderData, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -196,6 +196,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relation_forms: [],
                 payments: []
               }, params);
+              if ((_orderData$payments = orderData.payments) !== null && _orderData$payments !== void 0 && _orderData$payments.length) {
+                orderData.small_ticket_data_flag = 1;
+              }
+
+              // 如果进来的order_id 是真实的，则不需要再传递 bookings 和 relation_products
+              if (params.order_id) {
+                orderData.bookings = [];
+                orderData.relation_products = [];
+              }
               console.log('[Order] 调用后端接口创建订单:', {
                 url: '/order/checkout',
                 orderType: orderData.type,
@@ -204,32 +213,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 customerId: orderData.customer_id,
                 bookingsCount: ((_orderData$bookings = orderData.bookings) === null || _orderData$bookings === void 0 ? void 0 : _orderData$bookings.length) || 0,
                 relationProductsCount: ((_orderData$relation_p = orderData.relation_products) === null || _orderData$relation_p === void 0 ? void 0 : _orderData$relation_p.length) || 0,
-                paymentsCount: ((_orderData$payments = orderData.payments) === null || _orderData$payments === void 0 ? void 0 : _orderData$payments.length) || 0,
-                paymentsMethods: ((_orderData$payments2 = orderData.payments) === null || _orderData$payments2 === void 0 ? void 0 : _orderData$payments2.map(function (p) {
+                paymentsCount: ((_orderData$payments2 = orderData.payments) === null || _orderData$payments2 === void 0 ? void 0 : _orderData$payments2.length) || 0,
+                paymentsMethods: ((_orderData$payments3 = orderData.payments) === null || _orderData$payments3 === void 0 ? void 0 : _orderData$payments3.map(function (p) {
                   return p.code;
                 })) || []
               });
 
               // 调用后端接口
-              _context3.next = 6;
+              _context3.next = 8;
               return this.request.post('/order/checkout', orderData);
-            case 6:
+            case 8:
               response = _context3.sent;
               console.log('[Order] 订单创建成功，后端响应:', {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
               return _context3.abrupt("return", response);
-            case 11:
-              _context3.prev = 11;
+            case 13:
+              _context3.prev = 13;
               _context3.t0 = _context3["catch"](1);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
               throw _context3.t0;
-            case 15:
+            case 17:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 11]]);
+        }, _callee3, this, [[1, 13]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

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

@@ -53,6 +53,8 @@ export interface CheckoutOrderParams {
     relation_forms?: any[];
     payments?: PaymentItemData[];
     customer_id?: string;
+    /** 小票数据标记，当有支付项时设置为1 */
+    small_ticket_data_flag?: number;
     [key: string]: any;
 }
 /**

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

@@ -509,7 +509,7 @@ export interface WalletDeductionRecommendParams {
     /** 前端设置只想要的字段 */
     expect_columns?: string[];
     /** 客户id */
-    customer_id: number;
+    customer_id?: number;
     /** 订单总计金额 */
     order_expect_amount: number;
     /** 订单小计金额 */
@@ -517,7 +517,7 @@ export interface WalletDeductionRecommendParams {
     /** 订单待支付金额 */
     order_wait_pay_amount: number;
     /** 统计计数用户id */
-    order_behavior_count_customer_id: number;
+    order_behavior_count_customer_id?: number;
     /** 已选商品 */
     products: {
         /** 商品id */
@@ -555,6 +555,7 @@ export interface WalletInitBusinessData {
         quantity: number;
         selling_price: number;
     }[];
+    order_wait_pay_amount?: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/dist/modules/Payment/walletpass.js

@@ -55,17 +55,22 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     value: function generateWalletParams(businessData) {
       var customer_id = businessData.customer_id,
         amountInfo = businessData.amountInfo,
-        products = businessData.products;
+        products = businessData.products,
+        order_wait_pay_amount = businessData.order_wait_pay_amount;
 
       // 转换金额为数字类型
-      var totalAmount = Number(amountInfo.subTotal) || Number(amountInfo.totalAmount);
+      var totalAmount = Number(amountInfo.totalAmount);
+      var subTotal = Number(amountInfo.subTotal);
       var walletParams = {
-        sale_channel: 'kiosk',
-        customer_id: 9752 || customer_id,
+        sale_channel: 'pos',
+        customer_id: customer_id || 0,
+        // 提供默认值，确保类型为 number
         order_expect_amount: totalAmount,
-        order_product_amount: totalAmount,
-        order_wait_pay_amount: totalAmount,
-        order_behavior_count_customer_id: 1,
+        // 订单小计金额
+        order_product_amount: subTotal,
+        // 订单待支付金额
+        order_wait_pay_amount: order_wait_pay_amount || totalAmount,
+        // order_behavior_count_customer_id: 1,
         products: products,
         prepare_payments: []
       };
@@ -207,7 +212,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               _context3.prev = 10;
               _context3.t0 = _context3["catch"](0);
               console.error('获取钱包推荐列表失败:', _context3.t0);
-              throw _context3.t0;
+              // throw error;
+              return _context3.abrupt("return", []);
             case 14:
             case "end":
               return _context3.stop();
@@ -252,7 +258,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               _context4.prev = 12;
               _context4.t0 = _context4["catch"](0);
               console.error('获取用户识别码列表失败:', _context4.t0);
-              throw _context4.t0;
+              return _context4.abrupt("return", []);
             case 16:
             case "end":
               return _context4.stop();

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

@@ -30,7 +30,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
      * @returns
      */
-    static isInScheduleByDate({ date, schedule }: {
+    static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;
     }): true | undefined;

package/dist/modules/Schedule/index.js

@@ -246,7 +246,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns 
+     * @returns
      */
   }], [{
     key: "isInScheduleByDate",
@@ -257,23 +257,31 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       // 节约性能, 强制将schedule的时间范围改为前后一天，避免大量计算.
       var _schedule = _objectSpread(_objectSpread({}, schedule), {}, {
         // 开始时间向前推一天
-        start_time: dayjs(date).subtract(1, "day").format("YYYY-MM-DD HH:mm:ss"),
-        end_time: dayjs(date).add(1, "day").format("YYYY-MM-DD HH:mm:ss")
+        start_time: dayjs(date).subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        end_time: dayjs(date).add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
       });
 
       // 不限制的 改为后一天
-      if (((_schedule$repeat_rule = _schedule.repeat_rule) === null || _schedule$repeat_rule === void 0 || (_schedule$repeat_rule = _schedule$repeat_rule.end) === null || _schedule$repeat_rule === void 0 ? void 0 : _schedule$repeat_rule.type) === "never") {
-        _schedule.repeat_rule.end = {
-          type: "date",
-          end_date: _schedule.end_time,
-          occurrence: null
-        };
+      if (((_schedule$repeat_rule = _schedule.repeat_rule) === null || _schedule$repeat_rule === void 0 || (_schedule$repeat_rule = _schedule$repeat_rule.end) === null || _schedule$repeat_rule === void 0 ? void 0 : _schedule$repeat_rule.type) === 'never') {
+        _schedule = _objectSpread(_objectSpread({}, _schedule), {}, {
+          repeat_rule: _objectSpread(_objectSpread({}, _schedule.repeat_rule), {}, {
+            end: {
+              type: 'date',
+              end_date: _schedule.end_time,
+              occurrence: null
+            }
+          })
+        });
       }
 
       // 限制结束日期的也改为后一天
-      if (((_schedule$repeat_rule2 = _schedule.repeat_rule) === null || _schedule$repeat_rule2 === void 0 || (_schedule$repeat_rule2 = _schedule$repeat_rule2.end) === null || _schedule$repeat_rule2 === void 0 ? void 0 : _schedule$repeat_rule2.type) === "date") {
-        _schedule.repeat_rule.end = _objectSpread(_objectSpread({}, _schedule.repeat_rule.end), {}, {
-          end_date: _schedule.end_time
+      if (((_schedule$repeat_rule2 = _schedule.repeat_rule) === null || _schedule$repeat_rule2 === void 0 || (_schedule$repeat_rule2 = _schedule$repeat_rule2.end) === null || _schedule$repeat_rule2 === void 0 ? void 0 : _schedule$repeat_rule2.type) === 'date') {
+        _schedule = _objectSpread(_objectSpread({}, _schedule), {}, {
+          repeat_rule: _objectSpread(_objectSpread({}, _schedule.repeat_rule), {}, {
+            end: _objectSpread(_objectSpread({}, _schedule.repeat_rule.end), {}, {
+              end_date: _schedule.end_time
+            })
+          })
         });
       }
       var dateRanges = calcScheduleDateRange(_objectSpread({}, _schedule));

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -95,71 +95,122 @@ export function findFastestAvailableResource(_ref2) {
   var currentTime = dayjs();
   var fastestTime = null;
   var fastestResources = [];
+  console.log('[TimeslotUtils] 查找最快可用资源:', {
+    currentTime: currentTime.format('YYYY-MM-DD HH:mm:ss'),
+    resourceCount: resources.length,
+    currentCapacity: currentCapacity,
+    countMap: countMap
+  });
 
   // 遍历所有资源，找到最快可用的时间点
   var _iterator2 = _createForOfIteratorHelper(resources),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _resource = _step2.value;
-      // 获取资源当天的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        return dayjs(time.start_at).isSame(currentTime, 'day');
-      });
-      if (todayTimes.length === 0) continue;
-
-      // 按开始时间排序
-      todayTimes.sort(function (a, b) {
-        return dayjs(a.start_at).diff(dayjs(b.start_at));
+      var resource = _step2.value;
+      // 获取资源当天且还在工作时间内的时间段
+      var todayTimes = resource.times.filter(function (time) {
+        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
+        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
+        return isToday && isStillWorking;
       });
-
-      // 找到第一个可用的时间段
+      if (todayTimes.length === 0) {
+        console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
+        continue;
+      }
       var _iterator3 = _createForOfIteratorHelper(todayTimes),
         _step3;
       try {
         var _loop = function _loop() {
+            var _time$event_list, _time$event_list2;
             var time = _step3.value;
-            var startTime = dayjs(time.start_at);
-
-            // 如果开始时间在当前时间之前，跳过
-            if (startTime.isBefore(currentTime)) return 0; // continue
-
-            // 检查这个时间段是否可用
-            if (_resource.resourceType === 'single') {
-              var _time$event_list;
-              // 单个预约类型：检查是否有预约
-              var hasBooking = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.some(function (event) {
-                return dayjs(event.start_at).isSame(startTime);
-              });
-              if (!hasBooking) {
-                if (!fastestTime || startTime.isSame(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources.push(_resource);
-                } else if (startTime.isBefore(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources = [_resource];
-                }
-                return 1; // break
-              }
-            } else {
-              var _time$event_list2;
-              // 多个预约类型：检查容量
-              var totalCapacity = _resource.capacity || 0;
-              var usedCapacity = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.reduce(function (sum, event) {
-                return dayjs(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
-              }, 0)) || 0;
-              var remainingCapacity = totalCapacity - usedCapacity;
-              if (remainingCapacity >= (countMap[_resource.id] || 0) + currentCapacity) {
-                if (!fastestTime || startTime.isSame(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources.push(_resource);
-                } else if (startTime.isBefore(fastestTime)) {
-                  fastestTime = startTime;
-                  fastestResources = [_resource];
+            var workStartTime = dayjs(time.start_at);
+            var workEndTime = dayjs(time.end_at);
+
+            // 确定检查的起始时间（当前时间 vs 工作开始时间）
+            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, "):"), {
+              workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
+              checkStartTime: nextAvailableTime.format('HH:mm:ss'),
+              eventCount: ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) || 0
+            });
+
+            // 获取所有影响的预约事件（当前时间之后的）
+            var relevantEvents = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.filter(function (event) {
+              var eventEnd = dayjs(event.end_at);
+              return eventEnd.isAfter(nextAvailableTime);
+            })) || [];
+
+            // 按开始时间排序
+            relevantEvents.sort(function (a, b) {
+              return dayjs(a.start_at).diff(dayjs(b.start_at));
+            });
+
+            // 检查从 nextAvailableTime 开始的可用性
+            var finalAvailableTime = nextAvailableTime;
+            var _iterator4 = _createForOfIteratorHelper(relevantEvents),
+              _step4;
+            try {
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                var event = _step4.value;
+                var eventStart = dayjs(event.start_at);
+                var eventEnd = dayjs(event.end_at);
+                console.log("[TimeslotUtils] \u68C0\u67E5\u4E8B\u4EF6\u51B2\u7A81:", {
+                  resourceId: resource.id,
+                  eventTime: "".concat(eventStart.format('HH:mm'), "-").concat(eventEnd.format('HH:mm')),
+                  checkTime: finalAvailableTime.format('HH:mm:ss'),
+                  pax: event.pax || 1
+                });
+
+                // 检查资源类型和容量
+                if (resource.resourceType === 'single' || (resource.capacity || 1) === 1) {
+                  // 单人预约资源：检查时间冲突
+                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                    // 有冲突，使用事件结束时间
+                    finalAvailableTime = eventEnd;
+                    console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
+                  }
+                } else {
+                  // 多人预约资源：检查容量
+                  var totalCapacity = resource.capacity || 0;
+                  var currentUsedCapacity = countMap[resource.id] || 0;
+                  var eventUsedCapacity = event.pax || 1;
+
+                  // 如果在事件时间范围内，检查容量是否足够
+                  if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                    var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
+                    if (totalRequiredCapacity > totalCapacity) {
+                      // 容量不足，使用事件结束时间
+                      finalAvailableTime = eventEnd;
+                      console.log("[TimeslotUtils] \u5BB9\u91CF\u4E0D\u8DB3\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
+                    }
+                  }
                 }
-                return 1; // break
               }
+
+              // 确保可用时间在工作时间内
+            } catch (err) {
+              _iterator4.e(err);
+            } finally {
+              _iterator4.f();
+            }
+            if (finalAvailableTime.isAfter(workEndTime)) {
+              console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
+              return 0; // continue
             }
+            console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(resource.id, "(").concat(resource.main_field, ") \u6700\u5FEB\u53EF\u7528\u65F6\u95F4: ").concat(finalAvailableTime.format('HH:mm:ss')));
+
+            // 更新最快可用时间和资源
+            if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
+              fastestTime = finalAvailableTime;
+              fastestResources = [resource];
+              console.log("[TimeslotUtils] \u66F4\u65B0\u6700\u5FEB\u65F6\u95F4: ".concat(fastestTime.format('HH:mm:ss'), ", \u8D44\u6E90: ").concat(resource.main_field));
+            } else if (finalAvailableTime.isSame(fastestTime)) {
+              fastestResources.push(resource);
+              console.log("[TimeslotUtils] \u6DFB\u52A0\u76F8\u540C\u65F6\u95F4\u8D44\u6E90: ".concat(resource.main_field));
+            }
+            return 1; // break
+            // 每个资源只需要计算一次
           },
           _ret;
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -180,31 +231,22 @@ export function findFastestAvailableResource(_ref2) {
   } finally {
     _iterator2.f();
   }
-  if (!fastestTime || fastestResources.length === 0) return null;
+  if (!fastestTime || fastestResources.length === 0) {
+    console.log('[TimeslotUtils] 未找到可用资源');
+    return null;
+  }
+  console.log("[TimeslotUtils] \u627E\u5230 ".concat(fastestResources.length, " \u4E2A\u6700\u5FEB\u53EF\u7528\u8D44\u6E90\uFF0C\u65F6\u95F4: ").concat(fastestTime.format('HH:mm:ss')));
 
   // 如果只有一个最快可用的资源，直接返回
-  if (fastestResources.length === 1) return fastestResources[0];
-
-  // 如果有多个最快可用的资源，比较它们的空闲时间
-  var maxIdleTime = 0;
-  var selectedResource = null;
-  for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
-    var resource = _fastestResources[_i2];
-    var idleTime = calculateResourceAvailableTime({
-      resource: resource,
-      timeSlots: {
-        start_time: fastestTime.format('HH:mm'),
-        end_time: fastestTime.format('HH:mm'),
-        start_at: fastestTime,
-        end_at: fastestTime
-      },
-      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
-    });
-    if (idleTime > maxIdleTime) {
-      maxIdleTime = idleTime;
-      selectedResource = resource;
-    }
+  if (fastestResources.length === 1) {
+    console.log("[TimeslotUtils] \u8FD4\u56DE\u552F\u4E00\u6700\u5FEB\u8D44\u6E90: ".concat(fastestResources[0].main_field));
+    return fastestResources[0];
   }
+
+  // 如果有多个最快可用的资源，选择第一个或根据其他逻辑选择
+  // 这里简化处理，直接返回第一个
+  var selectedResource = fastestResources[0];
+  console.log("[TimeslotUtils] \u8FD4\u56DE\u591A\u4E2A\u8D44\u6E90\u4E2D\u7684\u7B2C\u4E00\u4E2A: ".concat(selectedResource.main_field));
   return selectedResource;
 }
 

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -40,6 +40,9 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
         quantity: number;
         selling_price: number;
     }[];
+    initWalletData(params?: {
+        order_wait_pay_amount: number;
+    }): Promise<void>;
     /**
      * 创建本地订单 (前端模拟下单流程)
      *
@@ -95,6 +98,10 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 强制重新从服务器获取支付方式列表，更新本地缓存
      */
     refreshPaymentMethodsAsync(): Promise<PaymentMethod[]>;
+    /**
+     * 获取订单原始数据
+     */
+    getOrderOriginalData(): any;
     /**
      * 获取当前订单基础信息
      *
@@ -411,5 +418,19 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
+    /**
+     * 通过订单ID编辑订单备注
+     *
+     * 用于修改已同步到后端的订单备注，通常在支付成功后的弹窗中使用
+     *
+     * @param orderId 后端订单ID
+     * @param note 新的订单备注
+     * @returns 修改结果
+     */
+    editOrderNoteByOrderIdAsync(orderId: string | number, note: string): Promise<{
+        success: boolean;
+        message?: string;
+        orderId?: string | number;
+    }>;
     destroy(): Promise<void>;
 }