修改流程

src/service/groupMealReservation.ts

@@ -0,0 +1,130 @@
+/* eslint-disable */
+// @ts-ignore
+import request from '@/http/vue-query';
+import type { CustomRequestOptions } from '@/http/types';
+
+export interface GroupMealMerchantVo {
+  id?: number | string;
+  merchantName?: string;
+  logo?: string;
+  merchantAddress?: string;
+}
+
+export interface GroupMealReservationVo {
+  id?: number | string;
+  merchantId?: number | string;
+  userId?: number | string;
+  peopleCount?: number;
+  perCapitaPrice?: number;
+  scene?: string;
+  contactName?: string;
+  contactPhone?: string;
+  expectedTime?: number;
+  status?: number;
+  handleRemark?: string;
+  cancelReason?: string;
+  remark?: string;
+  merchant?: GroupMealMerchantVo;
+}
+
+export interface GroupMealReservationSubmitBo {
+  merchantId: number | string;
+  peopleCount: number;
+  perCapitaPrice: number;
+  scene: string;
+  contactName: string;
+  contactPhone: string;
+  expectedTime: number;
+  remark?: string;
+}
+
+export interface GroupMealReservationMyListQueryBo {
+  merchantId?: number | string;
+  status?: number;
+  expectedBeginTime?: number;
+  expectedEndTime?: number;
+}
+
+export interface GroupMealReservationCancelBo {
+  id: number | string;
+  cancelReason?: string;
+}
+
+/** 提交团餐预定 POST /app/groupMealReservation/submit */
+export async function appGroupMealReservationSubmitPost({
+  body,
+  options,
+}: {
+  body: GroupMealReservationSubmitBo;
+  options?: CustomRequestOptions;
+}) {
+  return request<{ data?: number | string }>('/app/groupMealReservation/submit', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 我的团餐预定列表 POST /app/groupMealReservation/myList */
+export async function appGroupMealReservationMyListPost({
+  params,
+  body,
+  options,
+}: {
+  params: { pageNum: number; pageSize: number };
+  body?: GroupMealReservationMyListQueryBo;
+  options?: CustomRequestOptions;
+}) {
+  return request<{ rows?: GroupMealReservationVo[]; total?: number }>(
+    '/app/groupMealReservation/myList',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      params: {
+        ...params,
+      },
+      data: body ?? {},
+      ...(options || {}),
+    },
+  );
+}
+
+/** 我的团餐预定详情 GET /app/groupMealReservation/{id} */
+export async function appGroupMealReservationIdGet({
+  id,
+  options,
+}: {
+  id: number | string;
+  options?: CustomRequestOptions;
+}) {
+  return request<{ data?: GroupMealReservationVo }>(
+    `/app/groupMealReservation/${id}`,
+    {
+      method: 'GET',
+      ...(options || {}),
+    },
+  );
+}
+
+/** 取消我的团餐预定 POST /app/groupMealReservation/cancel */
+export async function appGroupMealReservationCancelPost({
+  body,
+  options,
+}: {
+  body: GroupMealReservationCancelBo;
+  options?: CustomRequestOptions;
+}) {
+  return request<Record<string, unknown>>('/app/groupMealReservation/cancel', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}

src/service/index.ts

@@ -45,3 +45,4 @@ export * from './userCoupon';
 export * from './marketingActivity';
 export * from './marketActivity';
 export * from './energyMeal';
+export * from './groupMealReservation';

src/service/marketActivity.ts

@@ -16,3 +16,15 @@ export async function appMarketActivityListPost({
     ...(options || {}),
   });
 }
+
+/** 充值赠送活动 GET /app/marketActivity/rechargePromotion */
+export async function appMarketActivityRechargePromotionGet({
+  options,
+}: {
+  options?: CustomRequestOptions;
+} = {}) {
+  return request<API.R>('/app/marketActivity/rechargePromotion', {
+    method: 'GET',
+    ...(options || {}),
+  });
+}

src/service/merchantOrder.ts

@@ -112,15 +112,28 @@ export interface CalculatePriceCartBatchBo {
    */
   receiveMethod?: number;
   /**
-   * 小费比例
+   * 配送单小费（单商户算价/创单，固定金额）
    */
-  tipDiscount?: number;
+  tip?: number;
+  /**
+   * 交付时间类型(1-立即交付 2-预约交付)
+   */
+  deliveryType?: number;
+  /**
+   * 预约开始/结束时间（13 位毫秒时间戳，deliveryType=2 时）
+   */
+  startScheduledTime?: number;
+  endScheduledTime?: number;
   /**
    * 商户优惠券映射 { merchantId: couponId }
    */
   merchantCouponMap?: Record<string, number>;
   /**
-   * 商户小费映射 { merchantId: tipAmount } (小费金额，单位：美元)
+   * 按配送日期的小费映射 { yyyy-MM-dd: tipAmount }
+   */
+  deliveryDateTipMap?: Record<string, number>;
+  /**
+   * @deprecated 使用 deliveryDateTipMap
    */
   merchantTipMap?: Record<string, number>;
   /**
@@ -279,9 +292,13 @@ export interface CreateOrderCartBatchBo {
    */
   endScheduledTime?: number | string;
   /**
-   * 小费比例
+   * 配送单小费（单商户算价/创单，固定金额）
    */
-  tipDiscount?: number;
+  tip?: number;
+  /**
+   * 按配送日期的小费映射 { yyyy-MM-dd: tipAmount }
+   */
+  deliveryDateTipMap?: Record<string, number>;
   /**
    * 是否需要餐具(1-是 2-否)
    */
@@ -291,7 +308,7 @@ export interface CreateOrderCartBatchBo {
    */
   merchantCouponMap?: Record<string, number>;
   /**
-   * 商户小费映射 { merchantId: tipAmount } (小费金额，单位：美元)
+   * @deprecated 使用 deliveryDateTipMap
    */
   merchantTipMap?: Record<string, number>;
   /**