优化下单流程

src/utils/common.ts

@@ -89,3 +89,42 @@ export function showShareGuide() {
     confirmText: '知道了'
   });
 }
+
+/**
+ * 截取字符串，确保不超过指定的汉字长度
+ * @param text 原始文本
+ * @param maxLength 最大汉字长度，默认30
+ * @returns 截取后的文本
+ */
+export function truncateText(text: string, maxLength: number = 30): string {
+  if (!text) return '';
+
+  // 如果长度不超过限制，直接返回
+  if (text.length <= maxLength) {
+    return text;
+  }
+
+  // 超过长度则截取
+  return text.substring(0, maxLength);
+}
+
+/**
+ * 生成订单标题
+ * @param goodsNames 商品名称数组
+ * @param maxLength 最大长度，默认30
+ * @returns 订单标题
+ */
+export function generateOrderTitle(goodsNames: string[], maxLength: number = 30): string {
+  if (!goodsNames || goodsNames.length === 0) {
+    return '商品订单';
+  }
+
+  let title = '';
+  if (goodsNames.length === 1) {
+    title = goodsNames[0];
+  } else {
+    title = `${goodsNames[0]}等${goodsNames.length}件商品`;
+  }
+
+  return truncateText(title, maxLength);
+}

src/utils/payment.ts

@@ -0,0 +1,214 @@
+import Taro from '@tarojs/taro';
+import { createOrder, WxPayResult } from '@/api/shop/shopOrder';
+import { OrderCreateRequest } from '@/api/shop/shopOrder/model';
+
+/**
+ * 支付类型枚举
+ */
+export enum PaymentType {
+  BALANCE = 0,  // 余额支付
+  WECHAT = 1,   // 微信支付
+  ALIPAY = 3,   // 支付宝支付
+}
+
+/**
+ * 支付结果回调
+ */
+export interface PaymentCallback {
+  onSuccess?: () => void;
+  onError?: (error: string) => void;
+  onComplete?: () => void;
+}
+
+/**
+ * 统一支付处理类
+ */
+export class PaymentHandler {
+
+  /**
+   * 执行支付
+   * @param orderData 订单数据
+   * @param paymentType 支付类型
+   * @param callback 回调函数
+   */
+  static async pay(
+    orderData: OrderCreateRequest,
+    paymentType: PaymentType,
+    callback?: PaymentCallback
+  ): Promise<void> {
+    Taro.showLoading({ title: '支付中...' });
+
+    try {
+      // 设置支付类型
+      orderData.payType = paymentType;
+
+      // 创建订单
+      const result = await createOrder(orderData);
+
+      if (!result) {
+        throw new Error('创建订单失败');
+      }
+
+      // 根据支付类型处理
+      switch (paymentType) {
+        case PaymentType.WECHAT:
+          await this.handleWechatPay(result);
+          break;
+        case PaymentType.BALANCE:
+          await this.handleBalancePay(result);
+          break;
+        case PaymentType.ALIPAY:
+          await this.handleAlipay(result);
+          break;
+        default:
+          throw new Error('不支持的支付方式');
+      }
+
+      // 支付成功处理
+      Taro.showToast({
+        title: '支付成功',
+        icon: 'success'
+      });
+
+      callback?.onSuccess?.();
+
+      // 跳转到订单页面
+      setTimeout(() => {
+        Taro.switchTab({ url: '/pages/order/order' });
+      }, 2000);
+
+    } catch (error: any) {
+      console.error('支付失败:', error);
+      const errorMessage = error.message || '支付失败';
+
+      Taro.showToast({
+        title: errorMessage,
+        icon: 'error'
+      });
+
+      callback?.onError?.(errorMessage);
+    } finally {
+      Taro.hideLoading();
+      callback?.onComplete?.();
+    }
+  }
+
+  /**
+   * 处理微信支付
+   */
+  private static async handleWechatPay(result: WxPayResult): Promise<void> {
+    if (!result || !result.prepayId) {
+      throw new Error('微信支付参数错误');
+    }
+
+    await Taro.requestPayment({
+      timeStamp: result.timeStamp,
+      nonceStr: result.nonceStr,
+      package: result.package,
+      signType: result.signType as any, // 类型转换，因为微信支付的signType是字符串
+      paySign: result.paySign,
+    });
+  }
+
+  /**
+   * 处理余额支付
+   */
+  private static async handleBalancePay(result: any): Promise<void> {
+    // 余额支付通常在后端直接完成，这里只需要确认结果
+    if (!result || !result.orderNo) {
+      throw new Error('余额支付失败');
+    }
+    // 余额支付成功，无需额外操作
+  }
+
+  /**
+   * 处理支付宝支付
+   */
+  private static async handleAlipay(_result: any): Promise<void> {
+    // 支付宝支付逻辑，根据实际情况实现
+    throw new Error('支付宝支付暂未实现');
+  }
+}
+
+/**
+ * 快捷支付方法
+ */
+export const quickPay = {
+  /**
+   * 微信支付
+   */
+  wechat: (orderData: OrderCreateRequest, callback?: PaymentCallback) => {
+    return PaymentHandler.pay(orderData, PaymentType.WECHAT, callback);
+  },
+
+  /**
+   * 余额支付
+   */
+  balance: (orderData: OrderCreateRequest, callback?: PaymentCallback) => {
+    return PaymentHandler.pay(orderData, PaymentType.BALANCE, callback);
+  },
+
+  /**
+   * 支付宝支付
+   */
+  alipay: (orderData: OrderCreateRequest, callback?: PaymentCallback) => {
+    return PaymentHandler.pay(orderData, PaymentType.ALIPAY, callback);
+  }
+};
+
+/**
+ * 构建单商品订单数据
+ */
+export function buildSingleGoodsOrder(
+  goodsId: number,
+  quantity: number = 1,
+  addressId?: number,
+  options?: {
+    comments?: string;
+    deliveryType?: number;
+    couponId?: number;
+    selfTakeMerchantId?: number;
+  }
+): OrderCreateRequest {
+  return {
+    goodsItems: [
+      {
+        goodsId,
+        quantity
+      }
+    ],
+    addressId,
+    payType: PaymentType.WECHAT, // 默认微信支付，会被PaymentHandler覆盖
+    comments: options?.comments || '',
+    deliveryType: options?.deliveryType || 0,
+    couponId: options?.couponId,
+    selfTakeMerchantId: options?.selfTakeMerchantId
+  };
+}
+
+/**
+ * 构建购物车订单数据
+ */
+export function buildCartOrder(
+  cartItems: Array<{ goodsId: number; quantity: number }>,
+  addressId?: number,
+  options?: {
+    comments?: string;
+    deliveryType?: number;
+    couponId?: number;
+    selfTakeMerchantId?: number;
+  }
+): OrderCreateRequest {
+  return {
+    goodsItems: cartItems.map(item => ({
+      goodsId: item.goodsId,
+      quantity: item.quantity
+    })),
+    addressId,
+    payType: PaymentType.WECHAT, // 默认微信支付，会被PaymentHandler覆盖
+    comments: options?.comments || '购物车下单',
+    deliveryType: options?.deliveryType || 0,
+    couponId: options?.couponId,
+    selfTakeMerchantId: options?.selfTakeMerchantId
+  };
+}