@pisell/pisellos 0.0.229 → 0.0.231

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
@@ -11,7 +11,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
-        platform: string;
+        platform: "pc" | "h5";
         sales_channel: string;
         order_sales_channel: string;
         bookings: any[];
@@ -26,4 +26,15 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type: 'holder' | 'account';
     }): boolean;
     submitOrder(order: CommitOrderParams): Promise<void>;
+    /**
+     * Checkout 专用：创建订单到后端
+     *
+     * 专门为 Checkout 模块设计的订单创建方法，
+     * 直接调用 /order/checkout 接口创建订单
+     * 接收已经处理好的订单数据，无需再处理购物车
+     *
+     * @param params Checkout 订单参数（已处理的订单数据）
+     * @returns 后端返回的订单数据（包含订单ID等）
+     */
+    createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
 }

package/dist/modules/Order/index.js

@@ -1,4 +1,6 @@
 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 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(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -64,7 +66,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var order = {
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
-        platform: (params === null || params === void 0 ? void 0 : params.platform) === 'pc' ? 'PC' : 'H5',
+        platform: (params === null || params === void 0 ? void 0 : params.platform) || 'pc',
         sales_channel: 'my_pisel',
         order_sales_channel: 'online_store',
         bookings: [],
@@ -153,6 +155,87 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return submitOrder;
     }()
+    /**
+     * Checkout 专用：创建订单到后端
+     * 
+     * 专门为 Checkout 模块设计的订单创建方法，
+     * 直接调用 /order/checkout 接口创建订单
+     * 接收已经处理好的订单数据，无需再处理购物车
+     * 
+     * @param params Checkout 订单参数（已处理的订单数据）
+     * @returns 后端返回的订单数据（包含订单ID等）
+     */
+  }, {
+    key: "createOrderByCheckout",
+    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;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              console.log('[Order] createOrderByCheckout 开始创建订单:', {
+                type: params.type,
+                platform: params.platform,
+                is_deposit: params.is_deposit,
+                customer_id: params.customer_id,
+                bookingsCount: ((_params$bookings = params.bookings) === null || _params$bookings === void 0 ? void 0 : _params$bookings.length) || 0,
+                relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
+                paymentsCount: ((_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.length) || 0
+              });
+              _context3.prev = 1;
+              // 构建订单数据，设置默认值并允许 params 覆盖
+              orderData = _objectSpread({
+                sales_channel: 'my_pisel',
+                order_sales_channel: 'online_store',
+                shop_note: '',
+                schedule_date: '',
+                is_deposit: 0,
+                bookings: [],
+                relation_products: [],
+                relation_forms: [],
+                payments: []
+              }, params);
+              console.log('[Order] 调用后端接口创建订单:', {
+                url: '/order/checkout',
+                orderType: orderData.type,
+                platform: orderData.platform,
+                isDeposit: orderData.is_deposit,
+                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) {
+                  return p.code;
+                })) || []
+              });
+
+              // 调用后端接口
+              _context3.next = 6;
+              return this.request.post('/order/checkout', orderData);
+            case 6:
+              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;
+              _context3.t0 = _context3["catch"](1);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
+              throw _context3.t0;
+            case 15:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this, [[1, 11]]);
+      }));
+      function createOrderByCheckout(_x4) {
+        return _createOrderByCheckout.apply(this, arguments);
+      }
+      return createOrderByCheckout;
+    }())
   }]);
   return OrderModule;
 }(BaseModule);

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

@@ -18,6 +18,43 @@ export interface CommitOrderParams {
         platform?: 'pc' | 'h5';
     };
 }
+/**
+ * 支付项数据
+ */
+export interface PaymentItemData {
+    /** 当前支付项的唯一 ID */
+    uuid: string;
+    /** 当前支付方式付出去多少钱 */
+    amount: string;
+    /** 支付类型代码 */
+    code: string;
+    /** 支付类型id */
+    id: number;
+    /** 支付类型名称 */
+    name: string;
+    /** 支付类型 */
+    type: string;
+    /** 是否已同步到后端 */
+    isSynced?: boolean;
+}
+/**
+ * Checkout 专用订单创建参数
+ */
+export interface CheckoutOrderParams {
+    type: 'virtual' | 'appointment_booking';
+    platform: 'PC' | 'H5';
+    sales_channel?: string;
+    order_sales_channel?: string;
+    bookings?: any[];
+    shop_note?: string;
+    schedule_date?: string;
+    is_deposit?: number;
+    relation_products?: any[];
+    relation_forms?: any[];
+    payments?: PaymentItemData[];
+    customer_id?: string;
+    [key: string]: any;
+}
 /**
  * 订单模块 API
  */
@@ -40,4 +77,10 @@ export interface OrderModuleAPI {
      * @param params 订单信息
      */
     submitOrder: (params: CommitOrderParams) => Promise<void>;
+    /**
+     * Checkout 专用：创建订单到后端
+     * @param params 订单参数
+     * @returns 后端返回的订单数据
+     */
+    createOrderByCheckout: (params: CheckoutOrderParams) => Promise<any>;
 }

package/dist/modules/Order/types.js

@@ -10,6 +10,14 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 订单信息
  */
 
+/**
+ * 支付项数据
+ */
+
+/**
+ * Checkout 专用订单创建参数
+ */
+
 /**
  * 订单模块 API
  */

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

@@ -8,4 +8,12 @@ export declare class CashPaymentImpl implements CashPayment {
     constructor(paymentModule: PaymentModule);
     processCashPayment(amount: number, orderUuid: string): Promise<void>;
     getCashBalance(): Promise<number>;
+    /**
+     * 获取推荐支付金额
+     * 基于目标金额和货币类型，返回最优支付金额建议
+     * @param money 目标支付金额
+     * @param currency 货币代码 (如: 'CNY', 'USD', 'EUR' 等)
+     * @returns 推荐支付金额数组
+     */
+    getRecommendedAmount(money: number, currency: string): number[];
 }

package/dist/modules/Payment/cash.js

@@ -7,6 +7,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { CURRENCY_DENOMINATIONS, recommendOptimalPayments } from "./cashRecommendationAlgorithm";
+
 /**
  * 现金支付实现
  */
@@ -42,7 +44,7 @@ export var CashPaymentImpl = /*#__PURE__*/function () {
                 voucher_id: ''
               };
               _context.next = 8;
-              return this.paymentModule.pushPaymentAsync(orderUuid, paymentItem);
+              return this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
             case 8:
             case "end":
               return _context.stop();
@@ -73,6 +75,23 @@ export var CashPaymentImpl = /*#__PURE__*/function () {
       }
       return getCashBalance;
     }()
+    /**
+     * 获取推荐支付金额
+     * 基于目标金额和货币类型，返回最优支付金额建议
+     * @param money 目标支付金额
+     * @param currency 货币代码 (如: 'CNY', 'USD', 'EUR' 等)
+     * @returns 推荐支付金额数组
+     */
+  }, {
+    key: "getRecommendedAmount",
+    value: function getRecommendedAmount(money, currency) {
+      // 获取对应货币的面额配置
+      var upperCurrency = currency.toUpperCase();
+      var denominations = CURRENCY_DENOMINATIONS[upperCurrency] || CURRENCY_DENOMINATIONS['DEFAULT'];
+
+      // 直接调用算法，所有验证和容错处理都在算法内部
+      return recommendOptimalPayments(money, denominations);
+    }
   }]);
   return CashPaymentImpl;
 }();

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

@@ -0,0 +1,22 @@
+/**
+ * 现金支付推荐算法
+ *
+ * 核心原理：
+ * 1. 每个推荐金额都应该是独立的最优组合
+ * 2. 不推荐在已有最优解基础上添加额外面额的组合
+ * 3. 优先推荐使用不同数量币种的组合
+ * 4. 根据组合判断去重，避免扩展组合
+ */
+/**
+ * 常见国家货币面额配置
+ */
+export declare const CURRENCY_DENOMINATIONS: Record<string, number[]>;
+/**
+ * 最优支付金额推荐算法
+ * 推荐通过不同数量面额组合刚好足够支付的最小金额
+ *
+ * @param targetAmount 目标金额
+ * @param denominations 币种面值数组
+ * @returns 推荐支付金额数组
+ */
+export declare function recommendOptimalPayments(targetAmount: number, denominations: number[]): number[];