fix:修复bug

2026-03-03 09:42:22 +08:00
parent e9655643d6
commit 9f2d2f8764
17 changed files with 1232 additions and 210 deletions
@@ -16,13 +16,38 @@ export async function appMerchantDetailMerchantIdGet({
 }) {
  const { merchantId: param0, ...queryParams } = params;

-  return request<API.RMerchantVo>(`/app/merchant/detail/${param0}`, {
+  // return request<API.RMerchantVo>(`/app/merchant/detail/${param0}`, {
+  //   method: 'GET',
+  //   params: { ...queryParams },
+  //   ...(options || {}),
+  // });
+  return request<API.RMerchantVo>(`/app/merchant/shopInfo/${param0}`, {
    method: 'GET',
    params: { ...queryParams },
    ...(options || {}),
  });
 }

+/** 根据菜品ID和店铺ID查询对应菜品 */
+export async function appMerchantDishDishIdGet({
+  body,
+  options,
+}: {
+  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
+  body: API.AppMerchantDishdishIdGetParams;
+  options?: CustomRequestOptions;
+}) {
+  return request<API.RDishVo>(`/app/merchant/dishPageByMenuId`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  })
+}
+
+
 /** 商户编辑个人信息 POST /app/merchant/edit */
 export async function appMerchantEditPost({
  body,
@@ -130,3 +130,50 @@ export async function appMerchantCartListMerchantPost({
    ...(options || {}),
  });
 }
+
+interface AppMerchantCartOrderBatchPostBody {
+  /** 购物车ID列表 */
+  cartIds: any[];
+}
+
+/** 批量购物车下单  */
+export async function appMerchantCartOrderBatchPost({
+  body,
+  options,
+}: {
+  body: AppMerchantCartOrderBatchPostBody;
+  options?: CustomRequestOptions;
+}) {
+  return request<API.R>('/app/merchantOrder/createOrderCartBatch', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  })
+}
+
+
+interface AppMerchantOrderPayBatchPostBody {
+  /** 订单ID列表 */
+  orderIds: any[];
+}
+
+/** 订单批量支付   */
+export async function appMerchantOrderPayBatchPost({
+  body,
+  options,
+}: {
+  body: AppMerchantOrderPayBatchPostBody;
+  options?: CustomRequestOptions;
+}) {
+  return request<API.R>('/app/merchantOrder/payOrderBatch', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  })
+}
@@ -62,6 +62,62 @@ export async function appMerchantOrderCalculatePriceCartPost({
  );
 }

+/** 批量购物车下单 - 计算价格 POST /app/merchantOrder/calculatePriceCartBatch */
+export async function appMerchantOrderCalculatePriceCartBatchPost({
+  body,
+  options,
+}: {
+  body: API.CalculatePriceCartBatchBo;
+  options?: CustomRequestOptions;
+}) {
+  return request<API.RCalculatePriceCartVo>(
+    '/app/merchantOrder/calculatePriceCartBatch',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
+/**
+ * CalculatePriceCartBatchBo - 批量计算价格参数
+ */
+export interface CalculatePriceCartBatchBo {
+  /**
+   * 配送地址id
+   */
+  addressId?: number;
+  /**
+   * 区号
+   */
+  areaCode?: string;
+  /**
+   * 购物车id列表
+   */
+  cartIds?: string[] | number[];
+  /**
+   * 优惠券id
+   */
+  couponId?: number;
+  /**
+   * 手机号
+   */
+  phone?: string;
+  /**
+   * 收货方式(1-派送 2-自取)
+   */
+  receiveMethod?: number;
+  /**
+   * 小费比例
+   */
+  tipDiscount?: number;
+  [property: string]: any;
+}
+
 /** 商品下单 - 计算价格 POST /app/merchantOrder/calculatePriceDish */
 export async function appMerchantOrderCalculatePriceDishPost({
  body,
@@ -140,6 +196,93 @@ export async function appMerchantOrderCreateOrderCartPost({
  });
 }

+/** 购物车批量下单 POST /app/merchantOrder/createOrderCartBatch */
+export async function appMerchantOrderCreateOrderCartBatchPost({
+  body,
+  options,
+}: {
+  body: API.CreateOrderCartBatchBo;
+  options?: CustomRequestOptions;
+}) {
+  return request<API.RListLong>('/app/merchantOrder/createOrderCartBatch', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/**
+ * CreateOrderCartBatchBo - 批量下单参数
+ */
+export interface CreateOrderCartBatchBo {
+  /**
+   * 配送地址id
+   */
+  addressId?: number;
+  /**
+   * 区号
+   */
+  areaCode?: string;
+  /**
+   * 购物车id列表
+   */
+  cartIds?: string[] | number[];
+  /**
+   * 优惠券id
+   */
+  couponId?: number;
+  /**
+   * 派送方式(如放门口或者交到顾客手中)
+   */
+  deliveryMethod?: string;
+  /**
+   * 交付时间类型(1-立即交付 2-预约交付)
+   */
+  deliveryType?: number;
+  /**
+   * 订单备注
+   */
+  orderRemark?: string;
+  /**
+   * 手机号
+   */
+  phone: string;
+  /**
+   * 收货方式(1-派送 2-自取)
+   */
+  receiveMethod: number;
+  /**
+   * 预约时间- 开始
+   */
+  startScheduledTime?: number | string;
+  /**
+   * 预约时间- 结束
+   */
+  endScheduledTime?: number | string;
+  /**
+   * 小费比例
+   */
+  tipDiscount?: number;
+  /**
+   * 是否需要餐具(1-是 2-否)
+   */
+  needTableware?: number;
+  [property: string]: any;
+}
+
+/**
+ * RListLong - 返回订单ID列表
+ */
+export interface RListLong {
+  code?: number;
+  data?: number[];
+  msg?: string;
+  [property: string]: any;
+}
+
 /** 菜品下单 POST /app/merchantOrder/createOrderDish */
 export async function appMerchantOrderCreateOrderDishPost({
  body,
@@ -290,6 +433,47 @@ export async function appMerchantOrderPayOrderPost({
  });
 }

+/** 批量订单付款 POST /app/merchantOrder/payOrderBatch */
+export async function appMerchantOrderPayOrderBatchPost({
+  body,
+  options,
+}: {
+  body: API.PayOrderBatchBo;
+  options?: CustomRequestOptions;
+}) {
+  return request<API.R>('/app/merchantOrder/payOrderBatch', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/**
+ * PayOrderBatchBo - 批量订单支付参数
+ */
+export interface PayOrderBatchBo {
+  /**
+   * 订单ID列表
+   */
+  orderIds: number[] | string[];
+  /**
+   * 信用卡ID
+   */
+  cardId?: string;
+  /**
+   * 支付方式 1信用卡 2余额
+   */
+  payMethod: number;
+  /**
+   * 支付密码（余额支付时需要）
+   */
+  payPassword?: string;
+  [property: string]: any;
+}
+
 /** 商家接单 POST /app/merchantOrder/receiveOrder */
 export async function appMerchantOrderReceiveOrderPost({
  params,
@@ -197,6 +197,13 @@
                'merchantId': number;
          }
        
+      
+      export type AppMerchantDishdishIdGetParams = {
+        'merchantId':any;
+        'menuId':any;
+        'pageNum':number;
+        'pageSize':number;
+      }  
  
      export type AppMerchantDishAddViewCountPostParams =
          {
@@ -4531,7 +4538,14 @@
                'data'?: MerchantVo;
                'systemTime'?: null;
          }
-        
+      
+
+      export type RDishVo = {
+        'code'?: number;
+        'msg'?: string;
+        'data'?: any;
+        'systemTime'?: number;
+      }
  
      export type RNumberStatisticsVo =
          {