@pisell/pisellos 0.0.285 → 0.0.287

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

@@ -3,6 +3,7 @@ import { BaseModule } from '../BaseModule';
 import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 import { Account } from '../Account';
 export * from './types';
+export { getProductDeposit } from './utils';
 /**
  * 购物车模块实现
  */

package/dist/modules/Cart/index.js

@@ -29,6 +29,7 @@ import { createCartItemOrigin, deleteHolderFromCartItem, deleteRelationFormsFrom
 import { cloneDeep } from 'lodash-es';
 import { isNormalProduct } from "../Product/utils";
 export * from "./types";
+export { getProductDeposit } from "./utils";
 
 /**
  * 购物车模块实现

package/dist/modules/Cart/utils/cartResource.js

@@ -80,8 +80,8 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
     origin.end_date = null;
     origin.end_time = null;
   }
-  origin.relation_type = '';
-  origin.relation_id = 0;
+  // origin.relation_type = '';
+  // origin.relation_id = 0;
   return origin;
 };
 

package/dist/modules/Order/index.js

@@ -289,18 +289,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookings: [],
                 relation_products: [],
                 relation_forms: [],
-                payments: []
+                payments: [],
+                is_full_overwrite_flag: 1
               }, 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 = [];
-              }
-
               // 兜底策略，如果是第一次下单，没有 order_id，且没有 schedule_date，则设置为当前时间
               if (!params.order_id && !orderData.schedule_date) {
                 orderData.schedule_date = dayjs().format('YYYY-MM-DD HH:mm:ss');
@@ -347,9 +342,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context3.next = 11;
+              _context3.next = 10;
               return this.request.post('/order/checkout', orderData);
-            case 11:
+            case 10:
               response = _context3.sent;
               this.logInfo('Order API called successfully', {
                 response: response
@@ -359,19 +354,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 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 17:
-              _context3.prev = 17;
+            case 16:
+              _context3.prev = 16;
               _context3.t0 = _context3["catch"](2);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
               this.logInfo('Order API called failed', {
                 error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
               });
               throw _context3.t0;
-            case 22:
+            case 21:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 17]]);
+        }, _callee3, this, [[2, 16]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

package/dist/modules/Payment/index.js

@@ -1291,9 +1291,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
             case 7:
-              // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided）
+              // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided)并且还没有同步给后端
+              // 如果同步给了后端的voucher 不允许删除
               existingVoucherItems = order.payment.filter(function (payment) {
-                return payment.voucher_id && payment.status !== 'voided';
+                return payment.voucher_id && payment.status !== 'voided' && !payment.isSynced;
               });
               console.log('[PaymentModule] 发现现有代金券支付项:', {
                 orderUuid: orderUuid,
@@ -1303,7 +1304,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                     uuid: item.uuid,
                     code: item.code,
                     amount: item.amount,
-                    voucher_id: item.voucher_id
+                    voucher_id: item.voucher_id,
+                    isSynced: item.isSynced
                   };
                 })
               });

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

@@ -129,6 +129,15 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 本支付项是否已成功同步到后端 */
+    isSynced?: boolean;
+    /** 最近一次同步失败信息（存在则代表同步失败过） */
+    syncError?: {
+        error: string;
+        errorCode?: string;
+        statusCode?: number;
+        timestamp: number;
+    };
 }
 /**
  * 订单信息
@@ -614,6 +623,8 @@ export interface WalletDeductionRecommendParams {
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包初始化业务数据接口
@@ -635,6 +646,8 @@ export interface WalletInitBusinessData {
         selling_price: number;
     }[];
     order_wait_pay_amount?: number;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 查询用户识别码列表请求参数
@@ -652,6 +665,8 @@ export interface UserIdentificationCodeParams extends WalletDeductionRecommendPa
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包推荐扣款响应数据
@@ -703,6 +718,8 @@ export interface UserIdentificationCodeItem {
 export interface SearchIdentificationCodeParams extends WalletDeductionRecommendParams {
     /** 识别码 */
     code: string;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 搜索识别码响应数据

package/dist/modules/Payment/walletpass.js

@@ -59,7 +59,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       var customer_id = businessData.customer_id,
         amountInfo = businessData.amountInfo,
         products = businessData.products,
-        order_wait_pay_amount = businessData.order_wait_pay_amount;
+        order_wait_pay_amount = businessData.order_wait_pay_amount,
+        payment_order_id = businessData.payment_order_id;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
@@ -75,7 +76,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         order_wait_pay_amount: order_wait_pay_amount || totalAmount,
         // order_behavior_count_customer_id: 1,
         products: products,
-        prepare_payments: []
+        prepare_payments: [],
+        payment_order_id: payment_order_id
       };
 
       // 存储生成的参数到模块中
@@ -252,7 +254,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getWalletPassRecommendListAsync",
     value: function () {
       var _getWalletPassRecommendListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var response;
+        var _this$walletParams, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -260,7 +262,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 开始获取钱包推荐列表', {
                 customer_id: params.customer_id,
                 order_expect_amount: params.order_expect_amount,
-                sale_channel: params.sale_channel
+                sale_channel: params.sale_channel,
+                payment_order_id: (_this$walletParams = this.walletParams) === null || _this$walletParams === void 0 ? void 0 : _this$walletParams.payment_order_id
               });
               _context3.next = 4;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/recommend', params // 将 params 作为请求体数据
@@ -315,7 +318,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _newParams$prepare_pa, newParams, response, sortedData;
+        var _newParams$prepare_pa, _this$walletParams2, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -325,7 +328,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 customer_id: newParams.customer_id,
                 available: newParams.available,
                 prepare_payments_count: ((_newParams$prepare_pa = newParams.prepare_payments) === null || _newParams$prepare_pa === void 0 ? void 0 : _newParams$prepare_pa.length) || 0,
-                filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass
+                filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
+                payment_order_id: (_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.payment_order_id
               });
               _context4.next = 5;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
@@ -452,13 +456,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 prepare_payments: params.prepare_payments || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.prepare_payments),
                 multiple: 1,
                 // 搜索特有参数
-                code: params.code
+                code: params.code,
+                payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               };
               this.paymentModule.logInfo('[WalletPass] 搜索普通识别码', {
                 code: searchParams.code,
                 customer_id: searchParams.customer_id,
                 order_expect_amount: searchParams.order_expect_amount,
-                multiple: searchParams.multiple
+                multiple: searchParams.multiple,
+                payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               });
               _context5.next = 19;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);

package/dist/solution/BookingByStep/index.js

@@ -2061,7 +2061,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // item._origin.resources?.forEach((n: any) => {
         //   resourceIds.push(n.relation_id);
         // });
-        if (item.resource_id) {
+        if (item.resource_id && !resourceIds.includes(item.resource_id)) {
           resourceIds.push(item.resource_id);
         }
         resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.find(function (n) {
@@ -2156,6 +2156,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           return 0;
         }, 0);
       }
+      // 计算容量的辅助函数
+      var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
+        return items.reduce(function (total, item) {
+          return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
+        }, 0);
+      };
+
+      // 如果是多个预约，去要求助几个 holder 下最大的需求容量capacity
+      var maxCapacity = 1;
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+        accountList.forEach(function (account) {
+          var accountCartItems = _this12.store.cart.getCartByAccount(account.getId());
+          var currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+          if (currentCapacity > maxCapacity) {
+            maxCapacity = currentCapacity;
+          }
+        });
+      } else {
+        maxCapacity = calculateCapacityFromCartItems(cartItems);
+      }
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,
@@ -2163,6 +2183,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         currentDate: dateRange[0].date,
         split: 10,
         resourcesUseableMap: resourcesUseableMap,
+        capacity: maxCapacity,
         cut_off_time: maxCutOffTime,
         hasFlexibleDuration: hasFlexibleDuration,
         operating_day_boundary: operating_day_boundary,

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

@@ -245,17 +245,28 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
     var _getCapacityInfoByCar2 = getCapacityInfoByCartItem(cartItem),
       currentCapacity = _getCapacityInfoByCar2.currentCapacity;
     Object.keys(resourceTypeMap).forEach(function (formId) {
+      var _cartItem$_productOri;
       var resourcesInType = resourceTypeMap[formId];
       var resourceIdsInType = resourcesInType.map(function (r) {
         return r.id;
       });
+      var selectType = (_cartItem$_productOri = cartItem._productOrigin) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.product_resource) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.resources) === null || _cartItem$_productOri === void 0 || (_cartItem$_productOri = _cartItem$_productOri.find(function (r) {
+        var _r$id;
+        return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId;
+      })) === null || _cartItem$_productOri === void 0 ? void 0 : _cartItem$_productOri.type;
 
       // 检查该商品是否需要这种类型的资源
       var needsThisResourceType = productResourceIds.some(function (id) {
         return resourceIdsInType.includes(id);
       });
       if (needsThisResourceType) {
-        requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        // 需要判断是单个预约还是多个预约，如果是单个预约，不用加 capacity，只用+1
+        if (selectType === 'single') {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+        } else {
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+        }
+        // requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
       }
     });
   });
@@ -275,12 +286,12 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _cartItem$_productOri;
+          var _cartItem$_productOri2;
           var cartItem = _step2.value;
-          if ((_cartItem$_productOri = cartItem._productOrigin) !== null && _cartItem$_productOri !== void 0 && (_cartItem$_productOri = _cartItem$_productOri.product_resource) !== null && _cartItem$_productOri !== void 0 && _cartItem$_productOri.resources) {
+          if ((_cartItem$_productOri2 = cartItem._productOrigin) !== null && _cartItem$_productOri2 !== void 0 && (_cartItem$_productOri2 = _cartItem$_productOri2.product_resource) !== null && _cartItem$_productOri2 !== void 0 && _cartItem$_productOri2.resources) {
             resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
-              var _r$id;
-              return ((_r$id = r.id) === null || _r$id === void 0 ? void 0 : _r$id.toString()) === formId && r.status === 1;
+              var _r$id2;
+              return ((_r$id2 = r.id) === null || _r$id2 === void 0 ? void 0 : _r$id2.toString()) === formId && r.status === 1;
             });
             if (resourceTypeConfig) break;
           }

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

@@ -2,7 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { OrderModule } from '../../modules/Order';
 import { PaymentModule } from '../../modules/Payment';
-import { CheckoutModuleAPI, CheckoutInitParams, CreateLocalOrderParams, CurrentOrderInfo, CartSummaryItem, SendCustomerPayLinkParams } from './types';
+import { CheckoutModuleAPI, CheckoutInitParams, CreateLocalOrderParams, UpdateLocalOrderParams, CurrentOrderInfo, CartSummaryItem, SendCustomerPayLinkParams } from './types';
 import { PaymentOrder, PaymentMethod, PaymentItem, PaymentItemInput } from '../../modules/Payment/types';
 export * from './types';
 /**
@@ -64,6 +64,13 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 方法会记录参数并创建本地虚拟订单，然后用 Payment 模块管理支付流程。
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
+    /**
+     * 更新本地订单（已同步后端的订单）并设置为当前订单
+     *
+     * 通过传入真实的 orderId，对已缓存的订单数据进行更新，
+     * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
+     */
+    updateLocalOrderAsync(params: UpdateLocalOrderParams): Promise<PaymentOrder>;
     /**
      * 完成结账
      */