@pisell/pisellos 2.1.24 → 2.1.26

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

@@ -91,6 +91,19 @@ export interface CreateLocalOrderParams {
     autoPayment?: boolean;
     totalInfo: any;
 }
+/**
+ * 本地订单更新参数
+ */
+export interface UpdateLocalOrderParams {
+    /** 要更新的后端订单ID（已同步过后端的订单） */
+    orderId: string;
+    /** 更新后的订单数据（结构与创建时一致，允许部分字段变化） */
+    orderData: LocalOrderData;
+    /** 更新后的购物车小计数据 */
+    cartSummary: CartSummaryItem[];
+    /** total 信息（用于拆解金额） */
+    totalInfo: any;
+}
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)
  */
@@ -373,6 +386,10 @@ export interface CheckoutModuleAPI extends Module {
      * 创建本地订单 (前端模拟下单流程)
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
+    /**
+     * 更新本地订单（基于已同步后的真实 orderId）并设置为当前订单
+     */
+    updateLocalOrderAsync(params: UpdateLocalOrderParams): Promise<PaymentOrder>;
     /**
      * 完成结账
      */

package/dist/solution/Checkout/types.js

@@ -30,6 +30,10 @@ export var CheckoutErrorType = /*#__PURE__*/function (CheckoutErrorType) {
  * 本地订单创建参数
  */
 
+/**
+ * 本地订单更新参数
+ */
+
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)
  */

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

@@ -42,6 +42,11 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private getDiscountList;
     private getCustomerWallet;
     private bestDiscount;
-    private loadPrepareConfig;
+    loadPrepareConfig(params: {
+        customerId: number;
+        action?: 'create' | 'update';
+        with_good_pass?: 0 | 1;
+        with_discount_card?: 0 | 1;
+    }): Promise<void>;
 }
 export default ShopDiscountImpl;

package/dist/solution/ShopDiscount/index.js

@@ -488,6 +488,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
                   savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),

package/lib/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/lib/modules/Cart/index.js

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Cart/index.ts
 var Cart_exports = {};
 __export(Cart_exports, {
-  CartModule: () => CartModule
+  CartModule: () => CartModule,
+  getProductDeposit: () => import_utils3.getProductDeposit
 });
 module.exports = __toCommonJS(Cart_exports);
 var import_BaseModule = require("../BaseModule");
@@ -29,6 +30,7 @@ var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../Product/utils");
 __reExport(Cart_exports, require("./types"), module.exports);
+var import_utils3 = require("./utils");
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "cart", version || "1.0.0");
@@ -361,5 +363,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CartModule,
+  getProductDeposit,
   ...require("./types")
 });

package/lib/modules/Order/index.js

@@ -225,16 +225,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         relation_products: [],
         relation_forms: [],
         payments: [],
+        is_full_overwrite_flag: 1,
         ...params
         // 使用传入的参数覆盖默认值
       };
       if ((_h = orderData.payments) == null ? void 0 : _h.length) {
         orderData.small_ticket_data_flag = 1;
       }
-      if (params.order_id) {
-        orderData.bookings = [];
-        orderData.relation_products = [];
-      }
       if (!params.order_id && !orderData.schedule_date) {
         orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
       }

package/lib/modules/Payment/cashRecommendationAlgorithm.js

@@ -25,7 +25,7 @@ __export(cashRecommendationAlgorithm_exports, {
 module.exports = __toCommonJS(cashRecommendationAlgorithm_exports);
 var CURRENCY_DENOMINATIONS = {
   // 美元
-  "USD": [100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05, 0.01],
+  "USD": [100, 50, 20, 10, 5, 1, 0.5, 0.25, 0.1, 0.05, 0.01],
   // 人民币
   "CNY": [100, 50, 20, 10, 5, 1, 0.5, 0.1, 0.05, 0.01],
   "RMB": [100, 50, 20, 10, 5, 1, 0.5, 0.1, 0.05, 0.01],

package/lib/modules/Payment/index.js

@@ -397,6 +397,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const order = await this.dbManager.get("order", orderUuid);
       if (order) {
         const updatedOrder = { ...order, ...params };
+        this.recalculateOrderAmount(updatedOrder);
         await this.dbManager.update("order", updatedOrder);
         await this.core.effects.emit(import_types.PaymentHooks.OnOrderUpdated, updatedOrder);
         await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
@@ -527,7 +528,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         throw new Error(`Order not found: ${orderUuid}`);
       }
       const expectAmount = new import_decimal.Decimal(order.expect_amount);
-      if (expectAmount.lte(0)) {
+      const paidDepositAmount = order.payment.reduce((sum, payment) => {
+        if (payment.order_payment_type === "deposit" && payment.status !== "voided") {
+          return sum.plus(new import_decimal.Decimal(payment.amount));
+        }
+        return sum;
+      }, new import_decimal.Decimal(0));
+      const expectedDepositAmount = new import_decimal.Decimal(order.deposit_amount || "0").sub(paidDepositAmount);
+      if (expectAmount.lte(0) && expectedDepositAmount.eq(0)) {
         const warningMessage = `订单 ${orderUuid} 待付金额已为0，不允许添加新的支付项`;
         console.warn("[PaymentModule] Payment lock triggered:", {
           orderUuid,
@@ -671,7 +679,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         throw new Error(`订单不存在: ${orderUuid}`);
       }
       const existingVoucherItems = order.payment.filter(
-        (payment) => payment.voucher_id && payment.status !== "voided"
+        (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
       );
       console.log("[PaymentModule] 发现现有代金券支付项:", {
         orderUuid,
@@ -680,7 +688,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           uuid: item.uuid,
           code: item.code,
           amount: item.amount,
-          voucher_id: item.voucher_id
+          voucher_id: item.voucher_id,
+          isSynced: item.isSynced
         }))
       });
       for (const voucherItem of existingVoucherItems) {
@@ -913,7 +922,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       },
       new import_decimal.Decimal(0)
     );
-    const remainingAmount = totalAmount.minus(paidAmount);
+    const remainingAmount = order.is_deposit === 1 ? new import_decimal.Decimal(order.deposit_amount).minus(paidAmount) : totalAmount.minus(paidAmount);
     order.expect_amount = import_decimal.Decimal.max(0, remainingAmount).toFixed(2);
     console.log(`[PaymentModule] 重新计算订单金额:`, {
       orderUuid: order.uuid,
@@ -1055,8 +1064,16 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           throw new Error(`不支持的舍入规则: ${rule}`);
       }
       const finalAmount = roundedValue.mul(roundingInterval);
-      const roundedAmountStr = finalAmount.toFixed(2);
       const originalAmountStr = amount.toFixed(2);
+      if (finalAmount.eq(0)) {
+        console.log(`[PaymentModule] 最终金额为0，返回原始金额: ${originalAmountStr}`);
+        return {
+          originalAmount: originalAmountStr,
+          roundedAmount: originalAmountStr,
+          roundingDifference: "0.00"
+        };
+      }
+      const roundedAmountStr = finalAmount.toFixed(2);
       const roundingDifference = finalAmount.sub(amount);
       const roundingDifferenceStr = roundingDifference.toFixed(2);
       console.log(`[PaymentModule] 舍入结果 - 原始金额: ${originalAmountStr}, 舍入后金额: ${roundedAmountStr}, 舍入差额: ${roundingDifferenceStr}`);

package/lib/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;
 }
 /**
  * 钱包初始化业务数据接口
@@ -626,6 +637,10 @@ export interface WalletInitBusinessData {
     amountInfo: {
         totalAmount: string;
         subTotal: string;
+        /** 是否是定金订单 */
+        isDeposit?: number;
+        /** 定金金额 */
+        depositAmount?: string;
     };
     /** 商品列表 */
     products: {
@@ -635,6 +650,8 @@ export interface WalletInitBusinessData {
         selling_price: number;
     }[];
     order_wait_pay_amount?: number;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 查询用户识别码列表请求参数
@@ -652,6 +669,8 @@ export interface UserIdentificationCodeParams extends WalletDeductionRecommendPa
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包推荐扣款响应数据
@@ -703,6 +722,8 @@ export interface UserIdentificationCodeItem {
 export interface SearchIdentificationCodeParams extends WalletDeductionRecommendParams {
     /** 识别码 */
     code: string;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 搜索识别码响应数据

package/lib/modules/Payment/walletpass.js

@@ -49,7 +49,7 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a;
-    const { customer_id, amountInfo, products, order_wait_pay_amount } = businessData;
+    const { customer_id, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
@@ -60,10 +60,11 @@ var WalletPassPaymentImpl = class {
       // 订单小计金额
       order_product_amount: subTotal,
       // 订单待支付金额
-      order_wait_pay_amount: order_wait_pay_amount || totalAmount,
+      order_wait_pay_amount: order_wait_pay_amount || ((amountInfo == null ? void 0 : amountInfo.isDeposit) ? Number(amountInfo == null ? void 0 : amountInfo.depositAmount) : totalAmount),
       // order_behavior_count_customer_id: 1,
       products,
-      prepare_payments: []
+      prepare_payments: [],
+      payment_order_id
     };
     this.walletParams = walletParams;
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
@@ -98,7 +99,7 @@ var WalletPassPaymentImpl = class {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const startTime = Date.now();
     const walletParams = this.generateWalletParams(businessData);
-    if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0) {
+    if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0 || [1, 0].includes(walletParams == null ? void 0 : walletParams.customer_id)) {
       return {
         walletRecommendList: [],
         userIdentificationCodes: []
@@ -178,11 +179,13 @@ var WalletPassPaymentImpl = class {
     }
   }
   async getWalletPassRecommendListAsync(params) {
+    var _a;
     try {
       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: (_a = this.walletParams) == null ? void 0 : _a.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/recommend",
@@ -216,7 +219,7 @@ var WalletPassPaymentImpl = class {
     return (0, import_utils.formatWalletPassList2PreparePayments)(list);
   }
   async getUserIdentificationCodeListAsync(params) {
-    var _a;
+    var _a, _b;
     try {
       const newParams = {
         ...this.walletParams,
@@ -226,7 +229,8 @@ var WalletPassPaymentImpl = class {
         customer_id: newParams.customer_id,
         available: newParams.available,
         prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
-        filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass
+        filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
+        payment_order_id: (_b = this.walletParams) == null ? void 0 : _b.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction",
@@ -308,13 +312,15 @@ var WalletPassPaymentImpl = class {
         prepare_payments: params.prepare_payments || (baseWalletParams == null ? void 0 : baseWalletParams.prepare_payments),
         multiple: 1,
         // 搜索特有参数
-        code: params.code
+        code: params.code,
+        payment_order_id: baseWalletParams == null ? 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 ? void 0 : baseWalletParams.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/search",

package/lib/modules/Rules/index.js

@@ -379,7 +379,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         } else {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + "___" + index,
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/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';
 /**
@@ -56,6 +56,14 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     initWalletData(params?: {
         order_wait_pay_amount: number;
     }): Promise<void>;
+    checkIsNeedDepositAsync(bookings: any[], relationProducts: any[]): {
+        total: number;
+        protocols: {
+            id: number;
+            title: string;
+        }[];
+        hasDeposit: boolean;
+    };
     /**
      * 创建本地订单 (前端模拟下单流程)
      *
@@ -64,6 +72,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>;
     /**
      * 完成结账
      */